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

454 commits

Author SHA1 Message Date
Juan Linietsky c2515d352e Merge pull request #2369 from Max-Might/master 
Haiku: platform support
 2015-10-17 10:48:57 -03:00
Juan Linietsky b217e1417a Merge pull request #2479 from firefly2442/cppcheck-unusedvars 
ran cppcheck, found unused variables
 2015-10-17 10:25:36 -03:00
Juan Linietsky 13d2710fed Merge pull request #2474 from masoudbh3/android-armeabi-v7a 
Fix android build script
 2015-10-17 10:20:47 -03:00
Juan Linietsky 4a8bc25f18 Merge pull request #2485 from masoudbh3/fix-x11-editor-boot-splash 
Fix X11 Editor Boot Splash (Maximized Boot Splash)
 2015-10-17 10:12:34 -03:00
Juan Linietsky 782444d366 Merge pull request #2602 from sanikoyes/Pr-REUSE_ADDR_WIN32 
Pr-REUSE_ADDR_WIN32
 2015-10-17 09:44:07 -03:00
Kostadin Damyanov c925fbce2d Haiku: fix build 2015-10-17 15:41:01 +03:00
Didier Vandekerckhove d48a1bd22d Added specific get_locale to OSX platform 
The default unix get_locale didn’t work. OS X requires a specific one.
 2015-10-16 19:42:26 +02:00
sanikoyes 15f6991064 REUSE_ADDR under windows platform 2015-10-13 13:11:33 +08:00
Juan Linietsky b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	platform/windows/detect.py
 2015-10-13 01:19:32 -03:00
Kostadin Damyanov 29caf2bb5b Merge remote-tracking branch 'upstream/master' 2015-10-13 05:01:54 +03:00
reduz aad2bbdb6f newline fixes 2015-10-08 15:00:40 -03:00
George Marques 6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03:00
Juan Linietsky e055247b17 -Added ability to use cubic interpolation on image resize (little more quality on non-po2 resizing) 
-Added ability for exporter to shrink images to non-integer values. Helps if you want to convert your game artwork from 1080->720 or similar
 2015-10-01 16:25:36 -03:00
punto- 0840303a9c Merge pull request #2548 from romulox-x/iCloud 
Initial iCloud implementation
 2015-09-28 17:20:16 +02:00
steve b4daeda48b improved iCloud build option description 2015-09-27 17:21:32 -07:00
steve 1fe5cc8e1d Initial iCloud implementation, supporting key value pairs 2015-09-27 16:54:20 -07:00
Rémi Verschelde be51861310 Hide stderr when trying to detect mingw binaries on posix 2015-09-27 16:31:19 +02:00
Rémi Verschelde 092f84642c Rename voice_set_volume argument to p_volume to avoid confusion 
This argument is indeed expected to be a volume on a linear scale (not dB),
typically from 0.0 to 1.0, though it can go higher than 1.0.
 2015-09-26 22:43:34 +02:00
Juan Linietsky c858515785 Fixed theora playback. Removed theoraplayer. 
Still need to get proper audio output latency in some platforms.
 2015-09-26 14:50:42 -03:00
Juan Linietsky 9962518ffd Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-24 18:07:13 -03:00
Juan Linietsky 82a3304458 Added ability to set custom mouse cursors. Not hardware accelerated yet. 2015-09-24 18:06:15 -03:00
Juan Linietsky ce6fefced8 Properly implement OS.alert() from script, and use xmessage on X11 2015-09-21 09:39:46 -03:00
Juan Linietsky 83d9a692be Ability to visually debug geometry visually: 
-Visible 2D and 3D Shapes, Polygons, Tile collisions, etc.
-Visible Navmesh and Navpoly
-Visible collision contacts for 2D and 3D as a red point
-Customizable colors in project settings
 2015-09-20 13:03:46 -03:00
