| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Added missing \n in script error output. | ZuBsPaCe | 2015-11-19 | 2 | -2/+2 |
| | | |||||
| * | Nice error output padding. Code location behind " At: " is now aligned with ↵ | ZuBsPaCe | 2015-11-19 | 2 | -12/+20 |
| | | | | | the error message above. Also removed the dot after the file location. | ||||
| * | Set console background color on windows in SetConsoleTextAttribute, ↵ | ZuBsPaCe | 2015-11-19 | 1 | -5/+8 |
| | | | | | otherwise text background will be black, which looks strange if the terminal color is not black. | ||||
| * | Set output color of ERR_SCRIPT messages to purple. Same as on linux. | ZuBsPaCe | 2015-11-19 | 1 | -1/+1 |
| | | |||||
| * | Removed ANSI error codes from windows terminal error output. Windows does ↵ | ZuBsPaCe | 2015-11-19 | 2 | -12/+12 |
| | | | | | | | | 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 | ||||
| * | Inconsistent code formatting in print_error (Newlines and spaces) | ZuBsPaCe | 2015-11-19 | 2 | -45/+46 |
| | | |||||
| * | -remove Vector2.atan2() replaced by Vector2.angle(), fixes #2260 | Juan Linietsky | 2015-11-19 | 2 | -3/+3 |
| | | |||||
| * | Merge pull request #2518 from masoudbh3/godot-icons | Juan Linietsky | 2015-11-19 | 9 | -7/+439 |
| |\ | | | | | Add icon to exe file in windows export | ||||
| | * | change pe_bliss parent directory from /drivers to /tools | masoud bh | 2015-11-09 | 2 | -114/+107 |
| | | | |||||
| | * | Add icon to exe file in windows export | masoud bh | 2015-11-09 | 9 | -8/+447 |
| | | | | | | | | | | | | | | | | | | | 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'. | ||||
| * | | Merge pull request #2699 from ZuBsPaCe/visual-studio-2015-compilation | Juan Linietsky | 2015-11-18 | 1 | -2/+2 |
| |\ \ | | | | | | | Visual studio 2015 compilation | ||||
| | * | | Fixes Visual Studio 2015 parallel builds (-j switch) | ZuBsPaCe | 2015-10-30 | 1 | -2/+2 |
| | |/ | | | | | | | | | | | 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 | ||||
| * | | Merge pull request #2707 from akien-mga/master | Juan Linietsky | 2015-11-18 | 4 | -6/+3 |
| |\ \ | | | | | | | Cosmetic fixes to SCons buildsystem | ||||
| | * | | Cosmetic fixes to SCons buildsystem | Rémi Verschelde | 2015-11-01 | 4 | -6/+3 |
| | |/ | | | | | | | | | | | - Removed trailing spaces - Made sure all indentation is done using tabs (fixes #39) - Potentially fixed an identation issue for openssl check | ||||
| * | | Merge pull request #2718 from SaracenOne/audio_system_crash_fix | Juan Linietsky | 2015-11-18 | 6 | -6/+12 |
| |\ \ | | | | | | | Fixed Audio System Crash | ||||
| | * | | Moved deleting sample player in OS finalize methods to before deleting audio ↵ | Saracen | 2015-11-02 | 6 | -6/+12 |
| | |/ | | | | | | | server to prevent crash when exiting. | ||||
| * | | Merge pull request #2814 from masoudbh3/android-fa-locale | Juan Linietsky | 2015-11-18 | 1 | -0/+16 |
| |\ \ | | | | | | | Android add FA(persian) locale strings | ||||
| | * | | Android add FA(persian) locale strings | masoud bh | 2015-11-19 | 1 | -0/+16 |
| | | | | |||||
| * | | | Merge pull request #2691 from volzhs/android_payment | Juan Linietsky | 2015-11-18 | 3 | -41/+150 |
| |\ \ \ | | | | | | | | | improve android payments | ||||
| | * | | | improve android payments | volzhs | 2015-10-28 | 3 | -41/+150 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) | ||||
| * | | | Merge pull request #2737 from akien-mga/type-specific-error-output | Juan Linietsky | 2015-11-18 | 2 | -15/+36 |
| |\ \ \ | |_|/ |/| | | Display error type (error, warning, script error) in OS::print_error + cleanup error ANSI coloring | ||||
| | * | | Fix error messages forcing a white font for subsequent messages | Rémi Verschelde | 2015-11-10 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Display error type (error, warning, script error) in OS::print_error | Rémi Verschelde | 2015-11-10 | 2 | -15/+36 |
| | |/ | | | | | | | | | | | 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. | ||||
| * | | Merge pull request #2784 from masoudbh3/resigning-android-template | Juan Linietsky | 2015-11-18 | 1 | -0/+4 |
| |\ \ | | | | | | | Skip META-INF from Android Template | ||||
| | * | | Skip META-INF from Android Template | masoud bh | 2015-11-14 | 1 | -0/+4 |
| | | | | |||||
| * | | | Use macros to determine which iOS SDK we have in order to be backwards ↵ | Aren Villanueva | 2015-11-16 | 2 | -0/+18 |
| | | | | | | | | | | | | | compatible with older SDKs when fixing template compilation issues. | ||||
| * | | | iOS compile fixes. | Aren Villanueva | 2015-11-16 | 7 | -4/+22 |
| |/ / | |||||
| * / | windows crash and bind placeholder method | Ariel Manzur | 2015-11-14 | 1 | -3/+3 |
| |/ | |||||
| * | Made the Atom net_wm_icon local | Phobos Tro | 2015-10-26 | 2 | -29/+5 |
| | | |||||
| * | Fixing memory leaks | Phobos Tro | 2015-10-25 | 3 | -17/+33 |
| | | |||||
| * | Added setting for CADisplayLink on iOS, so you no longer need to recompile ↵ | steve | 2015-10-22 | 4 | -40/+43 |
| | | | | | to change it | ||||
| * | rasterizer comparison fix | firefly2442 | 2015-10-18 | 1 | -1/+1 |
| | | |||||
| * | fixes broken 3D in editor | Juan Linietsky | 2015-10-17 | 1 | -7/+3 |
| | | |||||
| * | Merge pull request #2203 from volzhs/fix_android_payments | Juan Linietsky | 2015-10-17 | 1 | -1/+3 |
| |\ | | | | | Fix android payments | ||||
| | * | Merge branch 'master' of https://github.com/okamstudio/godot into ↵ | volzhs | 2015-07-01 | 2 | -4/+27 |
| | |\ | | | | | | | | | | fix_android_payments | ||||
| | * | | fix crash by payments when run on android 5.1.1 device. | volzhs | 2015-06-29 | 1 | -1/+3 |
| | | | | | | | | | | | | | (http://stackoverflow.com/questions/24480069/google-in-app-billing-illegalargumentexception-service-intent-must-be-explicit) | ||||
| * | | | Merge pull request #2369 from Max-Might/master | Juan Linietsky | 2015-10-17 | 19 | -0/+1471 |
| |\ \ \ | | | | | | | | | Haiku: platform support | ||||
| | * | | | Haiku: fix build | Kostadin Damyanov | 2015-10-17 | 3 | -14/+14 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Kostadin Damyanov | 2015-10-13 | 50 | -7039/+8693 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Kostadin Damyanov | 2015-09-05 | 21 | -42/+197 |
| | |\ \ \ \ | |||||
| | * | | | | | Haiku: move the audio driver to platform/haiku | Kostadin Damyanov | 2015-08-14 | 4 | -2/+218 |
| | | | | | | | |||||
| | * | | | | | Haiku: update logo.png | Kostadin Damyanov | 2015-08-13 | 1 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | Haiku: remove unneeded code | Kostadin Damyanov | 2015-08-12 | 6 | -27/+3 |
| | | | | | | | |||||
| | * | | | | | Haiku: remove unneeded code | Kostadin Damyanov | 2015-08-12 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'upstream/master' | Kostadin Damyanov | 2015-08-09 | 9 | -29/+105 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Haiku: add sound support | Kostadin Damyanov | 2015-07-26 | 3 | -6/+9 |
| | | | | | | | | |||||
| | * | | | | | | Haiku: update detect.py | Kostadin Damyanov | 2015-07-20 | 1 | -3/+5 |
| | | | | | | | | |||||
| | * | | | | | | Haiku: add keyboard support | Kostadin Damyanov | 2015-07-12 | 5 | -1/+294 |
| | | | | | | | | |||||
| | * | | | | | | Haiku: gl context locking | Kostadin Damyanov | 2015-07-02 | 4 | -18/+62 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' | Kostadin Damyanov | 2015-06-26 | 1 | -1/+3 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
