Commit Graph

5353 Commits

Author SHA1 Message Date
Rémi Verschelde 846db09038 Drop nedmalloc which is apparently not used anymore
(cherry picked from commit f63bf12193)
2016-10-30 14:51:30 +01:00
Zher Huei Lee fae2863a5e Added support for tooltips in ButtonArray. Fixes #6597
(cherry picked from commit 38caa4ef91)
2016-10-30 14:51:30 +01:00
Rémi Verschelde 56b03e7208 Merge pull request #6877 from ranmaru90/2.1
Fixed tiny error in detect.py causing compilation for Android to fail.
2016-10-22 13:03:35 +02:00
Randy Tan Shaoxian c9d7f77c6f Fixed tiny error in detect.py causing compilation for Android to fail. 2016-10-20 21:17:21 +08:00
Rémi Verschelde 14e45a55d4 Revert "Tween reset/stop/resume/remove for all object properties at once"
This reverts commit 6fc894d652.
It caused a regression, cf. #6863.
2016-10-18 21:43:46 +02:00
Juan Linietsky 7d25d20861 Added a generic AStar implementation to Godot.
It's pretty fast, use it for games where Navigation does not cut it.

(cherry picked from commit 827a9aa829)
2016-10-18 18:35:44 +02:00
Andreas Haas e88a540b91 osx: Support gamepad input.
Fixes #3881

Vibration support is not optimal yet as it doesn't try to emulate the "weak" and "strong" motor strength,
but just takes the parameter with the highest value for the vibration gain.

(cherry picked from commit 8c886b9d7a)
2016-10-18 18:34:16 +02:00
Rémi Verschelde 2287bac8f7 classref: Sync with current source 2016-10-17 21:07:01 +02:00
volzhs 00b0f3dfde Fix crash when using Directory.dir_exists(path) on Android
(cherry picked from commit 4a57821349)
2016-10-17 20:50:57 +02:00
Andreas Haas 64b083b496 Allow whitespace in Gamepad mappings.
Previously, mappings that contained whitespace (most likely after a comma seperator) would not parse
correctly.
Consider the following mapping as an example:

"_test_guid_, test controller, a:b0, b:b1, leftx:a0 ,"

(cherry picked from commit fa502b7ccc)
2016-10-17 20:50:43 +02:00
volzhs 9b71cae50f Add option for root node name on Import 3D scene window
(cherry picked from commit dd04ac7ba9)
2016-10-17 20:50:20 +02:00
Karol Walasek 8a8ace8fa0 Fixed Particle2D docs - radians to degrees for some params
(cherry picked from commit 5687fa4709)
2016-10-17 20:49:52 +02:00
Pedro J. Estébanez 2261c65f19 Adapt overlooked instances of zero-based column numbers
(cherry picked from commit 1b3dcac281)
2016-10-17 20:49:28 +02:00
Andreas Haas a418304def Only show AnimationEditor automatically when an Animplayer is selected.
Previous behaviour was to show it when an AnimationPlayer has been detected in the scene, now you actually have to select it.
Fixes #6213

(cherry picked from commit 86fd40b06c)
2016-10-17 20:49:18 +02:00
Fabio Alessandrelli ea48675ffa Properly handle absolute paths in Globals::localize_path
This give a proper fix for #4280 - #3106 , allowing absolute paths
that starts from the file system, not the resource folder

(cherry picked from commit 2f2cea070e)
2016-10-17 20:49:12 +02:00
Fabio Alessandrelli d5ee98bb2c Revert "Add warning when (pre)loading paths with leading / (#4280 - #3106)"
Also closes: #6801

This reverts commit e59820ac94.

(cherry picked from commit 11349a786b)
2016-10-17 20:48:52 +02:00
volzhs 728ac94313 Add "button_selected" signal to ButtonGroup
(cherry picked from commit 870ed6f2fa)
2016-10-17 20:48:36 +02:00
Zher Huei Lee a8502ae6f6 Fixes for ButtonArray
Fixed hover sometimes not resetting when mouse leaves widget.
Fixed text position not taking into account stylebox's content margins.

(cherry picked from commit f5830e0973)
2016-10-17 20:48:25 +02:00
Răzvan Cosmin Rădulescu 04255541a0 Fixes hash float negative 0 problem
Before this was giving an error:

var a = {Vector2(1, 0): 5, Vector2(-1, 0): 7}
    print(a)
    print(a[Vector2(1, 0)])
    print(a[-Vector2(1, 0)])

This simple commit fixes the issue.

