godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,285 Commits 15 Branches 59 Tags 2.2 GiB
Commit Graph

749 Commits

Author SHA1 Message Date
Rémi Verschelde 0246a1a276 Revert "Enable the ability to use Godot as a subview within an Android app" 
This reverts commit 920639511d.

The changes are good, this revert is only done for release management reasons
as we want this feature to get more testing before making it in a stable build,
but a 3.2.3 release is imminent to handle some regressions in 3.2.2.

This will be re-committed in a 3.2-based feature branch, and we'll merge it
again once we're confident about it (probably for 3.2.4).
 2020-07-10 08:51:21 +02:00
Fredia Huya-Kouadio 623a1ae5b3 Fix the logic to enable focus awareness 2020-06-27 16:40:22 -07:00
Fredia Huya-Kouadio 920639511d Enable the ability to use Godot as a subview within an Android app 2020-06-25 19:57:03 -07:00
Fredia Huya-Kouadio 944210923f Follow up cleanup for the godotpayment project module 
(cherry picked from commit 206cbd960b)
 2020-06-24 22:52:05 +02:00
Timo Schwarzer 5053ab684a
Remove GodotPayment android plugin 
This is now available in a separate repository
at https://github.com/godotengine/godot-google-play-billing
 2020-06-22 11:11:41 +02:00
Fredia Huya-Kouadio 61aa477e1c Clean up the `GodotPlugin` public API. 2020-06-16 09:24:41 -07:00
Rémi Verschelde 7bf9787921 SCons: Format buildsystem files with psf/black 
Configured for a max line length of 120 characters.

psf/black is very opinionated and purposely doesn't leave much room for
configuration. The output is mostly OK so that should be fine for us,
but some things worth noting:

- Manually wrapped strings will be reflowed, so by using a line length
  of 120 for the sake of preserving readability for our long command
  calls, it also means that some manually wrapped strings are back on
  the same line and should be manually merged again.

- Code generators using string concatenation extensively look awful,
  since black puts each operand on a single line. We need to refactor
  these generators to use more pythonic string formatting, for which
  many options are available (`%`, `format` or f-strings).

- CI checks and a pre-commit hook will be added to ensure that future
  buildsystem changes are well-formatted.

(cherry picked from commit cd4e46ee65)
 2020-06-10 15:30:52 +02:00
Marcus Brummer a6e9001579 Check if the specified Android release keystore exists 
(cherry picked from commit 21263a65a9)
 2020-06-05 12:45:46 +02:00
Fredia Huya-Kouadio d1e4cede90 Add support for focus awareness 2020-06-04 15:51:51 -07:00
PouleyKetchoupp aa935c262a Fix inconsistent error messages with Android custom export templates 
(cherry picked from commit be22a1f9bc)
 2020-06-04 12:16:39 +02:00
Fredia Huya-Kouadio bea913a874 Stop ignoring hidden files and directories in the `assets` directory 
(cherry picked from commit bf76d2afcf)
 2020-06-04 12:09:39 +02:00
Marcus Brummer b6c536317b Perform a clean Gradle build if android plugins changed 
Fixes #38986

(cherry picked from commit abd66c1bb0)
 2020-06-04 11:17:11 +02:00
volzhs c86ddd6b61 Add missing consumePurchase plugin method for GodotPayment 2020-05-28 11:51:14 +09:00
Rémi Verschelde f03bc21e09
Merge pull request #39103 from m4gr3d/enable_legacy_external_storage 
Enable legacy external storage for Android 10
 2020-05-27 22:57:24 +02:00
Fredia Huya-Kouadio 2e7e3dcfe4 Enable legacy external storage for Android 10 2020-05-27 13:34:40 -07:00
Fredia Huya-Kouadio 0181e89e43 Validate that `Use Custom Build` is enabled when `Plugins` are selected 
Remove `GodotPayment` from the default build template
 2020-05-27 12:04:31 -07:00
Rémi Verschelde 9aeb9ea826
Merge pull request #39081 from m4gr3d/fix_emit_signal_3_2 
[3.2] Fix parameters passing when emitting signal
 2020-05-27 12:53:35 +02:00
