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

654 commits

Author SHA1 Message Date
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
Anton Yabchinskiy
52f1bab6d5 Include stdlib.h for alloca() on OpenBSD 2015-11-20 23:35:53 +03:00
Anton Yabchinskiy
0931eed7be Enable ALSA only for Linux 2015-11-20 23:35:19 +03:00
Juan Linietsky
2769da7744 compile fixes 2015-11-19 20:24:43 -03:00
Juan Linietsky
dd09215c90 Revert "libao audio driver" 2015-11-19 20:05:26 -03:00
Juan Linietsky
6127f17368 Merge pull request #2756 from trond/bugfix_udp 
UDP fixes
 2015-11-19 19:33:04 -03:00
Juan Linietsky
43ce972ddb Merge pull request #903 from a12n/libao 
libao audio driver
 2015-11-19 19:31:56 -03:00
Trond Abusdal
a8a2458f0b Fixed mistake where available buffer size would not be updated for each recvfrom-call in PacketPeerUDPWinsockPposix. 2015-11-19 19:06:01 +01:00
ZuBsPaCe
ce3216429e Added missing \n in script error output. 2015-11-19 15:35:18 +01:00
ZuBsPaCe
a5683def19 Nice error output padding. Code location behind " At: " is now aligned with the error message above. Also removed the dot after the file location. 2015-11-19 15:19:25 +01:00
ZuBsPaCe
42beb83178 Set console background color on windows in SetConsoleTextAttribute, otherwise text background will be black, which looks strange if the terminal color is not black. 2015-11-19 15:19:22 +01:00
ZuBsPaCe
a89c861931 Set output color of ERR_SCRIPT messages to purple. Same as on linux. 2015-11-19 15:19:20 +01:00
ZuBsPaCe
9f9452d023 Removed ANSI error codes from windows terminal error output. Windows does not support them. 
See: http://stackoverflow.com/questions/16755142/how-to-make-win32-console-recognize-ansi-vt100-escape-sequences
See: http://stackoverflow.com/questions/22777142/is-there-a-way-to-make-windows-output-ansi-escape-sequences?lq=1
 2015-11-19 15:19:18 +01:00
ZuBsPaCe
e23734363e Inconsistent code formatting in print_error (Newlines and spaces) 2015-11-19 15:19:16 +01:00
Juan Linietsky
d3eb9e8c54 -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 2015-11-19 10:41:20 -03:00
Juan Linietsky
0168947084 Merge pull request #2518 from masoudbh3/godot-icons 
Add icon to exe file in windows export
 2015-11-19 00:08:47 -03:00
Juan Linietsky
33aa019e4f Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation 
Visual studio 2015 compilation
 2015-11-18 23:56:06 -03:00
Juan Linietsky
0c3386b2ed Merge pull request #2707 from akien-mga/master 
Cosmetic fixes to SCons buildsystem
 2015-11-18 19:43:28 -03:00
Juan Linietsky
067c96d26f Merge pull request #2718 from SaracenOne/audio_system_crash_fix 
Fixed Audio System Crash
 2015-11-18 19:35:22 -03:00
Juan Linietsky
5fb95859e1 Merge pull request #2814 from masoudbh3/android-fa-locale 
Android add FA(persian) locale strings
 2015-11-18 19:21:54 -03:00
masoud bh
f2704eb162 Android add FA(persian) locale strings 2015-11-19 01:40:29 +03:30
Juan Linietsky
34a558ee8d Merge pull request #2691 from volzhs/android_payment 
improve android payments
 2015-11-18 19:02:40 -03:00
Juan Linietsky
f738906519 Merge pull request #2737 from akien-mga/type-specific-error-output 
Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring
 2015-11-18 18:58:22 -03:00
Juan Linietsky
4fdb4452b8 Merge pull request #2784 from masoudbh3/resigning-android-template 
Skip META-INF from Android Template
 2015-11-18 18:35:08 -03:00