(cherry picked from commit 9ad0850301)
2016-10-17 20:48:15 +02:00
Mateusz Adamczyk 17edff2f84 Possibility to write node path by hand in exported NodePath variable (#3486)
(cherry picked from commit cf4f3815b3)
2016-10-17 20:48:10 +02:00
Anthony Fieroni b4edaa892d Correct OS architecture detection
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
(cherry picked from commit f87e32696d)
2016-10-17 20:48:05 +02:00
volzhs 81bc271619 Replace a node with saved branch scene instance
(cherry picked from commit cc33c528eb)
2016-10-17 20:47:49 +02:00
Andreas Haas 5f540a17cc Sprite: Fix inspector not showing changes on "frame" property.
Fixes #6562

(cherry picked from commit 9d67895c7c)
2016-10-17 20:47:27 +02:00
Andreas Haas 4b6809a2b3 Refresh TextureRegionEditor when region has been changed externally.
Now the TextureRegionEditor updates when you change the region_rect either via the inspector or via
undo/redo.

Fixes #6772

(cherry picked from commit 094073e4b2)
2016-10-17 20:47:14 +02:00
Pawel Kowal 280728c0c7 New load icon, removed unused open icon
(cherry picked from commit ed1e71a77e)
2016-10-17 20:46:34 +02:00
Pawel Kowal 35cdb1a49b Fix #5959, contrasting texture for toggled button
(cherry picked from commit d3a8087659)
2016-10-17 20:46:10 +02:00
Pedro J. Estébanez 3df8f79c9f Allow step for integer properties
Small readability improvement

(cherry picked from commit 7b293aa4d4)
2016-10-17 20:44:54 +02:00
Pedro J. Estébanez 99d82f3033 Make text column numbers one-based
Make one-based the column number on the code editor

Make one-based the column number for GDScript error messages

Make one-based the column number for shader code error messages

(cherry picked from commit 2f80965845)
2016-10-17 20:44:47 +02:00
Anthony Fieroni f250c0cf50 Button focus hovering
Signed-off-by: Anthony Fieroni bvbfan@abv.bg
(cherry picked from commit 6d21fd42d3)
2016-10-17 20:43:36 +02:00
Ignacio Etcheverry 55a5631986 Bindings: Fix missing default value
(cherry picked from commit 068b58b3ce)
2016-10-17 20:43:25 +02:00
George Marques 8cb09bf9d0 Fix Android build detection on Windows
(cherry picked from commit 4bdbafabce)
2016-10-17 20:43:03 +02:00
Mateusz Adamczyk 58e2652f94 Place child control under label in AcceptDialog.
Fixes #6199.

(cherry picked from commit 3ef2722904)
2016-10-17 20:42:51 +02:00
Rémi Verschelde 3f941faf4d i18n: Sync translations from Weblate and merge with current code 2016-10-09 18:23:26 +02:00
Rémi Verschelde b3bf3c392a i18n: Fix string that broke msgmerge
(cherry picked from commit 2fb5a00305)
2016-10-09 18:21:59 +02:00
Rémi Verschelde c757787fed classref: Sync with current 2.1 branch 2016-10-09 17:50:09 +02:00
J08nY 1ae1deabfa editor_node: add an option to stop the update spinner from spinning, fixes #6653
(cherry picked from commit 4527fbcfa1)
2016-10-09 17:41:04 +02:00
Pedro J. Estébanez 22680a30f1 Fix reparent undo not renaming back
(cherry picked from commit 88a32c11f1)
2016-10-09 17:40:49 +02:00
Mateusz Adamczyk ce1138cb02 Added simple check to viewport, if matrix32 is invesile (https://github.com/godotengine/godot/issues/6296).
(cherry picked from commit 8671836b76)
2016-10-09 17:40:37 +02:00
Bojidar Marinov a139c7afe6 Attempt to fix travis builds for android
Using travis_wait command
(cherry picked from commit f73f554cc0)
2016-10-09 17:40:25 +02:00
Fabio Alessandrelli e51cd3d454 Throw an error when exporting a resource class
"export var tex = Texture"
will now throw an error to avoid crashing the editor:
"Exported constant not a type or resource"

Fixes #6719 . Closes #6729

(cherry picked from commit ee7df2c89a)
2016-10-09 17:40:19 +02:00
Andreas Haas a7d6894a9f Project manager: grab focus on ok button after path selection.
Slight usability improvement: grabs focus on the Import/Create button after engine.cfg/path selection.
So then I can just press enter to create the project ^^

(cherry picked from commit 36d2dd5318)
2016-10-09 17:40:10 +02:00
Răzvan Cosmin Rădulescu 6775cce469 fixes #6695 - MultiNodeEdit edit path in exported NodePath
(cherry picked from commit ced8fb4806)
2016-10-09 17:40:03 +02:00
Andreas Haas 9e20b39b3d Fix code completion drawing under other gui elements.
Raises the z-index of the Script editor when the completion is shown.

fixes #1257
fixes #6690

(cherry picked from commit 6dfa405eac)
2016-10-09 17:39:56 +02:00
Andreas Haas 0462bf01a2 Prevent crash on focus change when no valid next control has been found.
Fixes the crash discussed in #6714.

(cherry picked from commit 8dd026e4f9)
2016-10-09 17:39:39 +02:00
Ariel Manzur cf427eeb7a bind method canvas_item_set_sort_children_by_y
(cherry picked from commit 1f9e16119f)
2016-10-09 17:39:17 +02:00
Adham Zahran cd03f8cce2 fix #6012 exposed setters and getters of Camera H/V offset to GDScript
(cherry picked from commit cbb0ea315b)
2016-10-09 17:39:06 +02:00
Fabio Alessandrelli d0ff75c91c Add shortcut to reset cursor position in 3D Editor ( #166 )
The shortcut will focus the origin after you moved around with shift + mouse3.
The default shortcut is the letter "O", like "F" for focus.
This can be customized in the editor shortcuts menu.

Closes #166

(cherry picked from commit 63abe3dcd0)
2016-10-09 17:39:00 +02:00
Pedro J. Estébanez 82dfaf7af6 Fix compile flags not getting to the Android build
(cherry picked from commit 7f51bb7b1c)
2016-10-09 17:34:36 +02:00
Pedro J. Estébanez c0ba08b8d5 Add editor_only param to Light2D
(cherry picked from commit 34c02fad5a)
2016-10-09 17:34:29 +02:00
Fabio Alessandrelli ba095b8dcc Add warning when (pre)loading paths with leading / (#4280 - #3106)
(cherry picked from commit e59820ac94)
2016-10-09 17:34:23 +02:00