Fredia Huya-Kouadio 3c0b26e29c Fix parameters passing when emitting signal 
The issue was caused because we were using variables local to the `for` loop block.
Address [feedback](https://github.com/godotengine/godot/pull/39047#issuecomment-634545849) by @pouleyKetchoupp regarding the use of arrays on stack with dynamic size.
 2020-05-27 03:38:38 -07:00
Fredia Huya-Kouadio 06b7f611f8 Provide the ability for clients of the Godot library to add their own command line arguments 2020-05-27 02:12:54 -07:00
Timo Schwarzer 8373c0792a
Re-implement GodotPayment Android plugin using the Google Play Billing library 2020-05-25 21:09:45 +02:00
PouleyKetchoupp f4f4b77d23 Use long instead of int for object id in Android java wrapper 
Using int for 64-bit values might cause issues with objects not found
in ObjectDB when the id is truncated.

(cherry picked from commit 39f59786fa)
 2020-05-25 16:36:34 +02:00
SkyJJ 2197ef0566 Fix Android LineEdit editing bugs 
(cherry picked from commit cc473b948f)
 2020-05-20 12:07:08 +02:00
Fredia Huya-Kouadio 2c81a82d53 Update the permission string for the Oculus hand tracking to match the latest api update 
(cherry picked from commit 6e2988f26a)
 2020-05-20 11:37:24 +02:00
Fabio Alessandrelli 92031098bf Move mixrate and latency definition to AudioServer 
Each driver used to define the (same) project settings value, but the
setting names are not driver specific. Ovverriding is still possible via
platform tags.

(cherry picked from commit 90c7102b51)
 2020-05-18 16:40:33 +02:00
Fredia Huya-Kouadio a71a338c59 Implementation of the Godot Android Plugin configuration file 2020-05-16 23:09:45 -07:00
Rémi Verschelde d784cb23ec
Merge pull request #37929 from thebestnom/migrate-to-androidX-3.2 
Android: Migrate deprecated support library to AndroidX [3.2]
 2020-05-16 09:03:44 +02:00
Rémi Verschelde d45b96d2b1 Android: Check for deprecated GodotPaymentV3 module, direct to new plugin 
Fixes #38581.
 2020-05-15 13:32:30 +02:00
thebestnom 30680a4afe Android: Migrate deprecated support library to AndroidX 2020-05-10 19:08:27 +03:00
Rémi Verschelde e637fe9dd3 clang-format: Add JavaImportGroups for Java code 
(cherry picked from commit 6038325470)
 2020-05-07 13:36:27 +02:00
Fredia Huya-Kouadio 918f5dee23 Address `OS.request_permissions()` bug when non-platform permission(s) is included 
(cherry picked from commit ef62506e5c)
 2020-05-06 23:29:29 +02:00
Marcel Admiraal 48bc3fd297 Fix Android export throwing Unicode errors. 
(cherry picked from commit e74f8aaaf1)
 2020-05-01 10:56:58 +02:00
Fredia Huya-Kouadio 2d9725b89d Fix detection logic for the Android sdk path 
The previous logic used the 'tools' directory within the Android sdk to validate it. That directory was recently deprecated and removed from the Android sdk folder (https://developer.android.com/studio/releases/sdk-tools)

(cherry picked from commit 328354f878)
 2020-04-27 10:15:56 +02:00
Fredia Huya-Kouadio 17ad99c206 Fix Android templates size regression 
The issue was caused by PR #36906 which changes prevented the generated shared libraries from being stripped.
Since the change is only needed for development (debugging) purposes, it's commented out by default.

(cherry picked from commit 2f38cfd9ab)
 2020-04-23 11:08:46 +02:00
Fredia Huya-Kouadio b7fa9cf8ff Fix compilation issue by updating a call to `runOnGLThread` that was missed by PR #37175 2020-04-16 16:16:24 -07:00
Rémi Verschelde c4a849588b
Merge pull request #37175 from m4gr3d/make_godot_plugin_callbacks_generic_3.2 
[3.2] Update the naming scheme for the GodotPlugin's methods
 2020-04-17 00:08:27 +02:00
SkyJJ 96e381ac03 Validate supported architectures when exporting to Android 
(cherry picked from commit 7fcd13575e)
 2020-04-16 11:41:41 +02:00
fhuya 373db27788 Migrate legacy apache dependency to the GodotPayment plugin 
This is the only location in the codebase where it's being used, so no need to make the main lib have a dependency on it.

(cherry picked from commit c591cb8fda)
 2020-04-16 11:41:23 +02:00
Rémi Verschelde 88e1264893 Android: Bump build tools to 29.0.3 
(cherry picked from commit ca896ddbf0)
 2020-04-16 11:41:11 +02:00
fhuya ff7b455478 Delete unused drawable resources. 
(cherry picked from commit 73d4e2eefb)
 2020-04-16 11:40:56 +02:00
fhuya fd045b8b91 Update Android custom template build configuration. 
(cherry picked from commit 9c11076a20)
 2020-04-16 11:40:06 +02:00
Rémi Verschelde 5698a9ec74
Merge pull request #37305 from m4gr3d/implement_plugin_signals_3.2 
[3.2] Add signal support to Godot Android plugin:
 2020-04-10 18:42:32 +02:00
Rémi Verschelde 798bf901b8 Android: Downgrade gradle plugin to 3.5.3 
With the NDK installed locally, gradle plugin 3.6.0 seems to enforce
a specific older NDK version, and will fail building if you don't have
it installed with:

```
No version of NDK matched the requested version 20.0.5594570.
Versions available locally: 21.0.6113669
```

Upstream issue: https://github.com/gradle/gradle/issues/12440

(cherry picked from commit ba2ec53a26)
 2020-04-02 23:34:02 +02:00
fhuya b995256bca Update the naming scheme for the GodotPlugin's methods in preparation of the vulkan integration. 2020-03-28 15:42:21 -07:00
fhuya 0c782ca2b2 Backport Kotlin support 2020-03-27 10:18:30 -07:00
fhuya f69760b4be Add signal support to Godot Android plugin: 
Supports registering and emitting signal from a Godot Android plugin
 2020-03-27 01:37:41 -07:00
fhuya 7135bc3e37 Miscellaneous cleanup for the Android codebase: 
- update gradle plugins versions
- cleanup java_godot_lib_jni

Note: logic was mostly moved around and no new logic/functionality was added.
 2020-03-25 09:00:37 -07:00
Rajat Goswami 19e71f94d8 Adding missing include guards to header files identified by LGTM. 
This addresses the issue godotengine/godot#37143

(cherry picked from commit 2ecf928ae3)
 2020-03-25 11:38:54 +01:00
unknown fcde11222a Removed unused code in android detect.py and SCsub 
(cherry picked from commit 90cdacd741)
 2020-03-25 11:38:54 +01:00
PouleyKetchoupp 2e4e1e0324 Fix text_entered signal when max_length is used in LineEdit on Android 
Fixes #35954

(cherry picked from commit c169367e83)
 2020-03-25 11:38:53 +01:00
fhuya 9a035efe62 Complete the implementation of the GodotPayment plugin. 
Move the remaining plugin components within the plugin source code.

(cherry picked from commit 99173c5fc4)
 2020-03-25 11:38:53 +01:00