masoud bh 3c466afb68 Fix X11 Editor Boot Splash 2015-09-17 05:19:43 +04:30
firefly2442 afbb6c064c ran cppcheck, found unused variables 2015-09-16 15:35:30 -05:00
masoud bh 9d540afd1c android remove "gen" folder from git. 2015-09-16 16:28:01 +04:30
masoud bh 867c95223d Fix android build script 
some fixes for android build script.
remove armv6,x86 options and add "android_arch" option for select
compiler architecture (armv7,armv6,x86)(default armv7).
add architecture suffix for output files and you can compile for several
architecture simultaneously.
example:
libgodot.android.opt.debug.armv7.so
libgodot.android.opt.debug.armv7.neon.so
libgodot.android.opt.debug.armv6.so
libgodot.android.opt.debug.x86.so
now we can enable/disable neon on armv7 with "android_neon" option
(default enable).
add "NDK_TARGET_X86" option for select toolchain to use for the NDK x86
(default x86-4.8).
change inputs model for "ndk_platform" option (default android-15).
fix armv7 ccflags.

with this patch, must put libgodot_android.so file in specific
architecture folder:

armv7 (default): <android-java>/libs/armeabi-v7a/
armv6: <android-java>/libs/armeabi/
x86: <android-java>/libs/x86/
 2015-09-16 16:14:38 +04:30
Juan Linietsky 89a901c4b6 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-12 10:56:13 -03:00
Juan Linietsky a88f67821c HTML5 exporter seems to be fully functional 
-user:// filesystem implemented
-default template page could look prettier, help appreciated
 2015-09-12 10:54:47 -03:00
Juan Linietsky 943714c015 Merge pull request #2461 from romulox-x/iphoneSplash 
fixed iOS splash screen
 2015-09-12 00:17:24 -03:00
Juan Linietsky 56c907ad04 fix to builtin freetype defines on linux 2015-09-10 22:15:00 -03:00
Juan Linietsky 751202768c fix to freetype detection 2015-09-10 21:40:34 -03:00
Juan Linietsky c7426717d3 Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 20:31:34 -03:00
Juan Linietsky 83b69f8fef remotion of some c++ includes to avoid dependency on libstdc++ 2015-09-10 20:30:46 -03:00
steve b0e5031f1f ios now displays splash screen between launch image and main scene, instead of a black screen 2015-09-10 15:01:02 -07:00
Juan Linietsky 59e1ad2773 disabling theora for now (will be re-written, re-enabled later) 2015-09-10 13:27:15 -03:00
Juan Linietsky 3013a83f2f Merge branch 'master' of https://github.com/okamstudio/godot 2015-09-10 00:12:05 -03:00
Juan Linietsky 0fb7b5aa0c HTML5 exporter Improvements 
-Better template handling
-Voice support
-Stream support
 2015-09-10 00:10:54 -03:00
punto- 4d900859e2 ios build with osxcross 2015-09-09 21:57:49 +02:00
Kostadin Damyanov c5f574b914 Merge remote-tracking branch 'upstream/master' 2015-09-05 12:03:17 +03:00
Juan Linietsky b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -03:00
Juan Linietsky cf57a654d7 new editor settings customization of where to run the game from the editor 2015-08-30 23:36:46 -03:00
Juan Linietsky 3a59747c62 -fixes to capture mode 
-ability to drag spinboxes and tree ranges to change values, like in Unity or Unreal
 2015-08-29 01:43:21 -03:00
