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

5846 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde 20d1a28341 squish: Update to upstream version 1.15 
Also fix clang-format pre-commit hook to ignore thirdparty files.

(cherry picked from commit fa2d5b91dc)
 2017-04-09 15:51:41 +02:00
Rémi Verschelde a27876d5ac Style: Apply clang-format (3.9.1) to Obj-C++ files 2017-04-09 14:03:52 +02:00
Rémi Verschelde fb4e9962ea Merge pull request #8326 from Hinsbart/particle_flip 
Particles2D: Fix flip property (again).
 2017-04-09 01:21:19 +02:00
Andreas Haas 9b6b713d61
Particles2D: Fix flip property (again). 
should have flipped the dst_rect..
 2017-04-09 01:16:48 +02:00
Rémi Verschelde c9eb0f5f45 Merge pull request #8317 from RandomShaper/fix-area-monitoring-2.1 
Fix side effects of the bookkepping of Area/Area2D's monitoring (2.1)
 2017-04-08 22:47:44 +02:00
Rémi Verschelde 4b561e3e04 Merge pull request #8311 from BastiaanOlij/format_mm_2.1 
Spaces to tabs and layout adjustments on .mm files
 2017-04-08 16:49:51 +02:00
Rémi Verschelde f90eb87193 Revert "Make inline blocks in GDScript more pythonic" 
This reverts commit 0c650c2511.
Fixes #8315.
 2017-04-08 16:08:22 +02:00
Pedro J. Estébanez c3c0cfd207 Fix side effects of the bookkepping of Area/Area2D's monitoring 
- Fix monitoring flag being reset when the scene is out of the tree (happens on save all if the current scene is not the focused one, therefore on save-on-run as well)
- Fix the inability to reset the monitoring flag while the area is out of the tree
 2017-04-08 13:24:29 +02:00
Rémi Verschelde 7f32db5ac9 Revert "8145 - Mouse Position is unknown until first mouse event on X11 & Win" 
This reverts commit e5d63aaece.
Same reasoning as #8291.
 2017-04-08 11:28:25 +02:00
BastiaanOlij 33ea9fc4a7 Spaces to tabs and layout adjustments on .mm files 2017-04-08 09:47:13 +10:00
Rémi Verschelde 2491754de7 Style: Fix some badly formatted files 2017-04-08 01:42:41 +02:00
Rémi Verschelde e9b045d9e5 Add "Godot Engine contributors" copyright line 2017-04-08 00:45:24 +02:00
Rémi Verschelde b55b66d74e Add AUTHORS list crediting developers 
(cherry picked from commit 21bcb71b2c)
 2017-04-08 00:41:40 +02:00
Rémi Verschelde 63ddee793e Merge pull request #8307 from RandomShaper/optimize-out-debug-n-non-tools-2.1 
Optimize-out some debug and/or non-tools methods (2.1)
 2017-04-07 22:22:43 +02:00
Rémi Verschelde 6f489fbb2e classref: Sync with current source 2017-04-07 22:08:11 +02:00
Rémi Verschelde 64d8eeb4a1 i18n: Sync translations with Weblate 2017-04-07 21:26:46 +02:00
Rémi Verschelde 6d722f2622 i18n: Add WIP Czech, Danish, Greek, Dutch and Thai translations 2017-04-07 21:25:56 +02:00
Rémi Verschelde 593149b1a0 i18n: Update template with current source 2017-04-07 21:22:11 +02:00
Rémi Verschelde 990e8e00c7 Merge pull request #8303 from RandomShaper/reset-folded-on-reset-edit-children-2.1 
Reset display folded for an instanced scene if editable children is toggled off (2.1)
 2017-04-07 19:10:03 +02:00
Pedro J. Estébanez 1b15c53479 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:34:15 +02:00
Pedro J. Estébanez 4087e61900 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:46:13 +02:00
Rémi Verschelde 2ee9e033ec Merge pull request #8202 from williamd1k0/add-script-button 
Add Attach and Clear Script buttons (2.1)
 2017-04-07 08:54:39 +02:00
Rémi Verschelde f7c3ecb38c Merge pull request #8294 from RandomShaper/sample-players-priority-2.1 
Add priority to samples in a library (2.1)
 2017-04-07 08:06:51 +02:00
