Commit Graph

326 Commits

Author SHA1 Message Date
volzhs c8edf071da Fix handling input for Android 2017-03-04 00:12:35 +09:00
Pedro J. Estébanez fec41c528c Fix resources for Android modules not being merged
Fixes #7421
2017-01-24 16:29:09 +01:00
Rémi Verschelde d8223ffa75 Welcome in 2017, dear changelog reader!
That year should bring the long-awaited OpenGL ES 3.0 compatible renderer
with state-of-the-art rendering techniques tuned to work as low as middle
end handheld devices - without compromising with the possibilities given
for higher end desktop games of course. Great times ahead for the Godot
community and the gamers that will play our games!

(cherry picked from commit c7bc44d5ad)
2017-01-12 19:15:30 +01:00
volzhs 2e74bdab35 Add alert window on Android
(cherry picked from commit 9a20068ab7)
2017-01-12 19:15:26 +01:00
Pedro J. Estébanez 19ce11b908 Update/fix Android build
Fix wrong path for 32-bit Windows, which fixes #7084
Exclude 32-bit Windows from multi-threaded linking because it's not supported by the NDK
Remove 32-bit Linux as there is no NDK variant for it
(cherry picked from commit 5a26459c06)
2016-11-15 08:44:53 +01:00
Pedro J. Estébanez 221346521c Make Android export quicker (especially on Windows)
(cherry picked from commit 56721e5d9d)
2016-11-15 08:35:15 +01:00
volzhs 3e127ce3fd Fix Directory.dir_exist/get_current_dir for 'res://' on Android
Fix #7014

(cherry picked from commit 8d454ed9a7)
2016-11-15 08:34:51 +01:00
Rémi Verschelde ce54b6ea8b scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.

(cherry picked from commit cc95d4448c)
2016-11-03 08:41:10 +01:00
Pedro J. Estébanez f629b1fd3e Improve Android build (Clang + tidyness)
(cherry picked from commit b18ff942be)
2016-11-02 22:34:17 +01:00
Rémi Verschelde eaf803f71e style: Various other PEP8 fixes in Python files
Done with `autopep8 --select=E7`, fixes:

- E701 - Put colon-separated compound statement on separate lines.
- E702 - Put semicolon-separated compound statement on separate lines.
- E703 - Put semicolon-separated compound statement on separate lines.
- E711 - Fix comparison with None.
- E712 - Fix (trivial case of) comparison with boolean.
- E713 - Fix (trivial case of) non-membership check.
- E721 - Fix various deprecated code (via lib2to3).
2016-11-02 22:30:34 +01:00
Rémi Verschelde a7389217f8 style: Fix PEP8 blank lines issues in Python files
Done with `autopep8 --select=E3,W3`, fixes:

- E301 - Add missing blank line.
- E302 - Add missing 2 blank lines.
- E303 - Remove extra blank lines.
- E304 - Remove blank line following function decorator.
- E309 - Add missing blank line.
- W391 - Remove trailing blank lines.
2016-11-02 22:29:36 +01:00
Rémi Verschelde e259bf8bbb style: Fix PEP8 whitespace issues in Python files
Done with `autopep8 --select=E2,W2`, fixes:

- E201 - Remove extraneous whitespace.
- E202 - Remove extraneous whitespace.
- E203 - Remove extraneous whitespace.
- E211 - Remove extraneous whitespace.
- E221 - Fix extraneous whitespace around keywords.
- E222 - Fix extraneous whitespace around keywords.
- E223 - Fix extraneous whitespace around keywords.
- E224 - Remove extraneous whitespace around operator.
- E225 - Fix missing whitespace around operator.
- E226 - Fix missing whitespace around operator.
- E227 - Fix missing whitespace around operator.
- E228 - Fix missing whitespace around operator.
- E231 - Add missing whitespace.
- E231 - Fix various deprecated code (via lib2to3).
- E241 - Fix extraneous whitespace around keywords.
- E242 - Remove extraneous whitespace around operator.
- E251 - Remove whitespace around parameter '=' sign.
- E261 - Fix spacing after comment hash.
- E262 - Fix spacing after comment hash.
- E265 - Format block comments.
- E271 - Fix extraneous whitespace around keywords.
- E272 - Fix extraneous whitespace around keywords.
- E273 - Fix extraneous whitespace around keywords.
- E274 - Fix extraneous whitespace around keywords.
- W291 - Remove trailing whitespace.
- W293 - Remove trailing whitespace.
2016-11-02 22:28:28 +01:00
Rémi Verschelde 561c1f17a1 style: Start applying PEP8 to Python files, indentation issues
Done with `autopep8 --select=E1`, fixes:

- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
2016-11-02 22:26:55 +01:00
Rémi Verschelde 5a49e45d21 SCsub: Add python shebang as a hint for syntax highlighting
Also switch existing shebangs to "better" /usr/bin/env python.

(cherry picked from commit fc8ccd5b8c)
2016-10-30 14:51:34 +01:00
Błażej Szczygieł 7143401e25 Theora: Don't compile unnecessary files, rename "x86_opt_*"
(cherry picked from commit 4ffa8f224d)
2016-10-30 14:51:34 +01:00
Rémi Verschelde f1bd2f6f56 zlib: Split thirdparty files, simplify scons option
(cherry picked from commit cbf52606f4)
2016-10-30 14:51:33 +01:00
Rémi Verschelde 995dcb610c ogg/vorbis/opus/speex: Make them modules and unbundle thirdparty libs
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.

TODO: Fix the platform/ stuff for opus.
(cherry picked from commit d9a291f641)

speex module was only added while cherry-picking, as speex is removed
in the master branch but we don't want to break compatibility in 2.1.x.
Unbundling wasn't done as the module uses the internal speex_free,
so it would require some more work.
2016-10-30 14:51:31 +01:00
Rémi Verschelde 846db09038 Drop nedmalloc which is apparently not used anymore
(cherry picked from commit f63bf12193)
2016-10-30 14:51:30 +01:00
Randy Tan Shaoxian c9d7f77c6f Fixed tiny error in detect.py causing compilation for Android to fail. 2016-10-20 21:17:21 +08:00
volzhs 00b0f3dfde Fix crash when using Directory.dir_exists(path) on Android
(cherry picked from commit 4a57821349)
2016-10-17 20:50:57 +02:00
Anthony Fieroni b4edaa892d Correct OS architecture detection
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
(cherry picked from commit f87e32696d)
2016-10-17 20:48:05 +02:00
Pedro J. Estébanez 82dfaf7af6 Fix compile flags not getting to the Android build
(cherry picked from commit 7f51bb7b1c)
2016-10-09 17:34:36 +02:00
syskrank 4b2243f82e removed confusing "if(true)" statement with empty "else" block
(cherry picked from commit af4b0db1e4)
2016-10-09 17:22:36 +02:00
Pedro J. Estébanez 45a5769162 Fix manifest generation bug in Android export
(cherry picked from commit 2c9d98bb48)
2016-10-09 17:20:27 +02:00
Pedro J. Estébanez f90370886f Fix (potentially) Android libs packaging issue (#5645)
(cherry picked from commit e9065632c6)
2016-09-18 23:11:18 +02:00
Skyfrit c56ea7cf91 Android: Rename values-zh to values-zh-rCN (#6063)
(cherry picked from commit 4f6a21b0df)
2016-08-08 18:15:55 +02:00
Skyfrit 1913e4a040 Android: Add support for Traditional Chinese (HK) (#6061)
(cherry picked from commit 664b5b5137)
2016-08-08 18:15:49 +02:00
Skyfrit 2b35ba4815 Android: Add support for Traditional Chinese (TW) (#6061)
(cherry picked from commit 8ab4acd17f)
2016-08-08 18:15:43 +02:00
Juan Linietsky 9213400cd5 Merge pull request #5415 from volzhs/improve-android-payment
Improve android payment
2016-07-24 12:18:13 -03:00
Mario Schlack beaa56bff2 Minor code formatting in platform/android 2016-07-21 12:07:01 +02:00
Rémi Verschelde b1cca17053 Merge pull request #5835 from volzhs/issue-5831
Fix compile error if use android_stl=yes
2016-07-21 10:37:18 +02:00
volzhs 01e39ecec8 Fix compile error if use android_stl=yes 2016-07-21 17:31:46 +09:00
Rémi Verschelde 5274f2a126 Merge pull request #5819 from hurikhan/android_getScreenDPI
Implement get_screen_dpi() on Android
2016-07-21 09:09:49 +02:00
Mario Schlack 0717893772 Implement get_screen_dpi() on Android 2016-07-20 14:54:48 +02:00
Juan Linietsky 0988970c1f Fixed properly not save signals that already exist in their base scenes, closes #5656 2016-07-19 21:26:12 -03:00
volzhs 79cb91dc84 Add querying details of IAP items for android 2016-07-18 23:45:58 +09:00
volzhs f26f181ba9 Fix can't get all info if user purchases many items and not consumed 2016-07-18 23:45:58 +09:00
Jamil Halabi 370ae3512d Added gyroscope support to Godot and Android 2016-07-16 01:43:32 +08:00
sanikoyes 978cb0e884 Fix crash in FileAccessJAndroid::file_exists (does not free local ref) 2016-07-11 12:41:54 +08:00
Juan Linietsky d279d060e1 Merge pull request #5077 from RandomShaper/improve-android-build
Improve Android build
2016-07-10 13:57:17 -03:00
volzhs 40d3234304 Add android_add_default_config for config.py
usage : env.android_add_default_config("applicationId 'com.godot.game'")
2016-07-07 04:03:50 +09:00
volzhs b09dbaa78e Fix crash when null value through jni on android 2016-07-05 04:41:46 +09:00
Rémi Verschelde 9693f37fcc Merge pull request #5491 from volzhs/fix-jni-bool-string
Fix wrong return bool, string, string array data through jni
2016-07-03 19:11:04 +02:00
Juan Linietsky 1726bacf78 missnig ; 2016-07-02 16:04:00 -03:00
Juan Linietsky 973a12c5f2 Data dir returns a symlink in Android 6.0, which confuses DirAccess on android, this should fix it 2016-07-02 11:49:52 -03:00
volzhs aac0af043c Fix wrong return bool, string, string array data through jni 2016-06-30 01:23:55 +09:00
Pedro J. Estébanez e7b2626707 Make Android build smarter (SCons + Gradle)
Upgrade Gradle and Android plugin for Gradle
Disable all signing and zip-aligning for the export templates
Give correct names to generated APKs
Put .so files built by SCons right where Gradle has to pick them according to arch & build type
Downgrade NDK platform to 14 to match minSdkVersion
2016-06-27 10:49:15 +02:00
Rémi Verschelde 7d06d50e65 Merge pull request #5395 from vnen/android-sensors
Fix Android sensors polling rate on resume
2016-06-26 09:46:10 +02:00
Rémi Verschelde fad6b29a59 Merge pull request #5390 from volzhs/jni-stringarray
Fix string array parameter check with jni
2016-06-26 09:45:36 +02:00
Juan Linietsky 8dac3bf3b1 Added function to notify ScriptLanguage when a thread is created/freed, allows scripts to allocate a stack there via TLS 2016-06-25 10:41:23 -03:00
Rémi Verschelde c931ed976b Gradle: remove trailing spaces 2016-06-25 13:39:03 +02:00
George Marques 6d37253be5
Fix Android sensors polling rate on resume
Fix #5306
2016-06-24 21:00:04 -03:00
volzhs 456b7733fc Fix string array parameter check with jni 2016-06-25 02:05:46 +09:00
volzhs a5a5bdef25 Remove duplicated aidl for android
Tested IAP function on device.
2016-06-25 01:11:21 +09:00
Rémi Verschelde 0a72f9ccb8 Merge pull request #5362 from J08nY/png
libpng: New version 1.6.27
2016-06-23 07:40:03 +02:00
Rémi Verschelde b9ed5b12c9 Merge pull request #5235 from volzhs/fix-android-export
fix errors while exporting android
2016-06-23 07:35:22 +02:00
J08nY 0ab05b09e4
Fixed iCCp chunk in pngs
neccesary for libpng 1.6.27 to work silently
2016-06-22 21:13:29 +02:00
Rémi Verschelde 842e7bfc2f Merge pull request #5357 from volzhs/fix-locale-android
fix android resource locale
2016-06-22 16:05:59 +02:00
volzhs 591be5df25 fix android resource locale 2016-06-22 22:32:03 +09:00
volzhs 780fa60072 correct current Intent for android 2016-06-21 03:32:44 +09:00
Rémi Verschelde 8f2115529e Merge pull request #5135 from volzhs/android-manifest
fix android support screen property for large screen
2016-06-19 12:49:42 +02:00
Rémi Verschelde b7dbf9207a Drop empty files that are not used anywhere
Part of #5272
2016-06-18 19:46:30 +02:00
Rémi Verschelde a7fc04626a Add missing license headers in our source files (#5255)
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
volzhs e6bbe91994 fix errors while exporting android 2016-06-16 05:00:21 +09:00
Pedro J. Estébanez 1fcb2a1a00 Handle tmp files properly on Android export 2016-06-15 14:58:01 +02:00
Pedro J. Estébanez e1948d520a Zip-align exported APK 2016-06-13 00:19:45 +02:00
Pedro J. Estébanez 1b189ad943 Fix typo 2016-06-11 13:11:42 +02:00
Pedro J. Estébanez bb1b51f470 Keep certain assets uncompressed on Android export 2016-06-11 13:08:42 +02:00
volzhs 4f64935ab6 fix android support screen property for large screen 2016-06-10 14:09:33 +09:00
Juan Linietsky d61b91cbe0 -Heavily improved editor startup and exit performance 2016-06-07 22:10:09 -03:00
Rémi Verschelde aed5474238 Merge pull request #4729 from volzhs/android-23
Supporting Android API 23 (Android 6.0)
2016-06-07 09:45:24 +02:00
George Marques 408c26ce0b
Remove Make-related flags from Android build
They were wrongly placed, creating a file named "-fpic" instead of
applying "-fpic" to the build. This file was in .gitignore, which made it
less noticiable.

This also adds build.gradle to .gitignore.
2016-06-01 21:14:57 -03:00
Rémi Verschelde e6e878e139 Icon: Remove more grey capsules behind official logo 2016-05-30 00:41:42 +02:00
fluffrabbit 4877b714b3
Add magnetometer sensor support for Android 2016-05-27 14:36:55 -03:00
volzhs e5d16eca46 Add comments for NotificationCompat to support API < 16 2016-05-25 22:19:37 +09:00
volzhs ff67c256f5 fix compatibility for Android API 14 with supporting API 23
using ``NotificationCompat`` in ``support-v4`` library will increase APK filesize a little bit, but it guarantees to run OK with API 4+
tested with API 19 and 23 devices
2016-05-24 11:22:35 +09:00
volzhs 5eb14d3af0 fix unexpected char: '\' error on windows
error occurred when register additional directory for android module on windows.

### config.py ###
```
def can_build(plat):
 return plat=="android"

def configure(env):
 if (env['platform'] == 'android'):
  env.android_add_res_dir("android/res")
```
2016-05-24 05:25:22 +09:00
Hubert Jarosz 33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
volzhs 160713d4d3 Supporting Android API 23 (Android 6.0)
If we update build gradle to use ``compileSdkVersion 23``,
``org.apache.http`` package causes error. (issue #4711)

We need to use ``useLibrary 'org.apache.http.legacy'`` to solve this problem.
To use ``useLibrary``, we need to use latest gradle also.

And now, we faced another problem with ``APK Expansion`` java sources.

```
/platform/android/java/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java
137 :             mCurrentNotification.setLatestEventInfo(mContext, mCurrentTitle, mCurrentText, mContentIntent); // causes error
```

So, some of APK Expansion java sources are updated by referencing commits from https://github.com/danikula/Google-Play-Expansion-File
And dropped V3CustomNotification.java which was for android 3.0, since godot supports android 14 (4.0) above officially.

Unfortunately, another problem, The 'MissingTranslation' error was occurred.
So, build.gradle is updated to use ``disable 'MissingTranslation'``

Additionally, I updated ``buildToolsVersion``, ``targetSdkVersion`` to latest version.

I tested APK Expansion funtionality on Android 6.0 (Nexus 9, Nexus 6p) and Android 4.4 (Galaxy Note 2)  with Google Developer console.
2016-05-20 22:57:49 +09:00
Rémi Verschelde 5e0f0a962a Android buildsystem: Drop obsolete NDK_TOOLCHAIN argument
It was a duplicate of NDK_TARGET, and not used for anything.
2016-05-19 10:44:18 +02:00
Rémi Verschelde 94274b9ab5 OSX: Fix lib suffix for Android lib (#4499)
Fixes #1452.
2016-05-01 11:38:15 +02:00
eska ab4caa7953 Move export GUI debug toggle to export settings window 2016-04-28 16:13:26 +02:00
volzhs e94e710893 remove unused resources and add korean locale for android
- remove unused resources in platform/android/java/res/values/strings.xml
- add korean language resource for apk expansion download screen
2016-04-19 11:10:55 +09:00
Rémi Verschelde 0a5472e697 Remove trailing spaces 2016-04-02 20:26:12 +02:00
Rémi Verschelde a895e2e372 Merge pull request #4105 from akien-mga/pr-android-shutdown-adb
Expose android/shutdown_adb_on_exit parameter
2016-03-20 18:34:05 +01:00
Rémi Verschelde c584940387 Expose android/shutdown_adb_on_exit parameter and default to true
It was added in 30d0ca9 for the Steam build but only enabled
when parsing a ._sc_ file that would define it.
It is now available for all users to toggle, in and outside of Steam.

Fixes #4073.
2016-03-20 16:55:54 +01:00
blubee a0fb5b5f95 Add support for gnu-libstc++-4.9 needed by recent NDK versions
The 4.9 version is the default one, people can still build using 4.8
with older NDK versions by setting the (optional) NDK_TARGET
and NDK_TARGET_X86 environment variables.
2016-03-20 20:29:37 +08:00
sanikoyes 9e026fecef Add -r flag to adb install for keep app user data 2016-03-18 18:11:55 +08:00
Hubert Jarosz 4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
volzhs d6cc887627 fix gradle build on windows 2016-03-02 12:15:39 +09:00
Ariel Manzur 30d0ca9766 added [presets] to ._sc_ and "android/shutdown_adb_on_exit" to editor_settings 2016-02-27 12:11:40 -03:00
punto- b6b33e8886 Merge pull request #3428 from Hinsbart/android-gamepad
support gamepad remapping on android
2016-02-08 20:09:02 -03:00
Hondres e7b6e3f20b use fallback mapping from list 2016-01-27 12:18:34 +01:00
Juan Linietsky 16b8b97472 Combies driver split and spawn fix, closes #3265 2016-01-25 00:25:32 -03:00
hondres 285bcac224 can use fallback mapping on all platforms 2016-01-24 18:01:37 +01:00
hondres e7c920fdba support gamepad remapping on android 2016-01-24 05:29:09 +01:00
Juan Linietsky e7eb332799 fix export bug 2016-01-20 07:43:05 -03:00
Juan Linietsky c9580965ea -Remote deploy now uses FS over USB on Android, super fast! 2016-01-20 00:29:34 -03:00
volzhs fb2bf78591 Add ability to set "keep screen on" for android 2016-01-16 20:57:34 +09:00
mrezai 4cb14ae7d6 Fix crash on android 6.0.1, fixes #3321 2016-01-12 09:57:56 +03:30
Rémi Verschelde 1f1c3038c2 Update copyright in remaining files + prints in the UI 2016-01-11 21:34:22 +01:00
Juan Linietsky c9852501a4 Fix bug related to EOF in Android FileAccess 2016-01-09 20:50:45 -03:00
mrezai 50cbe736de Fix maven repositories bug 2016-01-09 16:51:22 +03:30
Juan Linietsky 6a29edf048 removed unnecesary comma in gradle template 2016-01-08 17:55:13 -03:00
Juan Linietsky 40ba22631b Renamed godot domain from com.android.godot (which was incorrect) to org.godotengine.godot 2016-01-08 17:53:00 -03:00
Juan Linietsky 401622cc22 -Removed ANT build system for Android, as it was deprecated by Google
-Added new Gradle build system, as it is the required build system
2016-01-08 13:36:44 -03:00
Juan Linietsky e0eff65fc0 change android install location to automatic, closes #1997 2016-01-03 20:31:37 -03:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky eff81965af Merge pull request #2956 from est31/add_system_wide_export_path
Add way to look for templates at system wide level too
2015-12-08 17:04:24 -03:00
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
est31 15f6d3cebf Add way to look for templates at system wide level too
Useful for everybody wanting to package godot.
Fixes #1026.

-> Retain the old behaviour: path in error msg only when exporting.
-> User templates override system templates
2015-11-30 01:36:08 +01:00
Juan Linietsky b987d2113b 0theora compilation fixes 2015-11-25 00:28:03 -03:00
mikica1986vee d6b317a2c1 tegra 3 fix 2015-11-21 23:21:36 +01: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 0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -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
masoud bh 14b9579748 Skip META-INF from Android Template 2015-11-14 20:40:22 +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
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
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
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 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 b3cda43a0f Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	platform/windows/detect.py
2015-10-13 01:19:32 -03:00
George Marques 6e87314d83
Add support for Opus audio format 2015-10-02 14:25:38 -03: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 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
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 b0aa49accb merged some stuff for okam 2015-09-03 23:24:55 -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
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
PeaceSells 9983ceecf2 Fixes compile bug for Android template on Windows. 2015-07-24 13:12:23 -06: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 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
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
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
Juan Linietsky f220183e40 fix a crash situation when starting a thread and other small fixes 2015-05-18 12:45:53 -03:00
vipsbpig bc3afc8ed8 fix multitouch release problem 2015-05-15 12:40:34 +08: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