Ariel Manzur
e291294c79
fixes debug_release build
2016-01-08 17:55:52 -03:00
Juan Linietsky
6a29edf048
removed unnecesary comma in gradle template
2016-01-08 17:55:13 -03:00
Juan Linietsky
225a1b26f4
Merge branch 'master' of https://github.com/godotengine/godot
2016-01-08 17:53:51 -03:00
Juan Linietsky
40ba22631b
Renamed godot domain from com.android.godot (which was incorrect) to org.godotengine.godot
2016-01-08 17:53:00 -03:00
Rémi Verschelde
515567d491
Merge pull request #3282 from TheHX/pr-script-debugger
...
Fix debugger close button and script editor "Show Debugger"
2016-01-08 20:50:41 +01:00
Franklin Sobrinho
514eed4072
Fix debugger close button and script editor "Show Debugger"
2016-01-08 16:43:50 -03:00
Rémi Verschelde
e3d4a851b7
Merge pull request #3280 from neikeq/issue_3227
...
Fix TileSet not refreshed after exporting without merge
2016-01-08 18:04:36 +01:00
Ignacio Etcheverry
b4602567cf
Fix TileSet not refreshed after exporting without merge
2016-01-08 17:54:13 +01:00
Rémi Verschelde
3ad263eafe
Merge pull request #3279 from neikeq/issue_3259
...
Fix TextEdit caret being drawn when outside the visible region
2016-01-08 17:42:02 +01:00
Juan Linietsky
401622cc22
-Removed ANT build system for Android, as it was deprecated by Google
...
-Added new Gradle build system, as it is the required build system
2016-01-08 13:36:44 -03:00
Ignacio Etcheverry
02d1ef8ca6
Fix TextEdit caret drawn when outside the visible region
2016-01-08 17:33:42 +01:00
Rémi Verschelde
405cfb6da2
Merge pull request #3278 from neikeq/issue_305
...
Close scene menu option asks for confirmation only if there are unsaved changes
2016-01-08 17:03:58 +01:00
Ignacio Etcheverry
43b292de1e
Scene->Close scene: ask confirmation only when unsaved changes
2016-01-08 16:53:47 +01:00
Rémi Verschelde
516ebbadb9
Merge pull request #3277 from d3v0x/3221_range-minus-zero-fix
...
do not return zero with minus-sign within range value, fixes #3221
2016-01-08 16:07:39 +01:00
Richard Nespithal
b123bc4a2a
do not return zero with minus-sign within range value, fixes #3221
2016-01-08 15:57:03 +01:00
Rémi Verschelde
79c1392d17
Merge pull request #3269 from neikeq/numpad_arrows
...
TextEdit/LineEdit: Handle numpad when NumLock is disabled
2016-01-07 23:11:05 +01:00
Ignacio Etcheverry
6541f6418e
TextEdit/LineEdit: Handle numpad PageUp, PageDown, Home and End
2016-01-07 22:59:23 +01:00
Ignacio Etcheverry
a825cfd932
TextEdit/LineEdit: Handle numpad arrows if NumLock is disabled
2016-01-07 21:51:47 +01:00
Juan Linietsky
20e395def6
Merge pull request #3267 from neikeq/fix_3266
...
Added missing onready token name
2016-01-07 15:06:59 -03:00
Ignacio Etcheverry
d50e8d2bad
Added missing onready token name
2016-01-07 18:59:37 +01:00
Rémi Verschelde
33f4010378
Merge pull request #3250 from akien-mga/pr-uniform-scaling-canvasitem
...
Fix uniform scaling of non-square CanvasItem nodes
2016-01-07 14:34:21 +01:00
Juan Linietsky
b6388e6001
added ':' support to VariantParser, given it' s used by export.cfg
2016-01-07 09:16:11 -03:00
Juan Linietsky
4e367a4b7b
-fix bugs related to parsing config files with new variantparser, closes #3248 closes #3207
2016-01-07 09:07:18 -03:00
Rémi Verschelde
a0c39a4b33
Merge pull request #3191 from neikeq/filedialog_hotkeys
...
Add keyboard shortcut to toggle "show hidden files" in FileDialog
2016-01-07 07:50:26 +01:00
Rémi Verschelde
c874ad3f52
Merge pull request #3262 from PeaceSells50/BetterFixForVSProjGeneration
...
Better fix for visual studio project generation.
2016-01-07 07:17:11 +01:00
Peace Sells
9f00d9e44b
Better fix for visual studio project generation.
2016-01-06 22:47:43 -07:00
punto-
0ba9b267a4
Merge pull request #3254 from akien-mga/pr-joydev-opt-out
...
Make joydev build using libudev and libevdev opt-out
2016-01-06 22:05:42 -03:00
Rémi Verschelde
c8849c0b79
Merge pull request #3136 from MarianoGnu/bug_fixing
...
Fix RGBA Uniform autogeneration in ShaderGraph
2016-01-06 21:10:48 +01:00
Rémi Verschelde
a98aa0bbbe
Make joydev build using udev and evdev opt-out but blocking (linux)
...
It is enabled by default, users have to specifically ask for it if they don't want gamepad support. If libudev or libevdev are missing, the build aborts and tells the user the reason and that they can disable gamepad support with the "gamepad=no" option.
2016-01-06 19:21:37 +01:00
Rémi Verschelde
bc3b1a63ba
Merge pull request #3208 from nounoursheureux/master
...
You can now create an inherited scene based on an already opened scene
2016-01-06 18:31:33 +01:00
Nounours Heureux
f32a06e470
You can create an inherited scene based on an already opened scene.
2016-01-06 17:46:45 +01:00
Rémi Verschelde
1fe9f626e1
Merge pull request #3256 from TheHX/pr-conn-binds
...
Fix .tscn format not loading signal binds
2016-01-06 13:01:59 +01:00
Franklin Sobrinho
69240aa243
Fix .tscn format not loading signal binds
2016-01-06 08:56:06 -03:00
Rémi Verschelde
c4f0c3d42f
Merge pull request #3255 from mrezai/fix-unnamed-project
...
Fix config file parser bug that cause showing project name as "Unnamed Project"
2016-01-06 12:07:08 +01:00
Rémi Verschelde
52e18accf2
Merge pull request #3159 from neikeq/tab_close_icon
...
Add tab close icon to the default theme
2016-01-06 11:58:52 +01:00
Rémi Verschelde
820770e2e0
Merge pull request #3187 from neikeq/fix_3186
...
Fix editor layout saving
2016-01-06 11:58:03 +01:00
Rémi Verschelde
78e5bc8e9a
Merge pull request #3211 from SaracenOne/audio_stream_pause_fix
...
Fix delay on audio stream pause
2016-01-06 11:54:03 +01:00
Rémi Verschelde
9849df9438
Merge pull request #3217 from neikeq/asframes_patch
...
Disable renaming SpriteFrames
2016-01-06 11:49:22 +01:00
Rémi Verschelde
30ce222205
Merge pull request #3216 from nounoursheureux/spriteframes
...
Show the texture name after the frame number in the SpriteFrames editor
2016-01-06 11:49:08 +01:00
Rémi Verschelde
a82e6f0baa
Merge pull request #3219 from nounoursheureux/change_subscene_string
...
Change Import > Sub-Scene to Import > Node from scene
2016-01-06 11:48:22 +01:00
punto-
5464ab5388
Merge pull request #3251 from Hinsbart/joy_demo
...
update joystick demo with visual representation
2016-01-06 06:41:44 -03:00
mrezai
5bf25e46be
Fix config file parser bug that cause showing project name as "Unnamed Project"
2016-01-06 12:10:38 +03:30
hondres
63ad92f4c2
visual representation for joystick demo
2016-01-06 01:01:50 +01:00
Rémi Verschelde
fa0500557f
Fix uniform scaling of non-square CanvasItem nodes
...
Fixes #3224 .
I chose the longest side of the original node (width vs height) as the "guiding direction" to handle the ever changing drag_vector and avoid issues when a component changes sign.
2016-01-06 00:13:07 +01:00
Rémi Verschelde
bf6429e9ac
Merge pull request #3249 from Hinsbart/x11_crash
...
fix x11 crash on exit
2016-01-05 23:48:15 +01:00
hondres
c0e4d8fbfd
fix x11 crash on exit
2016-01-05 23:35:54 +01:00
Rémi Verschelde
37971ef6b8
Merge pull request #3246 from godotengine/fix-notools-build
...
Fix is_node_being_edited() when not building tools
2016-01-05 16:04:57 +01:00
Rémi Verschelde
e0b91c701c
Fix is_node_being_edited() when not building tools
...
Fixes #3213 .
Superseded #3242 .
2016-01-05 16:02:59 +01:00
Juan Linietsky
afaa57be30
Merge branch 'master' of https://github.com/godotengine/godot
2016-01-05 10:38:13 -03:00
Juan Linietsky
010e3e0ac7
-completely rewritten filesystem dock and internal editor filesystem management, fixes #1926
...
-filesystem dock now tracks objects and directories in real-time, fixes #2009
2016-01-05 10:36:24 -03:00