Commit Graph

482 Commits

Author SHA1 Message Date
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