Juan Linietsky 700fdf5c0c fix build issue with ssl, closes #2384 2015-08-23 20:54:13 -03:00
Juan Linietsky e1e54d39e4 damn github built-in editor 2015-08-21 22:33:49 -03:00
Juan Linietsky 2de5e12116 fix for built-in ssl (easier to build 32 bits export) 2015-08-21 22:31:06 -03:00
Kostadin Damyanov 2a757a6ad4 Haiku: move the audio driver to platform/haiku 2015-08-14 22:52:28 +03:00
Kostadin Damyanov b038a2c3c2 Haiku: update logo.png 2015-08-13 22:36:43 +03:00
Kostadin Damyanov ced44b45d3 Haiku: remove unneeded code 2015-08-12 22:14:40 +03:00
Kostadin Damyanov f48ce8901a Haiku: remove unneeded code 2015-08-12 21:40:45 +03:00
Kostadin Damyanov cdf1ac7d58 Merge remote-tracking branch 'upstream/master' 2015-08-09 12:45:21 +03:00
Juan Linietsky 0a139aaef9 Merge pull request #2302 from antonyjones67/AndroidTemplateCompileWindows 
Fixes compile bug for Android template on Windows.
 2015-08-08 11:14:28 -03:00
Maximillian 6f9a084ac8 Add OS.get_system_time_msec 2015-08-06 10:29:33 -07:00
Juan Linietsky 9d185ccc30 -Merged the file server with the live editing and remote debug 
-It is now really easy to deploy an android build with debug, and debug it
 2015-08-06 02:37:40 -03:00
Anton Yabchinskiy dc8df8a91a Merge branch 'master' of github.com:okamstudio/godot 2015-07-29 23:01:36 +03:00
Kostadin Damyanov f5bfd497aa Haiku: add sound support 2015-07-26 02:18:32 +03:00
PeaceSells 9983ceecf2 Fixes compile bug for Android template on Windows. 2015-07-24 13:12:23 -06:00
Jari Ronkainen 983fd0dfc3 Use tabs instead of spaces. 2015-07-23 19:35:47 +03:00
Jari Ronkainen 8027a3f004 Fix audio driver setup if the first driver fails. 2015-07-23 19:32:10 +03:00
Kostadin Damyanov f8db8b7215 Haiku: update detect.py 2015-07-20 22:45:22 +03:00
Kostadin Damyanov 07e76a3f2c Haiku: add keyboard support 2015-07-12 00:52:47 +03:00
Kostadin Damyanov 77e78cdb20 Haiku: gl context locking 2015-07-02 18:41:32 +03:00
romulox_x 1d22b0265b fixed ios compilation error 2015-07-01 23:07:01 -07:00
volzhs f6668dc9db Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments 2015-07-01 15:13:10 +09:00
Juan Linietsky 55b34e05b3 -some changes by okam 2015-06-30 11:28:43 -03:00
Juan Linietsky 95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources. 
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
 2015-06-29 00:29:49 -03:00
volzhs 903e6b37c0 fix crash by payments when run on android 5.1.1 device. 
(http://stackoverflow.com/questions/24480069/google-in-app-billing-illegalargumentexception-service-intent-must-be-explicit)
 2015-06-29 02:56:38 +09:00
Kostadin Damyanov e0e54ea7d4 Merge remote-tracking branch 'upstream/master' 2015-06-26 21:35:47 +03:00
Kostadin Damyanov 7ad89c7e83 Haiku: implement some more window-related methods 2015-06-23 21:22:12 +03:00
James McLean 2f33f820e9 Fixed compilation error on MacOS X. 2015-06-22 00:56:49 -04:00
Kostadin Damyanov 174df9a276 Haiku: add support for mouse wheel 2015-06-21 22:18:27 +03:00
Kostadin Damyanov 6f48ddc61d Haiku: add some screen and window-related methods 2015-06-21 02:08:31 +03:00
Kostadin Damyanov b59e95ce1c Haiku: implemet get_widow_size() get/set_window_position() 2015-06-20 15:35:54 +03:00
Kostadin Damyanov d44dfc2440 Haiku: cleanup, add TODOs 2015-06-20 03:43:11 +03:00
Kostadin Damyanov 93ac4ace0a Haiku: handle the quit request message 2015-06-20 01:59:32 +03:00
Kostadin Damyanov 0038e27fc3 Merge remote-tracking branch 'upstream/master' 2015-06-18 22:48:29 +03:00
Kostadin Damyanov f10eb8ffa1 Haiku: implement get_mouse_pos() and get_mouse_button_state() 2015-06-18 22:41:33 +03:00
Kostadin Damyanov 2102d35e9c Haiku: read the status of the key modifiers and mouse buttons 2015-06-17 22:27:45 +03:00
Kostadin Damyanov 1505d65ac9 Haiku: handle mouse movement and click events 2015-06-16 21:52:24 +03:00
Juan Linietsky 4e46143499 some optimizations in godot memory handling 2015-06-12 18:27:48 -03:00
Kostadin Damyanov 8df3e30abd Haiku: create a GL context and initialize the audio and physics servers 2015-06-11 22:57:41 +03:00
Juan Linietsky c76900beb8 draw button focus before text and icon 
closes #2047
 2015-06-08 10:36:27 -03:00
est31 ddba217109 Complete fix for windows compilability 
Thanks @volzhs for testing :)
 2015-06-07 16:12:03 +02:00
