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

222 commits

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