maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2580 commits 10 branches 35 tags 1.1 GiB
Commit graph

2580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rémi Verschelde fe46b2ac0c Fix wrong getters in ShaderGraph 2015-12-28 01:42:22 +01:00
Rémi Verschelde d1caf2f037 Remove bogus argument in body_get_node 2015-12-28 01:32:12 +01:00
Rémi Verschelde 46eebac3ae Remove bogus argument in sample_get_description 
Copy-paste mistake from the setter most likely.
 2015-12-28 01:18:37 +01:00
Rémi Verschelde 9fddc69769 Style fix for rounded_values methods in Range 2015-12-28 00:12:13 +01:00
Rémi Verschelde e66f4a4021 Sync doc with current source 2015-12-27 23:06:13 +01:00
Juan Linietsky 4dba503fc3 Merge pull request #3140 from neikeq/fix_refresh_icon 
Add reload icon to FileDialog's default theme
 2015-12-26 15:37:00 -03:00
Ariel Manzur 6387a8e01f fixes crash/deadlock when video is paused and unpaused, might affect audio sync tho 2015-12-26 15:39:49 -03:00
reduz bf6ba2df46 Merge branch 'master' of https://github.com/okamstudio/godot 2015-12-26 15:20:48 -03:00
reduz ddd66c8904 small optimization improvement to rich text label tables 2015-12-26 15:18:01 -03:00
Ignacio Etcheverry 84c5585afe Added reload icon to FileDialog's default theme 2015-12-26 19:15:22 +01:00
punto- 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
reduz 9d9520f227 Merge branch 'master' of https://github.com/okamstudio/godot 2015-12-26 10:27:04 -03:00
reduz 13964f59c1 -Added table support to RichTextLabel 
-Made help more readable, closes #2851
 2015-12-26 10:25:17 -03:00
Hondres d8143eb3fb Fix joystick hotplugging on windows, using right indices now 2015-12-26 13:14:13 +01:00
Rémi Verschelde dfd7bdb005 Merge pull request #3120 from Marqin/master 
.travis.yml upgrade
 2015-12-24 10:43:31 +01:00
Rémi Verschelde 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
hondres b431c88146 Colorize Rect2 and NodePath in script editor 2015-12-24 04:20:26 +01:00
Marqin 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
punto- 380fe0bd52 Merge pull request #3124 from mrezai/libpng-ios 
Fix ios libpng link error
 2015-12-23 11:20:29 -03:00
Ariel Manzur 6cfede11e3 removed -ffast-math on ios, compiler bug? 2015-12-23 11:19:12 -03:00
mrezai 92cc8fcc74 redundant TAB removed 2015-12-23 15:41:46 +03:30
mrezai 0897b73cd6 Fix ios libpng link error 2015-12-23 14:57:00 +03:30
Rémi Verschelde b803bedb7d Merge pull request #3116 from Ovnuniarchos/DocArea2D 
New area space override modes documented.
 2015-12-22 19:55:44 +01:00
Ovnuniarchos 69a65e5a69 New area space override modes documented. Also, PhysicsBody2D, Area2D, and CollisionObject2D. 2015-12-22 15:48:41 +01:00
Juan Linietsky acc9db1695 Merge pull request #3071 from Ovnuniarchos/NewAreaCombiners 
New and corrected area override modes.
 2015-12-22 10:57:39 -03:00
Ariel Manzur 02d6669a38 threads 2015-12-22 10:08:20 -03:00
Juan Linietsky 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
Ariel Manzur 8433221629 missing? 2015-12-22 09:26:54 -03:00
Ariel Manzur 83f2084cb8 testing patch for aligned reads by webp in javascript 2015-12-22 09:19:12 -03:00
hondres 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
Ariel Manzur 1bc91848e3 thread 2015-12-21 10:58:51 -03:00
Juan Linietsky 9bf7adfc1f -another approach to solving the deadlock problem :| 2015-12-21 10:51:27 -03:00
Juan Linietsky 46dee92c8e -fixed build system to use pkg-config for evdev 2015-12-21 10:37:26 -03:00
Juan Linietsky 3fe740dac6 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-21 10:26:04 -03:00
Juan Linietsky 49a19f85b8 -different attempt to avod deadlock problem 2015-12-21 10:25:46 -03:00
Ariel Manzur d4ed043968 too early to rename thread 2015-12-21 09:38:44 -03:00
Ariel Manzur 0576e1e28f Merge branch 'master' of https://github.com/godotengine/godot 2015-12-21 09:17:15 -03:00
Juan Linietsky 15429d6ac9 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-21 09:07:06 -03:00
Juan Linietsky 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
Ariel Manzur 72a6b137ba audio threads 2015-12-21 09:01:40 -03:00
Rémi Verschelde b2f670ebae Merge pull request #3109 from mrezai/libpng-filter_neon 
Fix libpng link errors on android
 2015-12-21 12:16:41 +01:00
mrezai bf69e07ea6 Fix libpng link errors on android 2015-12-21 11:50:54 +03:30
Ariel Manzur 020700af1d windows resource version thing 2015-12-20 13:43:08 -03:00
Ariel Manzur 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
Ariel Manzur a5fe71a0e9 this failed in msvc, didn't in linux and mingw 2015-12-20 11:42:55 -03:00
Ariel Manzur 5f1ae5eac2 fix debouncing in axis buttons 2015-12-20 11:33:29 -03:00
punto- 33e5c3181d Merge pull request #3101 from Hinsbart/remapping-new 
Better gamepad support
 2015-12-20 11:08:04 -03:00
Rémi Verschelde 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
Rémi Verschelde 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
hondres 87dab29f4b Use tabs instead of spaces for new gamepad code 2015-12-18 19:15:32 +01:00