godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,024 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

6024 Commits

Author SHA1 Message Date
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
Andreas Haas 6438823037 Merge pull request #8166 from evolarium/joystick_fix 
Initialize hat values for mapping and revert X360 mappings.
 2017-03-30 14:16:03 +02:00
Rémi Verschelde 6392381c16 Merge pull request #8204 from Shin-NiL/2.1 
Honor the Tween's final values
 2017-03-30 13:09:21 +02:00
Rémi Verschelde fd5215bffb Merge pull request #8179 from efornara/2.1 
Allow remote debugging on disconnected Windows machines
 2017-03-30 10:30:59 +02:00
Rémi Verschelde 2798a85ba7 Merge pull request #8172 from RandomShaper/improve-tile-palette-2.1 
Several enhancements for the tile map editor (2.1)
 2017-03-30 10:29:53 +02:00
Shin-NiL ca96d7940e Honor the Tween's final values 2017-03-29 19:35:51 -03:00
William Tumeo d90809151f Re-add attach button and context menu from 1880238c3e 2017-03-29 18:36:58 -03:00
William Tumeo 1307ff7eb1 Re-add clear script button and context menu from ce5200b30e 2017-03-29 17:23:49 -03:00
Emanuele Fornara facacb886c Workaround to allow debugging on Windows when offline 2017-03-29 19:44:18 +01:00
William Tumeo 5d8d51719a Re-add script icons from 544194053a 2017-03-29 04:06:53 -03:00
William Tumeo 95f747ec93 Re-add create/load script button and context menu 
- create from f51b202566
- load from 41329f9750
 2017-03-29 03:46:35 -03:00
William Tumeo 225b1d2d76 Re-add script button from b77200728e 2017-03-29 02:16:26 -03:00
Jordan Patterson 391f6c5536 Initialize hat values for mapping and revert X360 mappings. 2017-03-27 11:00:37 -06:00
Pedro J. Estébanez bba31fbad7 Several enhancements for the tile map editor 
Allow sorting tile palette by name
Allow hiding tile ids in tile palette
 2017-03-27 10:46:44 +02:00
Rémi Verschelde e3d6d863af Merge pull request #8170 from RandomShaper/fix-uniform-move-2.1 
Include uniform (Shift down) mode in only-one-Node2D dragging (2.1)
 2017-03-27 08:57:05 +02:00
Rémi Verschelde b3d1113ae3 Merge pull request #8152 from Hinsbart/input_id_2.1 
[2.1] Better handling of joypad device IDs.
 2017-03-27 08:51:15 +02:00
Rémi Verschelde 93107f4245 Merge pull request #8141 from elasota/fix-unshaded-spillover 
Fix renderer sometimes not applying "unshaded" flag (2.1)
 2017-03-27 08:47:15 +02:00
Pedro J. Estébanez 3bdb29b077 Include uniform (Shift down) mode in only-one-Node2D dragging 2017-03-27 01:32:16 +02:00
Rémi Verschelde 62d8f96720 Remove redundant subfolder in iOS template 
(cherry picked from commit 1a0d1bb18d)
 2017-03-26 22:04:29 +02:00
Rémi Verschelde d3e6f58c25 Merge pull request #8142 from akien-mga/2.1-warnings-option 
SCons: Add option to toggle warnings (on by default)
 2017-03-26 21:54:30 +02:00
Andreas Haas 8c06da0d49
Better handling of joypad device IDs. 
Now InputDefault is responsible for giving out joypad device IDs to the platform, instead of each platform handling this itself.
This makes it possible for c++ modules to add their own "custom" gamepad devices, without the risk of messing up events in case the user also has regular gamepads attached (using the OS code).
For now, it's implemented for the main desktop platforms.
Possible targets for future work: android, uwp, javascript
 2017-03-26 00:12:11 +01:00
Rémi Verschelde 31107daa1a SCons: Add option to toggle warnings (on by default) 
All the warnings are factored out of the platform-specific files and moved to
SConstruct. Will have to check that it does not introduce regressions on some
platforms/compilers.
 2017-03-25 09:24:29 +01:00
elasota 5d691350c4 Fixed "unshaded" flag not being updated if light_type and receive_shadows_state didn't change. 2017-03-24 20:27:06 -04:00