9954431068
Merge pull request #3138 from Hinsbart/joy_hotplug
...
Fix joystick hotplugging on windows, using right indices now
2015-12-26 10:50:25 -03:00
9d9520f227
Merge branch 'master' of https://github.com/okamstudio/godot
2015-12-26 10:27:04 -03:00
13964f59c1
-Added table support to RichTextLabel
...
-Made help more readable, closes #2851
2015-12-26 10:25:17 -03:00
d8143eb3fb
Fix joystick hotplugging on windows, using right indices now
2015-12-26 13:14:13 +01:00
dfd7bdb005
Merge pull request #3120 from Marqin/master
...
.travis.yml upgrade
2015-12-24 10:43:31 +01:00
0a8d20c8f7
Merge pull request #3131 from Hinsbart/missing_highlight
...
Add missing keyword highlights for Rect2 and NodePath.
2015-12-24 10:42:23 +01:00
b431c88146
Colorize Rect2 and NodePath in script editor
2015-12-24 04:20:26 +01:00
6055a67cb8
upgrade .travis.yml
...
Now it test 6 builds:
* Ubuntu 14.04 - x11 (g++)
* Ubuntu 14.04 - x11 (clang++)
* Ubuntu 14.04 - windows (via MinGW)
* OS X - osx (g++)
* OS X - osx (clang++)
* OS X - android
* OS X - iphone
Instead of just g++ on Ubuntu 12.04...
2015-12-23 15:33:39 +01:00
380fe0bd52
Merge pull request #3124 from mrezai/libpng-ios
...
Fix ios libpng link error
2015-12-23 11:20:29 -03:00
6cfede11e3
removed -ffast-math on ios, compiler bug?
2015-12-23 11:19:12 -03:00
92cc8fcc74
redundant TAB removed
2015-12-23 15:41:46 +03:30
0897b73cd6
Fix ios libpng link error
2015-12-23 14:57:00 +03:30
b803bedb7d
Merge pull request #3116 from Ovnuniarchos/DocArea2D
...
New area space override modes documented.
2015-12-22 19:55:44 +01:00
69a65e5a69
New area space override modes documented. Also, PhysicsBody2D, Area2D, and CollisionObject2D.
2015-12-22 15:48:41 +01:00
acc9db1695
Merge pull request #3071 from Ovnuniarchos/NewAreaCombiners
...
New and corrected area override modes.
2015-12-22 10:57:39 -03:00
02d6669a38
threads
2015-12-22 10:08:20 -03:00
50e9839089
Merge pull request #3113 from Hinsbart/joy_fix
...
Check pkg-config for libudev and enable gamepad code only if found.
2015-12-22 09:29:38 -03:00
8433221629
missing?
2015-12-22 09:26:54 -03:00
83f2084cb8
testing patch for aligned reads by webp in javascript
2015-12-22 09:19:12 -03:00
541c9039c5
Check pkg-config for libudev and enable gamepad code only if found. Linux only for now
2015-12-21 22:39:03 +01:00
1bc91848e3
thread
2015-12-21 10:58:51 -03:00
9bf7adfc1f
-another approach to solving the deadlock problem :|
2015-12-21 10:51:27 -03:00
46dee92c8e
-fixed build system to use pkg-config for evdev
2015-12-21 10:37:26 -03:00
3fe740dac6
Merge branch 'master' of https://github.com/godotengine/godot
2015-12-21 10:26:04 -03:00
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
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
punto-
reduz
Hondres
Rémi Verschelde
hondres
Marqin
Ariel Manzur
mrezai
Ovnuniarchos
Juan Linietsky
Ariel Manzur
Rémi Verschelde
hondres