Aren Villanueva
e68c2c6c2a Use macros to determine which iOS SDK we have in order to be backwards compatible with older SDKs when fixing template compilation issues. 2015-11-16 12:35:54 +11:00
Aren Villanueva
402c24ec8b iOS compile fixes. 2015-11-16 11:10:07 +11:00
masoud bh
14b9579748 Skip META-INF from Android Template 2015-11-14 20:40:22 +03:30
Ariel Manzur
8adc4ef65b windows crash and bind placeholder method 2015-11-14 11:14:17 -03:00
Rémi Verschelde
9ab7de243f Fix error messages forcing a white font for subsequent messages 
This is achieved using the "no specific formatting" \E[0m tag.
Fixes #2566.

Also remove the hardcoded black background colour and use default bolded terminal font for error message.
Error logs should now look good both on terminals with a dark and light background colour.
 2015-11-10 18:30:40 +01:00
Rémi Verschelde
6334895088 Display error type (error, warning, script error) in OS::print_error 
Previously all types of errors would be shown as ERROR, thus making for example warnings (WARN_PRINT) somewhat aggressive.
ERROR is displayed in red, WARNING in yellow and SCRIPT ERROR in magenta (though the latter does not seem used so far).
Fixes #1127.
 2015-11-10 18:29:34 +01:00
Trond Abusdal
41a161647d * Winsock UDP messages sent to an unavailable target causing WSAECONNRESET will no longer close the socket. 
* Ensured that unsigned<->signed conversion would not cause wrong buffer size values sent to recvfrom.
 2015-11-09 01:33:16 +01:00
Trond Abusdal
f809cd44ea Fixed PacketPeerUDP getting wrongly closed due to recvfrom using rb.data_left instead of rb.space_left. 2015-11-09 00:22:05 +01:00
masoud bh
55b8c3ee48 change pe_bliss parent directory from /drivers to /tools 2015-11-09 02:24:01 +03:30
masoud bh
24f3f43457 Add icon to exe file in windows export 
add version_info and icon sections in "export to windows platform".
add version_info and icon to godot exe file (editor & template exe).
fix an problem in image class.
change all default icons to android export icon (a little more rounded).
create an python script for convert file to cpp byte array for use in
'splash.h'.
 2015-11-09 02:23:58 +03:30
Anton Yabchinskiy
3b9868d2e4 Merge branch 'master' of github.com:okamstudio/godot 2015-11-02 20:25:01 +03:00
Saracen
e723488aa3 Moved deleting sample player in OS finalize methods to before deleting audio server to prevent crash when exiting. 2015-11-02 16:36:41 +00:00
Rémi Verschelde
399b1b0474 Cosmetic fixes to SCons buildsystem 
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
 2015-11-01 20:53:26 +01:00
ZuBsPaCe
fff7cedbe1 Fixes Visual Studio 2015 parallel builds (-j switch) 
Reference: http://stackoverflow.com/questions/284778/what-are-the-implications-of-using-zi-vs-z7-for-visual-studio-c-projects

fatal error C1041: cannot open program database 'C:\godot\vc140.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS
 2015-10-30 03:13:55 +01:00
volzhs
3fbaa479e3 improve android payments 
GodotPaymentV3 currently consumes purchased item right after purchasing.
But, some in-app item should not consume like "remove ads permanently"
So, I added "setAutoConsume(boolean)", "requestPurchased()",
"consume(sku_string)".
AutoConsume is true by default as before.

usage:

func _ready():
	var payment = Globals.get_singleton("GodotPayments")
	payment.setPurchaseCallbackId(get_instance_ID())
	payment.setAutoConsume(false) # default : true
	payment.requestPurchased() # callback : has_purchased
	payment.purchase("item_name") # callback : purchase_success,
purchase_fail, purchase_cancel, purchase_owned
	payment.consume("item_name") # callback : consume_success

func purchase_success(receipt, signature, sku):
	print("purchase_success : ", sku)

func purchase_fail():
	print("purchase_fail")

func purchase_cancel():
	print("purchase_cancel")

func purchase_owned(sku):
	print("purchase_owned : ", sku)

func consume_success(receipt, signature, sku):
	print("consume_success : ", sku)

func has_purchased(receipt, signature, sku):
	if sku == "":
		print("has_purchased : nothing")
	else:
		print("has_purchased : ", sku)
 2015-10-28 15:48:37 +09:00
Phobos Tro
2d2ab92680 Made the Atom net_wm_icon local 2015-10-26 01:36:27 +08:00
Phobos Tro
746ef7cbd6 Fixing memory leaks 2015-10-25 22:15:56 +08:00
steve
15a826571c Added setting for CADisplayLink on iOS, so you no longer need to recompile to change it 2015-10-22 17:31:09 -07:00
firefly2442
c2aedde7e3 rasterizer comparison fix 2015-10-18 20:28:51 -05:00
Juan Linietsky
97f483af0a fixes broken 3D in editor 2015-10-17 23:05:39 -03:00
Juan Linietsky
3d121b474b Merge pull request #2203 from volzhs/fix_android_payments 
Fix android payments
 2015-10-17 12:12:34 -03:00
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
Kostadin Damyanov
4a56f72f5b Haiku: Initial support. 2015-05-24 23:22:51 +03:00
romulox_x
95cd9b1ad5 added response event for game center overlay closing 2015-05-23 23:22:20 -07:00
romulox_x
94638e7bfe added data to descriptions dictionary that was missing. Made the elements that sound weird as plurals consistently singular. changed int arrays to bool arrays in descriptions 2015-05-23 19:04:02 -07:00
romulox_x
93e797f164 Fixed null pointer bug in ios store. added functions to game center to reset the user's achievements, request all the achievements they've made progress on, request descriptions of all possible achievements, and show the built in game center overlay. Upgraded all (I think) deprecated functions to ios 6 versions. as per discussion with reduz on IRC, ios 6 is now the official lowest supported iOS version. compatibility could be added, but it's so obsolete, it's tough to argue for continuing to support it. some naming of functions and dictionary parameters might need to change. I just named them whatever made sense to me :) 2015-05-23 03:17:52 -07:00
Rémi Verschelde
5f0bb18d55 Fix building release target with debug symbols 
This forced the -g2 CCFLAG in release builds, making them relatively heavy.
Fixes #1781.
 2015-05-22 22:19:16 +02:00
