Commit graph

639 commits

Author SHA1 Message Date
Anton Yabchinskiy ff755f93eb Merge branch 'master' of http://github.com/okamstudio/godot 2014-12-09 17:51:14 +03:00
Juan Linietsky be4e40e90a compilation fix 2014-12-08 16:09:29 -03:00
Juan Linietsky 3aed5de7a9 version update for rc2 2014-12-08 15:51:27 -03:00
Juan Linietsky 6851f9bfae Small Fixes
-=-=-=-=-=-

-Bug in navmesh demo fixed
-Bug in variant
-Better Collada Exporter supports proper names of exported shapekeys
2014-12-08 15:47:45 -03:00
Juan Linietsky 9df8d5f616 Merge pull request #916 from quabug/commit
Add move_child_notify method in Node class
2014-12-08 16:46:51 -02:00
Juan Linietsky 0114ac2192 Merge pull request #939 from marynate/PR-tween-demo-icon
Add missing icon.png to tween demo
2014-12-08 16:45:15 -02:00
Juan Linietsky 811dabb645 Merge pull request #940 from marynate/PR-fix-isim-build
Update ios simulator build config file
2014-12-08 16:45:02 -02:00
Juan Linietsky ac83dc8f3c Merge pull request #941 from adolson/confirm-insert-track
remove old unused pref, added new confirm insert track
2014-12-08 16:44:36 -02:00
Dana Olson dc694f49b8 remove old unused pref, added new confirm insert track 2014-12-08 04:35:06 -05:00
marynate 88f58c5c26 Update ios simulator build config file to build under new ios SDK 2014-12-08 13:58:39 +08:00
marynate 45c9e169d9 Add missing icon.png to tween demo 2014-12-08 13:21:05 +08:00
Juan Linietsky 10b371516b More Fixes
-=-=-=-=-=

-Bug in saving multinline text in xml fixed. #925
-typo in android export fixed. #930
2014-12-07 11:33:57 -03:00
Juan Linietsky da91ca7164 Merge pull request #933 from adolson/alt-arrows-editor-fix
Alt+arrows editor undo/redo fix
2014-12-07 11:25:00 -02:00
Dana Olson 380f12def2 now undo/redo supported 2014-12-07 02:21:49 -05:00
Dana Olson 05801b9265 apply patch #882 from dcubix 2014-12-07 01:07:00 -05:00
Juan Linietsky c940212b89 more bugfixes 2014-12-07 02:39:51 -03:00
Juan Linietsky efb257c675 missing fix in file 2014-12-07 02:31:43 -03:00
Juan Linietsky c79be979d4 Batch of Bugfixes
-=-=-=-=-=-=-=-=-