est31 64704ecbc5 Fix windows compilability 2015-06-07 15:36:14 +02:00
Juan Linietsky 8d61817293 Merge pull request #2037 from est31/use-local-win 
Time zone support
 2015-06-07 00:32:29 -03:00
Juan Linietsky dac398ba58 Merge pull request #2017 from Razzlegames/multitouch_fix_1908 
Additional Fix for Multi-touch release problem
 2015-06-07 00:29:46 -03:00
est31 c5338fd6c4 Add OS.get_time_zone_info function 
The returned dictionary maps "name" to the
name of the current time zone, and "bias" to
a bias from UTC in minutes.
 2015-06-06 05:57:33 +02:00
est31 803069886e Add utc param to get_time and get_date methods 
If utc == false, we return the local time, like before.
Otherwise, we return UTC time.
utc defaults to false to not break behaviour.
 2015-06-06 05:55:28 +02:00
est31 26ea12a873 Use local time for both time and date on win 
On unix and nacl, both date and time are expressed in local time.
 2015-06-06 03:23:34 +02:00
romulox_x ef173a2c9c improved calculation of screen resolution on ios 2015-06-03 21:57:33 -07:00
Kyle Luce 77461a126e Additional Fix for Multi-touch release problem 
- Was duplicating the functionality of event.getActionIndex() but was missing the bitmask.
- Switched back to getActionIndex() but kept the corrected getPointerId() from
  change #1980

https://github.com/okamstudio/godot/pull/1908
 2015-05-31 19:37:19 -07:00
Kostadin Damyanov 8130707e01 Haiku: start implementing the os-dependant stuff 2015-05-30 00:57:07 +03:00
Kostadin Damyanov db459fba1d Haiku: fix build, link with libGL and libGLEW 2015-05-29 23:36:48 +03:00
Kostadin Damyanov 513d509783 Haiku: enable building with GLES 2015-05-28 03:42:40 +03:00
Kostadin Damyanov 8dd674d639 Haiku: enable debug support 2015-05-28 00:59:41 +03:00
punto- 70edfcdc8d Merge pull request #1966 from romulox-x/iosServicesAdditions 
Improved iOS Game Center functions
 2015-05-26 11:41:56 -03:00
Juan Linietsky 9df77d2765 ability to run 2D physics in a thread 
also, 2D physics is now thread safe too.
see physics_2d/thread_model
 2015-05-26 01:06:05 -03:00
Kostadin Damyanov a553327043 Haiku: some small fixes 2015-05-25 06:34:16 +03:00
Kostadin Damyanov 826f8af1ef Haiku: link with the haiku libs, stub the OS_Haiku class. 2015-05-25 06:02:55 +03:00
Kostadin Damyanov 4e07a2dea8 Haiku: fix building with UNIX_ENABLED. 2015-05-25 03:49:24 +03:00