maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6873 commits 10 branches 35 tags 1.1 GiB
Commit graph

6873 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 486952857f i18n: Update translation template 2017-04-07 20:31:00 +02:00
Rémi Verschelde 3708d88719 classref: Sync with current source 2017-04-07 19:44:42 +02:00
Rémi Verschelde efba539f93 Fix build on older GCC versions 
Travis builds would fail with:
./drivers/gles3/rasterizer_storage_gles3.h:1018:19: error: ISO C++ forbids initialization of member 'fixed_fps' [-fpermissive]
 2017-04-07 19:24:37 +02:00
Rémi Verschelde 12b84eb9f4 Merge pull request #8304 from RandomShaper/reset-folded-on-reset-edit-children 
Reset display folded for an instanced scene if editable children is toggled off
 2017-04-07 19:12:42 +02:00
Rémi Verschelde d8f011828e Add compatibility class for FixedSpatialMaterial 
Fixes loading existing 3.0-alpha projects broken by 74808ac4d9.
 2017-04-07 18:59:10 +02:00
Pedro J. Estébanez 4b85ddabda Reset display folded for an instanced scene if editable children is toggled off 
This avoids the display folded flag needlessly getting into the scene file (potentially forever) and also gives more visual feedback if the user re-enables editable children so it will display unfolded at first.
 2017-04-07 15:48:07 +02:00
Juan Linietsky 74808ac4d9 New particle system, mostly working, some small features missing. 2017-04-06 23:49:27 -03:00
Rémi Verschelde 25d09b92be Merge pull request #8296 from Hinsbart/normapmap 
Fix typo in FixedSpatialMaterial

[ci skip]
 2017-04-06 23:27:36 +02:00
Andreas Haas 362e52c2fd
Fix typo in FixedSpatialMaterial 
NormapMap
 2017-04-06 23:20:00 +02:00
Rémi Verschelde a30de0a85f Merge pull request #8290 from supaiku-o/fix-highlight-typo 
Fix highlight typo
 2017-04-06 23:04:43 +02:00
Juan Linietsky b49925caab Merge pull request #8291 from godotengine/revert-8180-8145-Mouse_Position_is_unknown_until_first_mouse_event 
Revert "8145 - Mouse Position is unknown until first mouse event on X11"
 2017-04-06 13:09:19 -03:00
Juan Linietsky ce948ed63b Revert "8145 - Mouse Position is unknown until first mouse event on X11" 2017-04-06 13:08:42 -03:00
supaiku d51fe99a8b Fix highlight typo 2017-04-06 17:35:08 +02:00
Rémi Verschelde 0ede0302ba Merge pull request #8285 from Hinsbart/gdscript_default 
Editor: Use GDScript as the default language in ScriptCreateDialog.
 2017-04-06 14:34:40 +02:00
Rémi Verschelde 1a33d5e06f Merge pull request #8286 from Hinsbart/memleaks 
Core: fix possible memory leaks.
 2017-04-06 14:34:21 +02:00
Rémi Verschelde 243849583a Merge pull request #8287 from karroffel/dlscript-android-fix 
[DLScript] fixed android builds now
 2017-04-06 14:34:01 +02:00
Andreas Haas df7ca7864b
Editor: Use GDScript as the default language in ScriptCreateDialog. 2017-04-06 14:26:36 +02:00
Karroffel 741800f5cc [DLScript] fixed android builds now 
... really.
 2017-04-06 14:00:54 +02:00
Andreas Haas a2734df7ed
Core: fix possible memory leaks. 2017-04-06 13:43:13 +02:00
Rémi Verschelde ab02206f18 Merge pull request #8280 from karroffel/dlscript-inheritance 
[DLScript] inheritance fixes
 2017-04-06 08:09:16 +02:00
Rémi Verschelde f5f9b220f9 Merge pull request #8276 from karroffel/dlscript-stl 
[DLScript] API fixed and removed STL imports
 2017-04-06 08:08:54 +02:00
Andreas Haas d681e571ac Merge pull request #8281 from curtisxk38/master 
Fix typo in Parser Error message
 2017-04-06 06:25:35 +02:00
curtisxk38 d35fab7382 Fix typo in Parser Error message 2017-04-05 23:11:05 -04:00
Karroffel 12514cfebc [DLScript] inheritance fixes 
This properly implements script inheritance for DLScripts.
 2017-04-06 03:39:06 +02:00