Juan Linietsky
f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
Juan Linietsky
6e85ee3a43 fix crash on help, closes #1873 2015-05-17 14:17:57 -03:00
vipsbpig
bc3afc8ed8 fix multitouch release problem 2015-05-15 12:40:34 +08:00
Antony
9e14f971bc Change windows build to use CFlag /Od so that you get the full debug experience. Without this flag set, Visual Studio lets you use breakpoints, but the watch and locals is pretty much useless. 2015-05-09 15:46:59 -06:00
Juan Linietsky
c99813dc38 Merge pull request #1826 from eehrich/master 
Reviewed compiler warnings: fixed some bugs and formal stuff. (2nd try)
 2015-05-07 20:02:54 -03:00
Ricardo Pérez
979b931995 Better OS X fullscreen support, without the nasty startup effect 2015-05-06 12:53:55 +02:00
punto-
fbd9839131 Merge pull request #1818 from ricpelo/ricpelo-patch-5 
Really fixes fullscreen mode in OS X, even during startup
 2015-05-06 04:36:57 -03:00
ehriche
897a1aade5 optional formal changes 2015-05-06 01:22:31 +02:00
Ricardo Pérez
1d619fad86 Really fixes fullscreen mode in OS X, even during startup 2015-05-05 12:02:47 +02:00
yg2f
43c41fc9f9 fixes issue #1693 winmain and main unicode 
makes WinMain() and main() accepts unicode characters into arguments
 2015-05-04 20:26:49 +02:00
Juan Linietsky
fbbe7dcdfb Merge remote-tracking branch 'origin/master' 
Conflicts:
	drivers/windows/dir_access_windows.cpp
 2015-05-04 13:24:02 -03:00
Juan Linietsky
7f5b744b92 small unicode fixes 2015-05-04 13:12:05 -03:00
Juan Linietsky
c631d597ad Merge pull request #1792 from swenner/static_analysis_fixes 
Static analysis fixes
 2015-05-03 22:53:30 -03:00
Juan Linietsky
795ccf0e14 Merge pull request #1800 from antonyjones67/VSGenerator 
Added Visual Studio project generation. Use "vsproj=yes" in command line...
 2015-05-03 22:52:20 -03:00
Antony Jones
2a4da03f10 Added Visual Studio project generation. Use "vsproj=yes" in command line. This does not set up NMAKE properly. 2015-05-03 15:18:56 -06:00
Simon Wenner
bd08cd7fd2 fixed broken comment block 2015-05-03 02:04:30 +02:00
Juan Linietsky
524d9fad59 -fixed godot icon for android 
-added a genname option to generate the name of android app
 2015-05-01 23:21:27 -03:00
Juan Linietsky
61e90385f6 -option to select arm and x86 architectures on android export (will not work with current templates, you have to make new and include both x86 and arm support) 2015-05-01 22:45:32 -03:00
Juan Linietsky
1e422941c8 -Fixed android export options (screen sizes, orientation should work) 
-added functions to get mouse position in CanvasItem
 2015-05-01 21:13:20 -03:00