-Fixed Export UV XForm (should work now). #923
-Fixed enforcement of limits in property editor. #919
-Fixed long-standing bug of export editings in script inheritance. #914, #859, #756
-Fixed horrible error reporting in shader language. #912
-Added kinematic collision with plane (please test well). #911
-Fixed double animation track insert when using 2D rigs. #904
-VKey updates offset parameter in sprite edition. #901
-Do not allow anymore a script to preload itself. (does not fix #899, but narrows it down)
-Avoid connection editor from overriding selected text. #897
-Fixed timer autostart. #876
-Fixed collision layers in 3D physics. #872
-Improved operators in shader #857
-Fixed ambient lighting bug #834
-Avoid editor from processing gamepad input #813
-Added not keyword #752

Please test!
2014-12-07 02:04:20 -03:00
Anton Yabchinskiy d45be7d9f4 Merge branch 'master' of http://github.com/okamstudio/godot 2014-12-04 16:35:00 +03:00
Anton Yabchinskiy 99676d7e74 Merge branch 'master' of https://github.com/okamstudio/godot 2014-12-04 16:32:43 +03:00
Juan Linietsky f7c9a4a0a8 Merge pull request #917 from thomassigurdsen/master
SConstruct imports multiprocessing, which is then never used
2014-12-03 19:28:57 -02:00
Thomas Sigurdsen c981f5409f Remove multiprocessing from imports in SConstruct
Rationale: unused import, also prevented scons from building on my
setup.
2014-12-03 17:36:29 +01:00
quabug 25f8f5339a use tab instead of space 2014-12-03 13:29:28 +08:00
quabug 4a71142623 Add move_child_notify method in Node class 2014-12-03 13:22:06 +08:00
Juan Linietsky 8ad12525a9 -fixes to vmethod for button 2014-12-02 17:26:56 -03:00
Juan Linietsky e361e8539c -Ability to ask for documents/pictures/etc system dirs.
-Fixes to animationplayer
-fixes to collada importer
2014-12-02 14:02:41 -03:00
Juan Linietsky 9d5a2cb847 Merge pull request #863 from JIghtuse/master
Fix CppCheck 'duplicateExpression' warning
2014-12-01 21:45:26 -02:00
Juan Linietsky 5eb546e04b Merge pull request #867 from adolson/circleshape2d-radius-increment
add sane radius increment to CircleShape2D
2014-12-01 21:44:14 -02:00
Anton Yabchinskiy fff056bdc5 Merge branch 'libao' 2014-11-28 17:16:55 +03:00
Anton Yabchinskiy c29239a6f9 Add missing check for AO_ENABLED in audio_driver_ao.cpp 2014-11-28 17:09:22 +03:00
Juan Linietsky d70e16f72f -fix sound room params (was not working)
-fixes to DAE exporter
-ios fixes (video)
2014-11-26 14:24:13 -03:00
Anton Yabchinskiy 3e09c09915 Update the list of authors in libao driver sources 2014-11-24 15:56:02 +03:00
Anton Yabchinskiy 6bfdfa041a Merge branch 'libao' 2014-11-22 17:55:22 +03:00
Anton Yabchinskiy 298f6be9bf Include cstring header for memset() 2014-11-22 17:54:41 +03:00
Anton Yabchinskiy 29be6da54a Cast samples_in to samples_out with reinterpret_cast<int16_t*> 2014-11-22 17:54:00 +03:00
Anton Yabchinskiy 4a3e240732 samples_in is an instance variable, prefix it with ad-> 2014-11-22 17:52:00 +03:00
Anton Yabchinskiy e60c41be9f Fix syntax error in call to ao_play() 2014-11-22 17:49:51 +03:00
Anton Yabchinskiy e696dba522 Merge branch 'libao' 2014-11-22 17:43:20 +03:00
Anton Yabchinskiy e58731ee01 Set libao sample format to 16 bits
Some plugins don't support 32 bit samples.
2014-11-22 17:37:27 +03:00
Anton Yabchinskiy ba6d83f3e1 Check return value of ao_play() 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy f9db628d17 Write audio samples to libao device 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy 4c8bfecc43 Change 0 to NULL for ao_open_live() and device
It's NULL in other places.
2014-11-22 13:38:11 +03:00
Anton Yabchinskiy 3c2e35ada9 Minor code formatting fixes in ao driver 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy 2f92e2a67a Open/close libao audio device 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy 9fb49e56a4 Initialize/shutdown libao 2014-11-22 13:38:11 +03:00
Anton Yabchinskiy c26a1b9d7b Use libao driver on X11 platform 2014-11-22 13:37:50 +03:00
Anton Yabchinskiy 540b95f5b0 Add ao/ subdir to drivers/SCsub 2014-11-22 13:37:50 +03:00
Anton Yabchinskiy 05f6c73020 Add 'ao' build option 2014-11-22 13:37:40 +03:00
Anton Yabchinskiy c1f62a04d7 Import sources for libao driver (unfinished, based on dummy driver) 2014-11-22 13:37:24 +03:00
Anton Yabchinskiy 7ed9a8a007 Disable X11 joystick functions also for OpenBSD 2014-11-22 13:23:38 +03:00