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

599 commits

Author SHA1 Message Date
Rémi Verschelde c0aade4ba4 Merge pull request #3493 from Hinsbart/wm_class 
x11: use different strings for WM_CLASS depending on context
 2016-02-03 11:30:22 +01:00
Rémi Verschelde fc65a57ff5 Merge pull request #3538 from Hinsbart/temp 
remove pc_joystick_map.h
 2016-02-03 11:18:43 +01:00
hondres f7b1ab843c x11: fix non-gamepad devices being detected as joysticks 2016-02-02 23:23:20 +01:00
hondres f4fa74fe28 remove pc_joystick_map.h 2016-02-01 14:28:53 +01:00
hondres 2809b31f8c close file descriptor if ioctls failed 2016-02-01 13:39:50 +01:00
punto- 987bfb4b5e Update detect.py 
removed -g from linkflags
 2016-01-29 17:33:45 -03:00
Ariel Manzur 593b01b709 audio crash 2016-01-29 07:18:53 -03:00
hondres 11e4c128ac x11: use different strings for WM_CLASS depending on context 2016-01-27 21:53:37 +01:00
Hondres e7b6e3f20b use fallback mapping from list 2016-01-27 12:18:34 +01:00
punto- 93bef9b9b1 Merge pull request #3471 from Hinsbart/remove_libevdev 
remove dependancy on libevdev
 2016-01-27 04:32:27 -03:00
George Marques 82b24bea6f Revert "make msvc 64bits build again, fixes #3098" 
This reverts commit b21ce6cecb.
 2016-01-26 22:26:04 -02:00
hondres 29353808f0 remove dependancy on libevdev 2016-01-26 23:04:57 +01:00
Juan Linietsky 16b8b97472 Combies driver split and spawn fix, closes #3265 2016-01-25 00:25:32 -03:00
Juan Linietsky caddcca4f4 -Many fixes to windows build system with Mingw on Windows. Fixes #2690 2016-01-25 00:21:04 -03:00
George Marques f4a39692b9 Change default window size for desktop 
Fix #3149
 2016-01-24 17:52:33 -02:00
hondres 285bcac224 can use fallback mapping on all platforms 2016-01-24 18:01:37 +01:00
hondres e7c920fdba support gamepad remapping on android 2016-01-24 05:29:09 +01:00
hondres 1ad6ca0a81 add mappings and increase max number of buttons 2016-01-22 22:56:05 +01:00
Hinsbart 77858b66d3 html5 gamepad support 2016-01-21 02:30:24 +01:00
Juan Linietsky e7eb332799 fix export bug 2016-01-20 07:43:05 -03:00
Rémi Verschelde 55ab7d1d1c Merge pull request #3392 from Hinsbart/html5-gamepad 
fix string conversion in javascript export
 2016-01-20 10:08:13 +01:00
hondres c4578453fa fix string conversion in javascript export 2016-01-20 08:59:14 +01:00
Rémi Verschelde f3f74cf9ae Merge pull request #3391 from eska014/web-export-page 
Overhaul web export page
 2016-01-20 07:57:07 +01:00
Juan Linietsky c9580965ea -Remote deploy now uses FS over USB on Android, super fast! 2016-01-20 00:29:34 -03:00
eska 696643ce18 Revamp web export page 2016-01-20 03:41:39 +01:00
volzhs c937fd5be6 missed rename "keep_screen_on" for ios 2016-01-19 01:58:51 +09:00
Rémi Verschelde 1469508174 Merge pull request #3364 from Max-Might/master 
Haiku: fix build and add resource file
 2016-01-18 14:51:01 +01:00
Rémi Verschelde 7e20c86ac7 Merge pull request #3360 from volzhs/keep-screen-on-5 
Add ability to set "keep screen on" for android & iOS. fixes #2428
 2016-01-18 14:44:49 +01:00