Juan Linietsky
4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky
21939ce08b -some cleanups 
-added tesselation function to curve and curve2d
 2015-04-30 10:06:18 -03:00
Juan Linietsky
c6dce44dd8 fixes in handling of DirAccess for resource path on Android, fixes #1447 2015-04-28 09:38:07 -03:00
Juan Linietsky
59154cccf9 -Changed Godot exit to be clean. 
-Added more debug information on memory cleanliness on exit (if run with -v)
-Fixed several memory leaks, fixes #1731, fixes #755
 2015-04-20 19:38:02 -03:00
Juan Linietsky
1de1a04b78 -fix local and global usage for DirAccess, fixes #791 
please test anyway..
 2015-04-18 20:11:33 -03:00
Juan Linietsky
fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
Juan Linietsky
b56badf77b -Added android immersive mode, fixes #303 2015-04-17 16:18:46 -03:00
Juan Linietsky
2dfa1279ea improved save path error messages for scene, textures and audio, fixes #1514 2015-04-12 16:45:59 -03:00
Juan Linietsky
87c51b6fc0 Modified OSX11 to try alternative audio drivers if pulseaudio does not work or user dislikes lennart potering , fixes #1511 2015-04-12 16:11:26 -03:00
Juan Linietsky
b135cdbf05 Merge pull request #1531 from vkbsb/h5_canvas_polygon_fix 
H5 canvas polygon fix
 2015-04-07 20:22:58 -03:00
Juan Linietsky
b989498004 Merge pull request #1568 from sanikoyes/Pr-missing-WM_RBUTTONDBLCLK 
Pr-missing-WM_RBUTTONDBLCLK
 2015-04-07 20:17:32 -03:00
Martho42
7a2698bb44 Fixes the accelerometer 
Resolves the issue of the accelerometer behaving differently across devices with landscape as default and devices with portrait as default.
 2015-04-04 17:03:56 -07:00
Anton Yabchinskiy
16746f157f Merge branch 'master' of github.com:okamstudio/godot 2015-04-04 09:31:21 +03:00
Juan Linietsky
42d41a3fbc wrong function, changing.. 2015-04-02 15:03:14 -03:00
Juan Linietsky
8ea7e3e2b1 javascript build fix 2015-04-02 14:54:36 -03:00
Juan Linietsky
68e42f53ba Beta1 Attempt #1 
-=-==-=-=-=-=-=-

-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
 2015-04-02 12:59:23 -03:00
Ariel Manzur
ebd743f7c2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-04-02 01:35:12 -03:00
Ariel m
7c1d516c01 fullscreen thing 2015-04-02 01:32:02 -03:00
Juan Linietsky
ed2a24ef21 solved color depth issues on osx 2015-04-01 12:39:54 -03:00
Juan Linietsky
3920c497b3 Option in Android export to use 32 bits buffer. 2015-03-31 19:02:40 -03:00
Juan Linietsky
7fc4059b13 read depth fixes 2015-03-31 17:57:16 -03:00
Juan Linietsky
ad634876b5 fixes for light2d in androids that do not support 
read depth
 2015-03-31 14:59:28 -03:00
reduz
7f8a0cddcf fixes to shader to get most new demos working on mobile 2015-03-25 22:56:35 -03:00
sanikoyes
042ead0e5d add missing WM_RBUTTONDBLCLK message 2015-03-25 10:58:22 +08:00
steve
a6f6bd85f9 fixed build error on OSX from new WM code 2015-03-23 22:07:03 -07:00
steve
e3957e32de fixed iphone build with new window manamenet changes 2015-03-23 18:55:45 -07:00
Juan Linietsky
3cf9490c46 window managements functions work 
but still side-functions, all API needs to be migrated to them
 2015-03-23 20:47:53 -03:00
