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

6893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde fa2d5b91dc squish: Update to upstream version 1.15 
Also fix clang-format pre-commit hook to ignore thirdparty files.
 2017-04-09 15:03:39 +02:00
Rémi Verschelde 3fd10ff6f0 Style: Apply clang-format (3.9.1) to Obj-C++ files 2017-04-09 14:44:52 +02:00
Rémi Verschelde a1a0f021ea Merge pull request #8332 from BastiaanOlij/format-mm 
Formatting of mm files
 2017-04-09 14:04:51 +02:00
BastiaanOlij 5c2ddb299b Formatting of mm files 2017-04-09 21:22:40 +10:00
Rémi Verschelde 21727657ff Merge pull request #8319 from bojidar-bg/gdscript-inline-block-indent 
Fixup #8123, seems like I forgot a few things
 2017-04-09 11:24:44 +02:00
Andreas Haas 0029440955
Fix warning message when EditorPlugin script is not in tool mode. 2017-04-09 10:33:03 +02:00
Juan Linietsky 4286aef693 Particle system is complete. Rejoice! 2017-04-08 22:40:06 -03:00
Andreas Haas 6075dfe511
Particles2D: Fix flip property (again). 
should have flipped the dst_rect..
 2017-04-09 01:42:39 +02:00
Bojidar Marinov 7cc561fe0e
Fixup #8123, seems like I forgot a few things 
Should close #8315
Please test, I'm still unsure I did it correctly...
 2017-04-08 19:42:37 +03:00
Rémi Verschelde fce779a4ef Merge pull request #8301 from karroffel/dlscript-refactor 
[DLScript] refactoring and in-editor reloading
 2017-04-08 16:49:46 +02:00
Andreas Haas fe4336f165
DLScript: Fix llvm compilation error. 
`Ordered comparison between pointer and zero`
 2017-04-08 12:18:20 +02:00
Karroffel 5695d9892e [DLScript] in-editor reloading 2017-04-08 01:28:14 +02:00
Rémi Verschelde 36f568903b AUTHORS: Prevent bad Markdown formatting 2017-04-08 00:16:50 +02:00
Rémi Verschelde df61dc4b2b Add "Godot Engine contributors" copyright line 2017-04-08 00:11:42 +02:00
Rémi Verschelde 21bcb71b2c Add AUTHORS list crediting developers 2017-04-08 00:02:05 +02:00
Rémi Verschelde b81d5f4687 Merge pull request #8308 from RandomShaper/optimize-out-debug-n-non-tools 
Optimize-out some debug and/or non-tools methods
 2017-04-07 22:22:54 +02:00
Rémi Verschelde fc45c1e6eb i18n: Sync translations from Weblate 2017-04-07 20:33:31 +02:00
Rémi Verschelde 0a5c1eeb48 i18n: Add new translations for Greek, Dutch and Thai 2017-04-07 20:33:05 +02:00
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 665bf52948 Optimize-out some debug and/or non-tools methods 
Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED
is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED
Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible.
is_node_being_edited() already showed a similar optimization effort and has been adapted to this change.
Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds.
This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
 2017-04-07 16:35:55 +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
Karroffel 8cd3f81886 [DLScript] refactored loading of libraries 
I also enabled DLSCRIPT_EDITOR_FEATURES as the default.
It might not be the most usable because of the lack of a reloading functionality,
but as Zylann pointed out "It's better to see something than nothing at all"
 2017-04-07 04:47:58 +02: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