mrezai 48bf9d3139 Fix 32 bit windows export crash 2016-01-16 19:22:40 +03:30
volzhs 182d2e5dc9 Add ability to set "keep screen on" for iOS 2016-01-16 20:59:09 +09:00
volzhs fb2bf78591 Add ability to set "keep screen on" for android 2016-01-16 20:57:34 +09:00
Kostadin Damyanov 19753233ad Haiku: add resource file 2016-01-16 07:34:00 +02:00
Kostadin Damyanov 7998197ff1 Merge remote-tracking branch 'upstream/master' 2016-01-15 22:43:54 +02:00
punto- 7393e40452 Merge pull request #3272 from Hinsbart/joy-binding 
Add some joystick functions to input. Enables manipulation of mapping…
 2016-01-12 03:59:19 -03:00
mrezai 4cb14ae7d6 Fix crash on android 6.0.1, fixes #3321 2016-01-12 09:57:56 +03:30
Rémi Verschelde 1f1c3038c2 Update copyright in remaining files + prints in the UI 2016-01-11 21:34:22 +01:00
Rémi Verschelde 7f82c8d7c5 Merge pull request #3230 from touilleMan/issue-55 
Remove unnecessary null pointer checks
 2016-01-11 12:00:44 +01:00
Rémi Verschelde 4c090313bc Merge pull request #3304 from eska014/fbsd-alsa 
Give FreeBSD a chance to enable ALSA
 2016-01-11 08:50:15 +01:00
Juan Linietsky b21ce6cecb make msvc 64bits build again, fixes #3098 
disabled assembly for msvc 64 bits, as it is not supported
 2016-01-10 21:26:34 -03:00
Juan Linietsky a120c66f98 -Removed OS.get_system_time_msec(), this is undoable on Windows and also unusable from GDscript due to precision. 
-Added, instead an OS.get_system_time_secs(), which is 32 bits friendly, fixes #3143
 2016-01-10 18:24:55 -03:00
eska 56e65f9e29 Enable ALSA driver in non-linux X11 when available 2016-01-10 17:52:15 +01:00
Juan Linietsky c9852501a4 Fix bug related to EOF in Android FileAccess 2016-01-09 20:50:45 -03:00
eska a6c1a5c6d0 Fix pthread renaming in Open/FreeBSD 2016-01-09 15:56:31 +01:00
mrezai 50cbe736de Fix maven repositories bug 2016-01-09 16:51:22 +03:30
Juan Linietsky 6a29edf048 removed unnecesary comma in gradle template 2016-01-08 17:55:13 -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
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
hondres c632c13c66 Add some joystick functions to input. Enables manipulation of mappings at runtime 2016-01-08 00:40:41 +01:00
Peace Sells 9f00d9e44b Better fix for visual studio project generation. 2016-01-06 22:47:43 -07: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
hondres c0e4d8fbfd fix x11 crash on exit 2016-01-05 23:35:54 +01:00
hondres 3f64fd64eb define XUSER_MAX_COUNT if not present 2016-01-05 01:16:10 +01:00
Emmanuel Leblond cabf923484 Remove unnecessary null pointer checks 2016-01-04 11:46:16 +01:00
Juan Linietsky e0eff65fc0 change android install location to automatic, closes #1997 2016-01-03 20:31:37 -03:00
Juan Linietsky 908f75c23f having active items is pointless in input map 2016-01-03 18:52:42 -03:00
hondres 17d664cf1d send axis events only once per frame on linux 2016-01-03 02:24:43 +01:00
hondres c60e1648ba make num_buttons local, no need to keep in joystick struct 2016-01-02 03:52:44 +01:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky 586e482a98 -Fix parsing of comments in VariantParser, fixes #3175 2015-12-31 10:25:21 -03: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
Kostadin Damyanov 62574759ab Haiku: fix build 2015-12-26 18:54:05 +02:00
Hondres d8143eb3fb Fix joystick hotplugging on windows, using right indices now 2015-12-26 13:14:13 +01:00
Ariel Manzur 6cfede11e3 removed -ffast-math on ios, compiler bug? 2015-12-23 11:19:12 -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
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
Juan Linietsky 46dee92c8e -fixed build system to use pkg-config for evdev 2015-12-21 10:37:26 -03:00
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
punto- 33e5c3181d Merge pull request #3101 from Hinsbart/remapping-new 
Better gamepad support
 2015-12-20 11:08:04 -03:00