Juan Linietsky
0245d4a2b0 oops, fucntion was there twice 2015-03-23 16:12:59 -03:00
Juan Linietsky
8db3922f56 small android fix 2015-03-23 14:15:11 -03:00
Juan Linietsky
7ad7f2f6a9 android fixes, please test 
(can' t build android atm)
 2015-03-23 11:31:23 -03:00
rollenrolm
ca0b3ce1f6 New API: build fixes for x11 2015-03-23 01:31:38 +01:00
Juan Linietsky
c68563aeb4 Merge pull request #1542 from jotson/wmclass 
Reverted change to classHint
 2015-03-22 19:18:44 -03:00
Juan Linietsky
23e13ce3c2 fixes to new window management API 
-needs testing on Linux
-needs testing on Windows
-NEED SOMEONE TO IMPLEMENT IT ON OSX!! PLEASE HELP!
 2015-03-22 19:00:50 -03:00
John Watson
182c86de3f Reverted change to classHint 
Using `char wmclass[] = "Godot"` causes `xprop` to report the
following for WM_CLASS:

`WM_CLASS(STRING) = "\200\326\322\365\377\177", "\200\326\322\365\377\177"`

This makes the Unity window manager fail to connect the running app
with the icon on the launcher.
 2015-03-22 14:05:24 -07:00
Juan Linietsky
15bee515e6 Merge pull request #1487 from hurikhan/x11-window-management 
X11 window management
 2015-03-22 15:10:50 -03:00
Juan Linietsky
f6e537b08f Merge pull request #1432 from UsernameIsAReservedWord/fixes_platform_windows_detect_py 
Fixes platform/windows/detect.py
 2015-03-22 15:01:27 -03:00
rollenrolm
db0a71fc58 New option to show/hide hidden files 2015-03-21 18:33:32 +01:00
V.VamsiKrishna
eb3c88b3dd Revert "Revert "Removing etc1 from build for javascript platform."" 
This reverts commit 9965e93f7e.
 2015-03-20 11:47:56 +05:30
V.VamsiKrishna
9965e93f7e Revert "Removing etc1 from build for javascript platform." 
This reverts commit 41b729ccff.
 2015-03-20 11:12:13 +05:30
V.VamsiKrishna
41b729ccff Removing etc1 from build for javascript platform. 
Based on inputs from reduz
1) Made etc1 optional driver and default yes.
2) Reverted the hack in rg_etc1.cpp
3) Disabled etc1 for javascript plaform.
 2015-03-20 10:18:13 +05:30
V.VamsiKrishna
72895ddecf Replacing spaces with tabs 2015-03-20 07:47:06 +05:30
V.VamsiKrishna
1d45cd0ff1 Fix Javascript build. 2015-03-19 10:31:36 +05:30
Juan Linietsky
53e1694e1e New option to send canvas to render buffer 
allows to use 3D environment effects for post processing such as Glow,
Bloom, HDR, etc. in 2D.
 2015-03-16 01:14:59 -03:00
Anton Yabchinskiy
43713810de Merge branch 'master' of https://github.com/okamstudio/godot 2015-03-10 11:44:40 +03:00
hurikhan
52a4e8495c fix introduced bug 2015-03-08 04:24:21 -05:00
hurikhan
87be945d49 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-03-08 15:10:48 +08:00
Juan Linietsky
2c2894ceb6 Merge branch 'master' of https://github.com/okamstudio/godot 
Conflicts:
	modules/gdscript/gd_tokenizer.cpp
	scene/resources/shader_graph.h
 2015-03-03 14:41:36 -03:00
Juan Linietsky
4d2198110b merges from okam repo 2015-03-03 14:39:13 -03:00
Juan Linietsky
440cc5e4b6 Merge pull request #1437 from Hinsbart/fix_win_joy 
fix get joystick name from registry on some systems
 2015-03-02 01:00:56 -03:00
Juan Linietsky
a1f715a4da support for 2D shadow casters 
Added support for 2D shadow casters.

*DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a
CanvasItem and pull this, you will lose them. Shaders now work through a
2D material system similar to 3D. If you don't want to lose the 2D
shader code, save the shader as a .shd, then create a material in
CanvasItem and re-assign the shader.
 2015-03-02 00:54:43 -03:00
Hinsbart
9229d9d1bb fix get joystick name from registry on some systems 2015-02-25 16:33:08 +01:00
UsernameIsAReservedWord
b3976ec14c Update detect.py 2015-02-24 22:38:49 +01:00
UsernameIsAReservedWord
fde7f11a55 Update detect.py 2015-02-24 22:31:18 +01:00
UsernameIsAReservedWord
84905809a1 fixes platform/windows/detect.py 
- fixes issue #1298 : under windows, too long `ar` command lines are split into several smaller command lines.
- fixes issue #1285 : under linux, cross compiling with Mingw-w64 now generates actual 64bits EXE.
- `MINGW32_PREFIX` and `MINGW64_PREFIX` environment variables are also available for Windows.
- started to clean-up the remains of previous hacks and workarounds.
- added some documentation into the script.
 2015-02-24 22:28:51 +01:00
