Commit Graph

1893 Commits

Author SHA1 Message Date
Kostadin Damyanov 77e78cdb20 Haiku: gl context locking 2015-07-02 18:41:32 +03:00
punto- f697ec2fe0 Merge pull request #2226 from romulox-x/xyzFixIos
fixed ios compilation error
2015-07-02 09:19:34 -03:00
romulox_x 1d22b0265b fixed ios compilation error 2015-07-01 23:07:01 -07:00
volzhs f6668dc9db Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments 2015-07-01 15:13:10 +09:00
Juan Linietsky b4d5f7e154 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-30 11:59:33 -03:00
Juan Linietsky 4613a3f2c0 small fixes 2015-06-30 11:59:00 -03:00
Juan Linietsky 55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky 95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources.
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
volzhs 903e6b37c0 fix crash by payments when run on android 5.1.1 device.
(http://stackoverflow.com/questions/24480069/google-in-app-billing-illegalargumentexception-service-intent-must-be-explicit)
2015-06-29 02:56:38 +09:00
volzhs 584dd4db87 Merge branch 'master' of https://github.com/okamstudio/godot 2015-06-28 22:28:02 +09:00
Juan Linietsky 2b64f73b04 more code completion improvements
-calltip dissapears with more types of keypresses or when pressing ')'
-properly looks into autoloaded scripts or nodes with another script for
script functions/variables/etc.
2015-06-27 15:52:39 -03:00
Kostadin Damyanov e0e54ea7d4 Merge remote-tracking branch 'upstream/master' 2015-06-26 21:35:47 +03:00
Kostadin Damyanov f61eb5fd8e Haiku: fix the glew.c hack 2015-06-26 21:32:57 +03:00
Juan Linietsky a67486a39e improved get_node(), connect(), etc code completion.
-properly completes text arguments
-includes the "/root" autoloads
2015-06-26 01:14:49 -03:00
Juan Linietsky 71cc2561c6 Merge pull request #2187 from romulox-x/mirroredRepeat
added support for mirrored repeat texture wrapping
2015-06-25 19:43:29 -03:00
romulox_x acb5cdb574 forgot to add mirroredrepeat flag to flags file. fixed. 2015-06-25 15:41:12 -07:00
romulox_x 85e49d4e75 added support for mirrored repeat texture wrapping 2015-06-25 14:51:21 -07:00
Juan Linietsky 29b2e811f6 added a tiny bit more space to docks and script tab 2015-06-24 18:57:14 -03:00
Juan Linietsky b4190ed2b9 compile fix 2015-06-24 18:34:31 -03:00
Juan Linietsky e3f4fbc755 Merge pull request #2181 from ShadowKyogre/doc-help
Add documentation for RayCast2D about is_colliding and get_collider quirks
2015-06-24 18:33:38 -03:00
Juan Linietsky 48ac03915a Merge pull request #2182 from Kermer/patch-1
Tiny typo
2015-06-24 18:29:37 -03:00
Juan Linietsky 30a94bcc9f fix connection dialog bug 2015-06-24 18:26:34 -03:00
Kermer 32d4b4128c Tiny typo
COPY_MODE_DISALED -> COPY_MODE_DISABLED
2015-06-24 23:24:44 +02:00
Juan Linietsky 52308aba68 ability to change shadow color in light2d 2015-06-24 18:15:43 -03:00
ShadowKyogre 631cb10e86 Add some documentation for RayCast2D about is_colliding and get_collider quirks 2015-06-24 13:24:42 -07:00
Juan Linietsky 48f1d02da4 added ability to define signals in script
closes #2175
2015-06-24 13:29:45 -03:00
Juan Linietsky 199ad16bbc Merge pull request #2168 from KillerJaguar/input-helper
Added helper methods to InputEvent
2015-06-23 20:59:46 -03:00
Juan Linietsky 26a710b4b8 Merge pull request #2172 from jrimclean/development
Fixed compilation on MacOS X
2015-06-23 20:59:30 -03:00
James McLean d23ee8eb01 Merge branch 'master' of github.com:okamstudio/godot into development 2015-06-23 18:22:14 -04:00
Jaguar e6fb0cf970 Added helper methods to InputEvent 2015-06-23 16:24:48 -04:00
Kostadin Damyanov 7ad89c7e83 Haiku: implement some more window-related methods 2015-06-23 21:22:12 +03:00
Juan Linietsky e42aed6ed0 Merge pull request #2166 from TheHX/collision_shape_editor
CollisionShape2D visual editor
2015-06-23 12:27:47 -03:00
Juan Linietsky d7406d64c7 Merge pull request #2165 from TheHX/issue_2102
Fix for issue related to GridMap editor
2015-06-23 12:22:45 -03:00
Franklin Sobrinho 5688b6157f CollisionShape2D visual editor 2015-06-23 12:20:34 -03:00
Franklin Sobrinho faf8b410b1 Fix for issue related to GridMap editor
* closes #2102
2015-06-23 12:07:17 -03:00
Juan Linietsky 8b61a3c358 Merge pull request #1907 from tommy3/show-hidden-files
set initial flag 'show_hidden_files' for file dialogs in project manager initialization
2015-06-23 00:01:55 -03:00
Juan Linietsky 9ac1046804 Merge pull request #1972 from PeaceSells50/UsefulVSSconsEnvs
Setting build vs properties in scons.
2015-06-23 00:01:28 -03:00
Juan Linietsky 46692cccf2 Merge pull request #2068 from Krzycho666/color_ramp
ColorRamp new features
2015-06-23 00:01:01 -03:00
Juan Linietsky 25470dd3a0 Merge pull request #2058 from volzhs/create_from_fnt
add bind method for create_from_fnt (load fnt made by BMFont)
2015-06-22 23:57:54 -03:00
Juan Linietsky 5092cc46b4 Merge pull request #2070 from Krzycho666/AnimationPlayer_fix
Animation player set_steps fix
2015-06-22 23:57:28 -03:00
Juan Linietsky 3abb54871f Merge pull request #2072 from jrimclean/master
Interpolation for affine transformations/Bound rot/pos Matrix32 constructor
2015-06-22 23:57:10 -03:00
Juan Linietsky db43b9bcf0 Merge pull request #2080 from bojidar-bg/patch-1
Fix to #2079
2015-06-22 23:56:38 -03:00
Juan Linietsky 68443a649d Merge pull request #2088 from KillerJaguar/setter-fix
Fixed variables being set before calling the setter method
2015-06-22 23:55:55 -03:00
Juan Linietsky 74081cdaaa Merge pull request #2090 from volzhs/pmr_virtual
fix register Physics2DTestMotionResult not virtual
2015-06-22 23:54:24 -03:00
Juan Linietsky 6154cff93f Merge pull request #2101 from sanikoyes/Pr-script-editor-save-state
Pr-Script editor
2015-06-22 23:54:04 -03:00
Juan Linietsky 8f9f03e374 Merge pull request #2132 from gber/master
Fix typo that produced invalid markup for images
2015-06-22 23:45:21 -03:00
Juan Linietsky 0805e83e59 small in place fixes 2015-06-22 23:44:13 -03:00
Juan Linietsky 29e644c20a Merge pull request #2144 from Krzycho666/UndoRedo_fix
added GDscript bidings for UndoRedo class
2015-06-22 23:42:13 -03:00
Juan Linietsky d5550e9b7c Merge pull request #2145 from PeaceSells50/More_VS_Scons_Changes
More vs scons changes
2015-06-22 23:39:00 -03:00
Juan Linietsky cfa7fe3c14 Merge pull request #2149 from TheHX/item_list_palette
Grid/Tile map editor new item palette
2015-06-22 23:38:12 -03:00