49a19f85b8
-different attempt to avod deadlock problem
2015-12-21 10:25:46 -03:00
d4ed043968
too early to rename thread
2015-12-21 09:38:44 -03:00
0576e1e28f
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-21 09:17:15 -03:00
15429d6ac9
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-21 09:07:06 -03:00
81f62fb78c
-Fix to progress dialog, speding it up
...
-Fix potential deadlock in stream player
-Fix collada to support broken files from ColladaMaya
2015-12-21 09:05:49 -03:00
72a6b137ba
audio threads
2015-12-21 09:01:40 -03:00
b2f670ebae
Merge pull request #3109 from mrezai/libpng-filter_neon
...
Fix libpng link errors on android
2015-12-21 12:16:41 +01:00
bf69e07ea6
Fix libpng link errors on android
2015-12-21 11:50:54 +03:30
020700af1d
windows resource version thing
2015-12-20 13:43:08 -03:00
bec1e003e7
this failed on mingw on linux (but not on msvc) with 2 problems:
...
1) it didn't print the error to the console, only this:
build_res_file(["platform/windows/godot_res.windows.tools.32.o"], ["platform/windows/godot_res.rc"])
scons: *** [platform/windows/godot_res.windows.tools.32.o] Error 1
I had to print the actual command and run it on a console to see the error. The builder should be able to print the command it's running and the error, like it does with compiler invocations, etc.
2) The actual error was a syntax error on line 11 of godot_res.rc. I looked up "FILEVERSION" and "PRODUCTVERSION" (here https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx ), it says they take 4 numbers as parameters, so I added those 0s, but I'm not sure if they're in the right order.
@masoudbh3 can you check it out? thanks
It builds on msvc just fine with (and without) these changes.
2015-12-20 11:50:16 -03:00
a5fe71a0e9
this failed in msvc, didn't in linux and mingw
2015-12-20 11:42:55 -03:00
5f1ae5eac2
fix debouncing in axis buttons
2015-12-20 11:33:29 -03:00
33e5c3181d
Merge pull request #3101 from Hinsbart/remapping-new
...
Better gamepad support
2015-12-20 11:08:04 -03:00
e54418f904
Merge pull request #3058 from akien-mga/pr-libpng-1.5.25
...
Update to libpng 1.5.26
2015-12-20 12:15:57 +01:00
6750c8a729
Update to libpng 1.5.26
...
Includes numerous security fixes compared to the previous version which was around 1.5.7 or so.
Fixes #2787
2015-12-19 20:41:22 +01:00
bf5453e429
Remove padding in bottom HBoxContainer of scene tree dock
...
This way the new "Create new scene from node(s)" button does not make the bar overflow
2015-12-19 10:41:45 +01:00
87dab29f4b
Use tabs instead of spaces for new gamepad code
2015-12-18 19:15:32 +01:00
b989d4f887
thread can't rename itself on initialization :(
2015-12-18 09:48:39 -03:00
5e0f43d051
naming the audio thread from within itself
2015-12-18 03:41:44 -03:00
f25812794d
thread renaming by core_bind
2015-12-18 03:06:51 -03:00
4a7e5fafb1
thread rename for ios and osx (if called from the thread to be renamed)
2015-12-18 02:58:30 -03:00
af633c7941
Better gamepad support
2015-12-18 06:12:53 +01:00
19267f30d9
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-17 06:26:33 -03:00
10298b9534
thread set name
2015-12-17 06:24:27 -03:00
93a6ec1e32
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-16 10:12:15 -03:00
f65eb470ae
-fix function calls in animationtree, closes #2789
2015-12-16 08:34:57 -03:00
ed1c4d83a6
Merge pull request #3090 from neikeq/fix_3088
...
Fix Remove Item option in TileSet plugin
2015-12-16 10:18:20 +01:00
6c3c20fc35
compile thing
2015-12-16 02:40:02 -03:00
fb01d18251
small fix for undo redo
2015-12-16 00:42:34 -03:00
d3cd1250bd
added labels to sections and properties
2015-12-16 00:08:50 -03:00
686c65a354
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-15 23:40:29 -03:00
a1142225bf
-split view of property editor and editor settings
2015-12-15 23:39:36 -03:00
d74c56289f
Fix Remove Item option in TileSet plugin
2015-12-15 23:35:35 +01:00
08cab3a17a
Merge pull request #3080 from akien-mga/pr-input-presets
...
Prevent deleting input presets as it does not work
2015-12-15 19:21:57 +01:00
9cb4798f6b
Merge pull request #3083 from TheHX/pr-file-dialog
...
Add editor setting for display mode on file dialog and filesystem dock
2015-12-15 19:15:56 +01:00
d9f4d3952d
Add editor setting for display mode on file dialog and filesystem dock
2015-12-15 14:36:04 -03:00
035bb03331
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-15 09:19:00 -03:00
b12a2f456c
-fixes to theora video ending sooner than expected, fixes #3066
2015-12-15 09:17:32 -03:00
87a415f275
Prevent deleting input presets as it does not work
...
Follow-up of #3076 .
Now the only thing possible to do with input presets is to add/remove key bindings. It was already the case previously but it's now clearer in the UI.
2015-12-15 08:45:34 +01:00
69c79c0d4a
Merge pull request #3076 from neikeq/rename_actions
...
Option to rename input actions
2015-12-14 23:33:06 +01:00
79ad04d6af
Merge pull request #3078 from TheHX/pr-project-manager
...
Avoid project manager from processing gamepad input
2015-12-14 23:13:23 +01:00
577bbcc6b3
Forbid renaming input presets
2015-12-14 22:36:53 +01:00
fa085a9c2c
Added input actions renaming
2015-12-14 20:44:57 +01:00
fd59d17b22
Avoid project manager from processing gamepad input
2015-12-14 16:31:37 -03:00
566f8da3cc
Merge pull request #3036 from slapin/animation-tree-player
...
Fix non-looping animations not being reset properly in AnimationTreePlayer
2015-12-14 20:02:01 +01:00
9e9e4f96a2
Merge pull request #3051 from eska014/add-export-hints
...
Add GDScript export hints for named bit flags, exponential ranges and global filesystem
2015-12-14 17:40:57 +01:00
897cf2140c
Add GDScript export hint for named bit flags
...
Syntax: `export( int, FLAGS, "A Flag", "Another Flag" ) var flags`
2015-12-14 17:32:31 +01:00
89629d35bb
Merge pull request #3075 from neikeq/fix_editor_layouts
...
Fix editor layouts broken
2015-12-14 16:46:52 +01:00
6e4b1ff838
Fix editor layouts broken after 9a7ff65
2015-12-14 16:44:15 +01:00
27e4c87869
no need to revert this actually
2015-12-14 11:10:16 -03:00
Juan Linietsky
Ariel Manzur
Rémi Verschelde
mrezai
Ariel Manzur
Rémi Verschelde
hondres
Ariel Manzur
hondres
Ignacio Etcheverry
Franklin Sobrinho
eska