Anton Yabchinskiy
19a99afa81 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-20 13:41:37 +03:00
Juan Linietsky
5ef3f7392f support for light and normal mapping in 2D 2015-02-18 19:40:02 -03:00
greay
ef565b9778 fix for “no viable conversion from 'NSPoint' (aka '_NSPoint') to 'CGPoint'” build error on OS X 2015-02-17 19:19:29 -08:00
Anton Yabchinskiy
e024ff89b2 Merge branch 'master' of https://github.com/okamstudio/godot 2015-02-17 15:57:24 +03:00
hurikhan
f5d2e1f42c Renamed EXPERIMENTAL_WM_API to NEW_WM_API 2015-02-15 18:26:49 +08:00
hurikhan
ee81d4b359 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-15 17:49:34 +08:00
Juan Linietsky
2185c018f6 begin new serialization framework 
also got rid of STL dependency on triangulator
 2015-02-15 01:21:26 -03:00
Juan Linietsky
d2f86cc09b fixes to mouse warp 
-can warp now from viewport and control, in their respective coordinate
systems
-warp is now local to the window on Windows and OSX.

IF YOU RUN OSX, PLEASE TEST THIS! And make sure it works!, new code is
in OS_OSX::warp_mouse_pos. I don't have OSX so i can't test!
 2015-02-14 19:22:06 -03:00
hurikhan
a13e180052 Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-02-12 15:58:29 +01:00
hurikhan
df7d26ff5b cleanup + MouseGrab 2015-02-12 15:58:00 +01:00
Hinsbart
97e46194f4 fix get_joy_name() on windows 2015-02-12 04:17:29 +01:00
Rhody Lugo
d67e866788 add support for CADisplayLink 2015-02-10 22:10:10 -04:30
Juan Linietsky
f53b27dca3 Merge pull request #1300 from umxprime/fix/ios-init-crash 
Fix init crash on iPad 1st gen device with iOS 5.1.1
 2015-02-09 21:38:43 -03:00
Juan Linietsky
b1ec72a799 Merge pull request #1299 from umxprime/fix/isim-sdk-path 
Fix iOS Simulator SDK path for isim platform.
 2015-02-09 21:38:38 -03:00
Juan Linietsky
3b3829e002 Merge pull request #1259 from laganojunior/feature/fix_modifier_key_unpress 
Modifiers are unset on events for the modifier key itself
 2015-02-09 21:31:39 -03:00
sambler
8baa00a6e4 Adjust x11/detect.py 
Test if clang is defined in CC/CXX/LD - this allows a specific version of clang to be defined
move appending -DTYPED_METHOD_BIND to keep clang options together
move sanitize option out of use_llvm test, gcc48+ also supports sanitize=address
 2015-01-27 20:40:17 +10:30
Maxime CHAPELET
f9d63a7683 Fix init crash on iPad 1st gen device with iOS 5.1.1 2015-01-23 11:27:53 +01:00
Maxime CHAPELET
f7b00960dd Fix iOS Simulator SDK path for isim platform. 2015-01-22 22:19:45 +01:00
hurikhan
94d94a0855 * fix compilation without scons experimental_wm_api=yes 
* Extended the demo with an addional MouseGrab Test
 2015-01-22 01:14:50 +09:00
Anton Yabchinskiy
6f93e6812e Merge branch 'master' of https://github.com/okamstudio/godot 2015-01-21 12:03:29 +03:00
hurikhan
d878b3205a Merge remote-tracking branch 'upstream/master' into x11-window-management 2015-01-19 21:46:03 +09:00
Manuel Lagang
a4f40ec3be Fix whitespace on previous commit 
Choose tabs or spaces, not both!
 2015-01-17 23:06:20 -08:00
Manuel Lagang
fa62125e05 Modifiers are unset on events for the modifier key itself 
This patch removes modifiers when processing key events for the
particular modifier key. For example, previously a Shift keypress
would register as a Shift + Shift modifier event.

This would cause issues when a modifier key as the action key in
the input map, because unpresses of the modifier key don't match as
matching inputs for that action. E.g. if Shift is used as an action,
the stored action event is Shift + Shift modifier (as indicated
in the editor as "Shift + Shift". The unpress event does not have the
Shift modifier set, so the event of unpressing Shift + no modifier
doesn't match the action which has the modifier set.

This patch removes the shift modifier on just pressing the Shift
key down, so the action event is registered as just Shift with
no modifier (as indicated in the editor as "Shift"), which matches
the unpress event.
 2015-01-17 22:40:01 -08:00