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

455 commits

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