Commit Graph

2761 Commits

Author SHA1 Message Date
Juan Linietsky
4fdab4f555 added a new function to escape properly json, fixes #3282 2016-01-10 15:01:06 -03:00
Juan Linietsky
0b472764e4 forgot initialization of path in filesystem dock, fixes #3295 2016-01-10 14:38:45 -03:00
Juan Linietsky
cc34e0dee9 Make sure variant parser actually writes floats when float property is requested, closes #3301 2016-01-10 11:51:05 -03:00
Juan Linietsky
6c8cf30697 -fix stray file left open when parsing configuration, closes #3299 2016-01-10 10:00:58 -03:00
Juan Linietsky
f5a3c1ccde make sure file is closed if something fails 2016-01-10 09:59:14 -03:00
Juan Linietsky
3a3ce982b0 removed this fix, which brought more problems than solutions 2016-01-10 00:26:35 -03:00
Juan Linietsky
c9852501a4 Fix bug related to EOF in Android FileAccess 2016-01-09 20:50:45 -03:00
Ariel Manzur
d199ed344d removed prints 2016-01-09 19:51:05 -03:00
Rémi Verschelde
662ed9ca8d Merge pull request #3293 from eska014/fix-fbsd-pthread
Fix build (pthread renaming) on Open/FreeBSD
2016-01-09 16:18:55 +01:00
eska
a6c1a5c6d0 Fix pthread renaming in Open/FreeBSD 2016-01-09 15:56:31 +01:00
Rémi Verschelde
9e143a52ba Merge pull request #3291 from mrezai/fix-gradle-repositories
Fix maven repositories bug
2016-01-09 15:32:42 +01:00
mrezai
50cbe736de Fix maven repositories bug 2016-01-09 16:51:22 +03:30
Rémi Verschelde
dbdce7d6f5 Merge pull request #3289 from TheHX/pr-warnings
Fix some error messages
2016-01-09 12:50:20 +01:00
Franklin Sobrinho
7fa233cd89 Fix some error messages 2016-01-09 08:35:57 -03:00
Juan Linietsky
292e8bf0ab fix issues related to StringArray parsing 2016-01-08 21:09:13 -03:00
Juan Linietsky
176afb2feb -Use simpler methods for parsing simple tags, fixes #3274 2016-01-08 19:03:17 -03:00
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