Compare commits
50 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e4a0dd2d13 | |||
| 0a10cff0fa | |||
| e4cf5bdad0 | |||
| 645751cd23 | |||
| b92a49821d | |||
| 3a91528e95 | |||
| 3c37be2a8e | |||
| 544b5f4f56 | |||
| cc9de54d42 | |||
| e76414ce17 | |||
| 68c2b4f25d | |||
| 78946f1bb4 | |||
| 0d1671fe8f | |||
| ea35017aa0 | |||
| 0db24fec60 | |||
| b2a18c9c41 | |||
| 16ec80929c | |||
| 3536e25d52 | |||
| 935d249183 | |||
| 8cb01d77de | |||
| a446b7cb41 | |||
| 82681d27e1 | |||
| 777ec2907b | |||
| 8513bf0313 | |||
| a4019ed98c | |||
| 4731489015 | |||
| 711ace6678 | |||
| 89342dc614 | |||
| 2459d15fc0 | |||
| 3552a5e51d | |||
| 38b05eb4ef | |||
| 735ab3774d | |||
| 43aaa6e28f | |||
| 544f5c466e | |||
| 0b80d2cdf6 | |||
| b82fe0f3d7 | |||
| 860168e4eb | |||
| 84c29ed064 | |||
| 14e4450679 | |||
| 15a4a2e953 | |||
| 201284f3c2 | |||
| 708740d757 | |||
| f82ccbedd9 | |||
| 0db2fa0f96 | |||
| 41de04c2e2 | |||
| 5bb566351d | |||
| 88bcf77aa9 | |||
| 4de9027d1e | |||
| 044d193f8d | |||
| d9cae38a11 |
@@ -0,0 +1,92 @@
|
|||||||
|
name: Android
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "v*"
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
android:
|
||||||
|
runs-on: godot
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
lfs: true
|
||||||
|
- name: Godot version
|
||||||
|
run: godot --version
|
||||||
|
|
||||||
|
- name: Prepare Godot
|
||||||
|
run: |
|
||||||
|
rm -rf .godot
|
||||||
|
|
||||||
|
godot \
|
||||||
|
--headless \
|
||||||
|
--path . \
|
||||||
|
--editor \
|
||||||
|
--quit \
|
||||||
|
--verbose
|
||||||
|
|
||||||
|
|
||||||
|
- name: Build APK
|
||||||
|
run: |
|
||||||
|
mkdir -p build
|
||||||
|
|
||||||
|
godot \
|
||||||
|
--headless \
|
||||||
|
--path . \
|
||||||
|
--editor \
|
||||||
|
--quit
|
||||||
|
|
||||||
|
godot \
|
||||||
|
--headless \
|
||||||
|
--path . \
|
||||||
|
--export-release "Android" \
|
||||||
|
build/app.apk
|
||||||
|
|
||||||
|
|
||||||
|
- name: Check imported resources
|
||||||
|
run: |
|
||||||
|
echo "=== PNG imports ==="
|
||||||
|
find .godot/imported -iname '*habitable*' -o -iname '*civ2*'
|
||||||
|
|
||||||
|
echo "=== PNG files ==="
|
||||||
|
ls -lh ui/4-life/habitable_planet.png
|
||||||
|
ls -lh ui/4-life/civ2.png
|
||||||
|
|
||||||
|
|
||||||
|
- name: Verify APK
|
||||||
|
run: |
|
||||||
|
test -f 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 to Release
|
||||||
|
env:
|
||||||
|
GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||||
|
run: |
|
||||||
|
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 +0,0 @@
|
|||||||
uid://dojk16crca3cx
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://dy0hrqie4ritn
|
||||||
@@ -21,14 +21,14 @@ LRG|0||||50||50000000||||S:300||DSN^SGRB%0.1|2|||RG|Star|||||
|
|||||||
HRG|0||||100||10000000||||S:400.||SN^GRB%1|2|||RG|Star|||||
|
HRG|0||||100||10000000||||S:400.||SN^GRB%1|2|||RG|Star|||||
|
||||||
RSG|0||||300||1000000||||S:500||BSN^LGRB%3|2|||RG|Star|||||
|
RSG|0||||300||1000000||||S:500||BSN^LGRB%3|2|||RG|Star|||||
|
||||||
RHG|0||||1000||100000||||S:600||HN^HGRB%10|2|||RG|Star|||||
|
RHG|0||||1000||100000||||S:600||HN^HGRB%10|2|||RG|Star|||||
|
||||||
DSN|0||||||0|||2|S:59.1||SNS:1&H:6.5&He:13.5&Met:11&blast:2|2|mass:15&H:6.5&HE:13.5&MET:11||||SNGRBB||||
|
DSN|0||||||1|||2|S:59.1||SNS:1&H:6.5&He:13.5&Met:11&blast:2|2|mass:15&H:6.5&HE:13.5&MET:11||||SNGRBB||||
|
||||||
SN|0||||||0|||9|S:99.1||LNS:1&H:8&He:50&Met:11&blast:9|2|mass:18&H:8&HE:50&MET:11||||SNGRBB||||
|
SN|0||||||1|||9|S:99.1||LNS:1&H:8&He:50&Met:11&blast:9|2|mass:18&H:8&HE:50&MET:11||||SNGRBB||||
|
||||||
BSN|0||||||0||.|305|S:309.1||MGT:1&H:15&He:186&Met:15&blast:305|2|mass:21&H:15&HE:186&MET:15||||SNGRBB||||
|
BSN|0||||||1||.|305|S:309.1||MGT:1&H:15&He:186&Met:15&blast:305|2|mass:21&H:15&HE:186&MET:15||||SNGRBB||||
|
||||||
HN|0||||||0|||9990|S:939.1||BH40:1&H:30&He:560&Met:30&blast:9990|2|mass:40&H:30&HE:560&MET:30||||SNGRBB||||
|
HN|0||||||1|||9990|S:939.1||BH40:1&H:30&He:560&Met:30&blast:9990|2|mass:40&H:30&HE:560&MET:30||||SNGRBB||||
|
||||||
SGRB|0||||||0||0.001|31|S:149.1||BH25:1&H:0.5&He:10&Met:4&blast:31|2|mass:25&H:0.5&HE:10&MET:4||||SNGRBB||||
|
SGRB|0||||||1||0.001|31|S:149.1||BH25:1&H:0.5&He:10&Met:4&blast:31|2|mass:25&H:0.5&HE:10&MET:4||||SNGRBB||||
|
||||||
GRB|0||||||0||0.01|136|S:239.1||BH30:1&H:19&He:12&Met:5&blast:136|2|mass:30&H:19&HE:12&MET:5||||SNGRBB||||
|
GRB|0||||||1||0.01|136|S:239.1||BH30:1&H:19&He:12&Met:5&blast:136|2|mass:30&H:19&HE:12&MET:5||||SNGRBB||||
|
||||||
LGRB|0||||||0||0.03|3446|S:669.1||BH40:1&H:68&He:18&Met:9&blast:3446|2|mass:40&H:68&HE:18&MET:9||||SNGRBB||||
|
LGRB|0||||||1||0.03|3446|S:669.1||BH40:1&H:68&He:18&Met:9&blast:3446|2|mass:40&H:68&HE:18&MET:9||||SNGRBB||||
|
||||||
HGRB|0||||||0||0.1|97342|S:1939.1||BH60:1&H:0&He:40&Met:10&blast:97342|2|mass:60&H:0&HE:40&MET:10||||SNGRBB||||
|
HGRB|0||||||1||0.1|97342|S:1939.1||BH60:1&H:0&He:40&Met:10&blast:97342|2|mass:60&H:0&HE:40&MET:10||||SNGRBB||||
|
||||||
CBD|0||||0.1||||||||||||BD||||||
|
CBD|0||||0.1||||||||||||BD||||||
|
||||||
WD|1|WD:1|||||||||||||||||||||
|
WD|1|WD:1|||||||||||||||||||||
|
||||||
TWD|0||||0.8||||||||||||WD|Star|Degen||||
|
TWD|0||||0.8||||||||||||WD|Star|Degen||||
|
||||||
|
|||||||
+6
-6
@@ -74,7 +74,7 @@ Remove-Item -Recurse -Force '{temp_dir}'"
|
|||||||
|
|
||||||
name="Android"
|
name="Android"
|
||||||
platform="Android"
|
platform="Android"
|
||||||
runnable=true
|
runnable=false
|
||||||
dedicated_server=false
|
dedicated_server=false
|
||||||
custom_features=""
|
custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
@@ -98,11 +98,11 @@ script_export_mode=2
|
|||||||
|
|
||||||
custom_template/debug=""
|
custom_template/debug=""
|
||||||
custom_template/release=""
|
custom_template/release=""
|
||||||
gradle_build/use_gradle_build=true
|
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={}
|
||||||
@@ -110,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=140
|
||||||
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
|
||||||
|
|||||||
+3
-7
@@ -8,24 +8,20 @@
|
|||||||
|
|
||||||
config_version=5
|
config_version=5
|
||||||
|
|
||||||
[animation]
|
|
||||||
|
|
||||||
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.24"
|
||||||
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
|
||||||
config/icon="uid://do5teb1i7uiuw"
|
config/icon="uid://djiwkyk470qb2"
|
||||||
config/size/borderless=true
|
config/size/borderless=true
|
||||||
config/stretch_mode=0
|
config/stretch_mode=0
|
||||||
|
|
||||||
[autoload]
|
[autoload]
|
||||||
|
|
||||||
Global="*uid://dojk16crca3cx"
|
Global="*uid://dy0hrqie4ritn"
|
||||||
SaveManager="*uid://ul0srjc4gcgg"
|
SaveManager="*uid://ul0srjc4gcgg"
|
||||||
|
|
||||||
[display]
|
[display]
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
extends Control
|
extends Control
|
||||||
|
|
||||||
#signal produce_items(item_id: String, amount: int)
|
|
||||||
|
|
||||||
const OWNIVERSE_ITEM = preload("uid://d3xjfxwe3w16v")
|
const OWNIVERSE_ITEM = preload("uid://d3xjfxwe3w16v")
|
||||||
|
|
||||||
const SPEED_TEXTURE_NAME_TEMPLATE = "res://ui/topmenu/time&speed/time%s.png"
|
const SPEED_TEXTURE_NAME_TEMPLATE = "res://ui/topmenu/time&speed/time%s.png"
|
||||||
@@ -98,9 +96,6 @@ func set_owniverse_item_value() -> void:
|
|||||||
owniverse.items_to_update = {}
|
owniverse.items_to_update = {}
|
||||||
|
|
||||||
|
|
||||||
#func unlock_owniverse_item() -> void:
|
|
||||||
#pass
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
func _on_indicator_pressed(indicator_name: String, page: int = 0):
|
func _on_indicator_pressed(indicator_name: String, page: int = 0):
|
||||||
@@ -300,6 +295,11 @@ func _change_speed(delta: int) -> void:
|
|||||||
|
|
||||||
func _on_topmenu_button_pressed(ButtonName) -> void:
|
func _on_topmenu_button_pressed(ButtonName) -> void:
|
||||||
print(ButtonName)
|
print(ButtonName)
|
||||||
|
#var s: float = 1E15
|
||||||
|
#var z = 1.0
|
||||||
|
#for i in range(30):
|
||||||
|
#print(i, " | ", z, " | ", " | ", s - z)
|
||||||
|
#z *= 10
|
||||||
|
|
||||||
|
|
||||||
func _on_save_data() -> void:
|
func _on_save_data() -> void:
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user