Karroffel 7d914a289c [DLScript] more API fixes 2017-04-06 01:49:09 +02:00
Karroffel 71a99d5517 [DLScript] removed STL imports 2017-04-06 00:22:37 +02:00
Rémi Verschelde cbf49ddc51 Merge pull request #8269 from karroffel/dlscript-virtual-method-export 
[DLScript] fixed virtual method export
 2017-04-05 23:26:12 +02:00
Rémi Verschelde 64ebc3672e Merge pull request #8274 from RandomShaper/fix-android-x86 
Fix crash on Android-x86
 2017-04-05 22:27:48 +02:00
Pedro J. Estébanez 2443946307 Fix crash on Android-x86 2017-04-05 22:18:16 +02:00
Karroffel fa7e167a92 [DLScript] fixed virtual method export 2017-04-05 17:08:23 +02:00
Rémi Verschelde 454f53c776 Merge pull request #8268 from karroffel/dlscript-android 
[DLScript] removed unused import
 2017-04-05 14:10:25 +02:00
Karroffel c6645d6a40 [DLScript] removed unused import 
This hopefully fixes android builds
 2017-04-05 14:08:26 +02:00
Rémi Verschelde 5b5a825c7f Fixer looping timer accumulation in _process 
Follow-up to #8251.
 2017-04-05 08:22:41 +02:00
Rémi Verschelde 4989cc3617 Fix URLs to moved docs pages 
Closes #8266.
 2017-04-05 07:34:27 +02:00
Rémi Verschelde e96f32945d Merge pull request #8264 from MrMaidx/filesystem_popup_fix 
Fix typo which caused popup to display on incorrect coordinates.
 2017-04-05 01:25:54 +02:00
Rémi Verschelde 02f9851d0d Merge pull request #8259 from bojidar-bg/move-slide-wall-fix 
Fix is_move_and_slide_on_wall, make move_and_slide floor angle configurable
 2017-04-05 01:24:19 +02:00
Rémi Verschelde 2c4e4432af Merge pull request #8214 from tagcup/bounce_reflect_slide 
Made slide and reflect active verbs acting on itself in Vector2 and V…
 2017-04-05 01:23:09 +02:00
Martin Novak 9aa60ff15f Fix typo which caused popup to display on incorrect coordinates. 2017-04-05 00:31:17 +02:00
Rémi Verschelde 7ed83e9889 Merge pull request #8263 from karroffel/dlscript-userdata 
[DLScript] added variant constructor and a function to get userdata of a script
 2017-04-04 23:38:00 +02:00
Karroffel 6c49fe9c62 [DLScript] added variant constructor and a function to get userdata of a script 
The godot_dlinstance_get_userdata() function can be used to get the DLScript userdata pointer of any object that has a DLScript attached to it.
This is particularly useful and even required for language bindings to work properly.

This also fixes non-tool builds.
 2017-04-04 23:02:46 +02:00
Bojidar Marinov 289abd3710
Fix is_move_and_slide_on_wall, make move_and_slide floor angle configurable 
Fixes #7313
 2017-04-04 18:32:27 +03:00
Rémi Verschelde 46bc14e66f Merge pull request #8246 from GodotNativeTools/dlscript-module 
DLScript module
 2017-04-04 00:25:03 +02:00
Rémi Verschelde 57badfd1df Merge pull request #8251 from cynicaldevil/master 
Previous value of time_left is added to wait_time before assigning to time_left
 2017-04-04 00:22:44 +02:00
Rémi Verschelde 4d3ed11212 Merge pull request #8248 from Hinsbart/fix_notify_renames 
Fix more property names in _change_notify calls.
 2017-04-04 00:21:12 +02:00
Rémi Verschelde 6fc1a88ea1 Merge pull request #8247 from Hinsbart/scene_dock_order 
Editor: Swap Scene and Import tabs in dock.
 2017-04-04 00:20:55 +02:00
Rémi Verschelde 41986b2092 Merge pull request #8244 from RandomShaper/improve-touch-button 
Improve TouchScreenButton
 2017-04-04 00:19:47 +02:00
Andreas Haas 4b7dd09dc3 Merge pull request #8249 from eska014/win-export 
Reenable Windows Desktop export
 2017-04-04 00:15:31 +02:00
Nikhil Shagrithaya ea4fbee8f2 previous value of time_left is added to wait_time before assigning to time_left 2017-04-04 00:37:42 +05:30
eska 9dbd6db63b Reenable Windows Desktop export 2017-04-03 19:52:11 +02:00
Andreas Haas 0a287cfe4c
Fix more property names in _change_notify calls. 2017-04-03 18:35:15 +02:00