Pedro J. Estébanez 9f8f8efa67 Add priority to samples in a library 2017-04-06 23:59:49 +02:00
Rémi Verschelde 3916d964de Merge pull request #8293 from Faless/2.1-enum 
[2.1] Cherry pick GDScript enum support ( #6292 )
 2017-04-06 23:05:29 +02:00
Rémi Verschelde 6ff1436fde Merge pull request #8292 from RandomShaper/spatial-audio-play-on-free-2.1 
Make spatial AudioServers prefer inactive voices (2.1)
 2017-04-06 23:05:06 +02:00
Pedro J. Estébanez 0501f3a901 Make spatial AudioServers prefer inactive voices 
instead of unconditionally playing on the next voice slot; that will be the fallback if no inactive voice is found
 2017-04-06 20:11:26 +02:00
Bojidar Marinov dad8e04139 Add enum naming, by assinging a given enum's values to a Dict 
(cherry picked from commit 88430f0962)
 2017-04-06 19:01:43 +02:00
Bojidar Marinov ed80f4563a Adds enums to GDScript 
Fixes #2966

(cherry picked from commit 4ee82a2c38)
 2017-04-06 19:01:43 +02:00
Rémi Verschelde f71da5c8c5 Merge pull request #8273 from RandomShaper/fix-android-x86-2.1 
Fix crash on Android-x86 (2.1)
 2017-04-05 22:27:58 +02:00
Pedro J. Estébanez 212fca0c50 Fix crash on Android-x86 2017-04-05 22:16:04 +02:00
Rémi Verschelde 9a9bd12913 Fixer looping timer accumulation in _process 
Follow-up to #8251.

(cherry picked from commit 5b5a825c7f)
 2017-04-05 08:24:15 +02:00
Nikhil Shagrithaya 323041a476 previous value of time_left is added to wait_time before assigning to time_left 
(cherry picked from commit ea4fbee8f2)
 2017-04-05 08:23:34 +02:00
volzhs a67400aee7 Make buttons closer in Scene tree 
(cherry picked from commit a911b1f126)
 2017-04-05 08:19:57 +02:00
Andreas Haas 1620f46f03 Viewport: Fix undefined behaviour found by llvm sanitizer. 
When godot was running as the project manager, it tried to call a method on a null pointer (get_tree()->get_edited_scene_root()).
This is undefined behaviour and caused a crash when compiled with sanitizing enabled.

(cherry picked from commit 1d3c9c448d)
 2017-04-05 08:18:59 +02:00
Fabian Mathews 1a1e25bfca Added ability to change A-star cost function 
(cherry picked from commit b541402417)
 2017-04-05 08:18:38 +02:00
Saggi Mizrahi 89b201b466 Add the option to check if input was handled 
When working with a viewport you should call Viewport.input() to pass
the input, but if the input was unhandled you might also want to call
Viewport.unhandled_input() so that objects in the sub-scene can handle
the event. This adds a way to check if the input was handled so that you
know whether you should call Viewport.unhandled_input() or not.

Signed-off-by: Saggi Mizrahi <saggi@mizrahi.cc>
(cherry picked from commit 245ace6e2e)
 2017-04-05 08:15:15 +02:00
Sergey Pusnei e5d63aaece 8145 - Mouse Position is unknown until first mouse event on X11 & Win 
- X11 update input->pos on EnterNotify
- X11 & Win call first-time events processing before main initialization

(cherry picked from commit c79e998d1f)
 2017-04-05 08:08:08 +02:00
Ramesh Ravone 1c17e5b38d Update build.gradle.template 
Updating project repository,
added jcenter() since Android Studio uses it by default.

https://www.jfrog.com/knowledge-base/why-should-i-use-jcenter-over-maven-central/
(cherry picked from commit 77c81a21d8)
 2017-04-05 08:07:01 +02:00
Rémi Verschelde e10e732bf0 Merge pull request #8242 from volzhs/area-monitoring 
Fix monitoring status of Area2D and doing same logic on Area too
 2017-04-04 23:04:20 +02:00
volzhs 6222821535 Apply same logic to Area with Area2D 
comes from 5b556ca and 73f53a7
 2017-04-04 10:37:45 +09:00
Rémi Verschelde d047e67977 Merge pull request #8243 from RandomShaper/improve-touch-button-2.1 
Improve TouchScreenButton (2.1)
 2017-04-04 00:19:50 +02:00
Pedro J. Estébanez 7d642e218e Improve TouchScreenButton 
Fix shape not being updated
Add a way to hide the shape on editor and debug-with-visible-shapes
Remove useless checks
 2017-04-03 14:38:01 +02:00
volzhs 73f53a7918 Fix monitoring status of Area2D 2017-04-03 21:00:38 +09:00
Rémi Verschelde 12749dd67a Merge pull request #8240 from volzhs/crash-project-setting 
Fix crash when change project settings
 2017-04-03 11:34:14 +02:00
volzhs ddd01332ef Fix crash when change project settings 2017-04-03 17:49:02 +09:00
Rémi Verschelde d0b0a3241f Merge pull request #8236 from RandomShaper/fix-warped-pan-2.1 
Fix warped mouse panning on Linux (2.1)
 2017-04-03 07:57:32 +02:00
Pedro J. Estébanez 5889169bbd Fix warped mouse panning on Linux 
Fix/improve it also on certain edge cases for any platform
 2017-04-03 02:59:03 +02:00
Rémi Verschelde 603f83ba91 Merge pull request #8230 from Hinsbart/upd_mappings_2.1 
Input: Update Gamepad mappings. [2.1]
 2017-04-02 13:02:39 +02:00
Andreas Haas 33f9873b70
Input: Update Gamepad mappings. 2017-04-02 09:59:53 +02:00