Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2459d15fc0 | |||
| 3552a5e51d | |||
| 38b05eb4ef | |||
| 735ab3774d | |||
| 43aaa6e28f | |||
| 544f5c466e | |||
| 0b80d2cdf6 | |||
| b82fe0f3d7 | |||
| 860168e4eb | |||
| 84c29ed064 | |||
| 14e4450679 | |||
| 15a4a2e953 | |||
| 201284f3c2 | |||
| 708740d757 | |||
| f82ccbedd9 | |||
| 0db2fa0f96 |
@@ -2,34 +2,19 @@ name: Android
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
tags:
|
||||||
- main
|
- "v*"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
android:
|
android:
|
||||||
runs-on: godot
|
runs-on: godot
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|
||||||
- name: Godot version
|
- name: Godot version
|
||||||
run: |
|
run: godot --version
|
||||||
godot --version
|
|
||||||
|
|
||||||
|
|
||||||
- name: Java version
|
|
||||||
run: |
|
|
||||||
java -version
|
|
||||||
|
|
||||||
|
|
||||||
- name: Android SDK
|
|
||||||
run: |
|
|
||||||
sdkmanager --list | grep "platforms;android-35"
|
|
||||||
|
|
||||||
|
|
||||||
- name: Build APK
|
- name: Build APK
|
||||||
run: |
|
run: |
|
||||||
@@ -41,15 +26,37 @@ jobs:
|
|||||||
--export-release "Android" \
|
--export-release "Android" \
|
||||||
build/app.apk
|
build/app.apk
|
||||||
|
|
||||||
|
|
||||||
- name: Verify APK
|
- name: Verify APK
|
||||||
run: |
|
run: |
|
||||||
test -f build/app.apk
|
test -f build/app.apk
|
||||||
ls -lh build/app.apk
|
ls -lh build/app.apk
|
||||||
|
|
||||||
|
- name: Create Release
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||||
|
run: |
|
||||||
|
curl -f \
|
||||||
|
-X POST \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
"https://gt.owad.ru/api/v1/repos/K/owniverse/releases" \
|
||||||
|
-d "{
|
||||||
|
\"tag_name\": \"${GITHUB_REF_NAME}\",
|
||||||
|
\"name\": \"${GITHUB_REF_NAME}\",
|
||||||
|
\"body\": \"Android build ${GITHUB_REF_NAME}\"
|
||||||
|
}"
|
||||||
|
|
||||||
- name: Upload APK
|
- name: Upload APK to Release
|
||||||
uses: actions/upload-artifact@v4
|
env:
|
||||||
with:
|
GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||||
name: android-apk
|
run: |
|
||||||
path: build/app.apk
|
RELEASE_ID=$(curl -fsS \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
"https://gt.owad.ru/api/v1/repos/K/owniverse/releases/tags/${GITHUB_REF_NAME}" \
|
||||||
|
| python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
||||||
|
|
||||||
|
curl -f \
|
||||||
|
-X POST \
|
||||||
|
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||||
|
-F "attachment=@build/app.apk" \
|
||||||
|
"https://gt.owad.ru/api/v1/repos/K/owniverse/releases/${RELEASE_ID}/assets?name=owniverse-${GITHUB_REF_NAME}.apk"
|
||||||
@@ -1 +1 @@
|
|||||||
uid://dojk16crca3cx
|
uid://dy0hrqie4ritn
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[gd_scene format=3 uid="uid://d3xjfxwe3w16v"]
|
[gd_scene format=3 uid="uid://d3xjfxwe3w16v"]
|
||||||
|
|
||||||
[ext_resource type="Script" uid="uid://bxxllddlgurus" path="res://ui/owniverse_item/owniverse_item.gd" id="1_e6ro1"]
|
[ext_resource type="Script" uid="uid://bxxllddlgurus" path="res://ui/owniverse_item/owniverse_item.gd" id="1_d5xam"]
|
||||||
[ext_resource type="Texture2D" uid="uid://56w57w6iu3np" path="res://ui/owniverse_item/selected.png" id="2_eurq3"]
|
[ext_resource type="Texture2D" uid="uid://56w57w6iu3np" path="res://ui/owniverse_item/selected.png" id="2_pbv1j"]
|
||||||
|
|
||||||
[node name="Button" type="Control" unique_id=667620208]
|
[node name="Button" type="Control" unique_id=667620208]
|
||||||
visible = false
|
visible = false
|
||||||
@@ -10,7 +10,7 @@ anchors_preset = 0
|
|||||||
offset_right = 216.0
|
offset_right = 216.0
|
||||||
offset_bottom = 260.0
|
offset_bottom = 260.0
|
||||||
mouse_filter = 1
|
mouse_filter = 1
|
||||||
script = ExtResource("1_e6ro1")
|
script = ExtResource("1_d5xam")
|
||||||
|
|
||||||
[node name="Selection" type="TextureRect" parent="." unique_id=674793134]
|
[node name="Selection" type="TextureRect" parent="." unique_id=674793134]
|
||||||
visible = false
|
visible = false
|
||||||
@@ -18,7 +18,7 @@ layout_mode = 0
|
|||||||
offset_right = 216.0
|
offset_right = 216.0
|
||||||
offset_bottom = 216.0
|
offset_bottom = 216.0
|
||||||
mouse_filter = 2
|
mouse_filter = 2
|
||||||
texture = ExtResource("2_eurq3")
|
texture = ExtResource("2_pbv1j")
|
||||||
|
|
||||||
[node name="TextureButton" type="TextureButton" parent="." unique_id=1377839155]
|
[node name="TextureButton" type="TextureButton" parent="." unique_id=1377839155]
|
||||||
custom_minimum_size = Vector2(216, 216)
|
custom_minimum_size = Vector2(216, 216)
|
||||||
|
|||||||
+9
-16
@@ -1,12 +1,8 @@
|
|||||||
[runnable_presets]
|
|
||||||
|
|
||||||
"Windows Desktop"="Windows Desktop"
|
|
||||||
Android="Android"
|
|
||||||
|
|
||||||
[preset.0]
|
[preset.0]
|
||||||
|
|
||||||
name="Windows Desktop"
|
name="Windows Desktop"
|
||||||
platform="Windows Desktop"
|
platform="Windows Desktop"
|
||||||
|
runnable=true
|
||||||
dedicated_server=false
|
dedicated_server=false
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
@@ -78,6 +74,7 @@ Remove-Item -Recurse -Force '{temp_dir}'"
|
|||||||
|
|
||||||
name="Android"
|
name="Android"
|
||||||
platform="Android"
|
platform="Android"
|
||||||
|
runnable=false
|
||||||
dedicated_server=false
|
dedicated_server=false
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
@@ -104,8 +101,8 @@ custom_template/release=""
|
|||||||
gradle_build/use_gradle_build=false
|
gradle_build/use_gradle_build=false
|
||||||
gradle_build/gradle_build_directory=""
|
gradle_build/gradle_build_directory=""
|
||||||
gradle_build/android_source_template=""
|
gradle_build/android_source_template=""
|
||||||
gradle_build/compress_native_libraries=true
|
gradle_build/compress_native_libraries=false
|
||||||
gradle_build/export_format=1
|
gradle_build/export_format=0
|
||||||
gradle_build/min_sdk=""
|
gradle_build/min_sdk=""
|
||||||
gradle_build/target_sdk=""
|
gradle_build/target_sdk=""
|
||||||
gradle_build/custom_theme_attributes={}
|
gradle_build/custom_theme_attributes={}
|
||||||
@@ -113,11 +110,11 @@ architectures/armeabi-v7a=false
|
|||||||
architectures/arm64-v8a=true
|
architectures/arm64-v8a=true
|
||||||
architectures/x86=false
|
architectures/x86=false
|
||||||
architectures/x86_64=false
|
architectures/x86_64=false
|
||||||
version/code=129
|
version/code=130
|
||||||
version/name=""
|
version/name=""
|
||||||
package/unique_name="com.KIDGameProduction.Owniverse"
|
package/unique_name="com.KIDGameProduction.Owniverse"
|
||||||
package/name="Owniverse"
|
package/name="Owniverse"
|
||||||
package/signed=true
|
package/signed=false
|
||||||
package/app_category=2
|
package/app_category=2
|
||||||
package/retain_data_on_uninstall=false
|
package/retain_data_on_uninstall=false
|
||||||
package/exclude_from_recents=false
|
package/exclude_from_recents=false
|
||||||
@@ -139,12 +136,11 @@ screen/support_normal=true
|
|||||||
screen/support_large=true
|
screen/support_large=true
|
||||||
screen/support_xlarge=true
|
screen/support_xlarge=true
|
||||||
screen/background_color=Color(0, 0, 0, 1)
|
screen/background_color=Color(0, 0, 0, 1)
|
||||||
splash_screen/disable_godot_boot_splash=false
|
|
||||||
splash_screen/icon=""
|
|
||||||
splash_screen/branding_image=""
|
|
||||||
splash_screen/background_color=Color(0, 0, 0, 1)
|
|
||||||
user_data_backup/allow=false
|
user_data_backup/allow=false
|
||||||
command_line/extra_args=""
|
command_line/extra_args=""
|
||||||
|
apk_expansion/enable=false
|
||||||
|
apk_expansion/SALT=""
|
||||||
|
apk_expansion/public_key=""
|
||||||
permissions/custom_permissions=PackedStringArray()
|
permissions/custom_permissions=PackedStringArray()
|
||||||
permissions/access_checkin_properties=false
|
permissions/access_checkin_properties=false
|
||||||
permissions/access_coarse_location=false
|
permissions/access_coarse_location=false
|
||||||
@@ -299,6 +295,3 @@ permissions/write_sms=false
|
|||||||
permissions/write_social_stream=false
|
permissions/write_social_stream=false
|
||||||
permissions/write_sync_settings=false
|
permissions/write_sync_settings=false
|
||||||
permissions/write_user_dictionary=false
|
permissions/write_user_dictionary=false
|
||||||
apk_expansion/enable=false
|
|
||||||
apk_expansion/SALT=""
|
|
||||||
apk_expansion/public_key=""
|
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
|
|||||||
[application]
|
[application]
|
||||||
|
|
||||||
config/name="Owniverse"
|
config/name="Owniverse"
|
||||||
config/version="0.6.13"
|
config/version="0.6.14"
|
||||||
run/main_scene="uid://bv384dpmvjv8o"
|
run/main_scene="uid://bv384dpmvjv8o"
|
||||||
config/features=PackedStringArray("4.7", "Mobile")
|
config/features=PackedStringArray("4.7", "Mobile")
|
||||||
boot_splash/show_image=false
|
boot_splash/show_image=false
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ const FLOAT_THRESHOLD: float = 1.0E14
|
|||||||
var state: Dictionary = {
|
var state: Dictionary = {
|
||||||
'year': 0.0,
|
'year': 0.0,
|
||||||
'energy': 1E14,
|
'energy': 1E14,
|
||||||
'batches': {},
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var entities: Dictionary[String, OwniverseEntity] = {}
|
var entities: Dictionary[String, OwniverseEntity] = {}
|
||||||
|
|||||||
Reference in New Issue
Block a user