hondres 87dab29f4b Use tabs instead of spaces for new gamepad code 2015-12-18 19:15:32 +01:00
Ariel Manzur 4a7e5fafb1 thread rename for ios and osx (if called from the thread to be renamed) 2015-12-18 02:58:30 -03:00
hondres af633c7941 Better gamepad support 2015-12-18 06:12:53 +01:00
Ariel Manzur 27e4c87869 no need to revert this actually 2015-12-14 11:10:16 -03:00
santiagopf a9795d5826 Merge branch 'master' of https://github.com/godotengine/godot 2015-12-14 10:58:26 -03:00
santiagopf c8077de714 utf stuff on osx 2015-12-13 22:21:49 -03:00
Juan Linietsky 95a469ad28 added binary API to StreamPeer, fixes #2863 2015-12-13 12:53:29 -03:00
santiagopf 01f063e2fe reverted mouse stuff 
t Please enter the commit message for your changes. Lines starting
 2015-12-13 01:28:42 -03:00
santiagopf d6f9426748 isim 2015-12-12 19:13:40 -03:00
Juan Linietsky 890b462ffb added rotation and scale support to gui controls 2015-12-12 13:54:26 -03:00
Juan Linietsky cc7880fba5 -added windowed mode with -w, fixes #3020 
-changed default windowed resolution to 1280x720
 2015-12-12 12:06:53 -03:00
punto- 25d19e08bb Merge pull request #590 from marynate/PR-fix-ios-release-event 
Fixed ios release event not been dispatched when app entering background
 2015-12-11 21:30:02 -03:00
Juan Linietsky 708ff381d6 changed a bit to use system() 2015-12-08 20:36:48 -03:00
Juan Linietsky 78b5404434 improve detection of linux, fixes #3201 2015-12-08 20:35:40 -03:00
Juan Linietsky ac414c5581 Merge pull request #2849 from a12n/compobsd2 
Compile on OpenBSD
 2015-12-08 17:16:45 -03:00
Juan Linietsky eff81965af Merge pull request #2956 from est31/add_system_wide_export_path 
Add way to look for templates at system wide level too
 2015-12-08 17:04:24 -03:00
Juan Linietsky 7ba484bc74 some fixes 
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
 2015-12-06 20:22:45 -03:00
Juan Linietsky 4b1f0afb01 -several fixes to Android to work better on Tegra 3/4 devices, uses 16 bits FBOs so all 2D shader effects should now work in every single Android device. 2015-12-02 11:15:48 -03:00
Rémi Verschelde e4e7e8f396 Merge pull request #2963 from akien-mga/pr-opus-arm-opt 
Enable opus ARM optimisations only on ARM
 2015-12-01 10:18:41 +01:00
Rémi Verschelde 99e7641f3d Enable opus ARM optimisations only on ARM 
i.e. do not enable it for x86.
Fixes #2962.
 2015-12-01 09:34:51 +01:00
est31 15f6d3cebf Add way to look for templates at system wide level too 
Useful for everybody wanting to package godot.
Fixes #1026.

-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
 2015-11-30 01:36:08 +01:00
koalefant bd396c5cfa Enabled debug symbols for x11 when using platform=release_debug and debug_release=yes together 2015-11-29 20:56:27 +01:00
Rémi Verschelde 55d56d9b7c Replace hardcoded references to Okam Studio by Godot Engine 
Since the engine development is now independent.
Fixes #2836.
 2015-11-27 18:54:09 +01:00
Juan Linietsky b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
Juan Linietsky 082e3fbb29 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	main/main.cpp
 2015-11-24 10:52:41 -03:00
Juan Linietsky ccd40f76e8 -work in progress resourceparser and .tscn parser. Still non-functional 
-fixed theora so it can compile theoralib but not theora
-fixed generation of windows icon in .rc, which didn't previously work in 32 bits
 2015-11-24 10:42:05 -03:00
mikica1986vee d6b317a2c1 tegra 3 fix 2015-11-21 23:21:36 +01:00
Anton Yabchinskiy b14c90801f Disable X11 joystick functions also for OpenBSD 2015-11-20 23:36:34 +03:00
Anton Yabchinskiy 523e64d30b Include string.h for memset() on OpenBSD 2015-11-20 23:36:14 +03:00