Merge branch 'main' into feature/evolution

.gitea/workflows/android.yml

@@ -2,19 +2,34 @@ name: Android
 
 on:
   push:
-    tags:
-      - "v*"
+    branches:
+      - main
 
 jobs:
+
   android:
     runs-on: godot
 
     steps:
+
       - name: Checkout
         uses: actions/checkout@v4
 
+
       - name: Godot version
-        run: godot --version
+        run: |
+          godot --version
+
+
+      - name: Java version
+        run: |
+          java -version
+
+
+      - name: Android SDK
+        run: |
+          sdkmanager --list | grep "platforms;android-35"
+
 
       - name: Build APK
         run: |
@@ -26,37 +41,15 @@ jobs:
             --export-release "Android" \
             build/app.apk
 
+
       - 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"
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-apk
+          path: build/app.apk

Autoload/Global.gd.uid

@@ -1 +1 @@
-uid://dy0hrqie4ritn
+uid://dojk16crca3cx

UI/owniverse_item/owniverse_item.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://d3xjfxwe3w16v"]
 
-[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_pbv1j"]
+[ext_resource type="Script" uid="uid://bxxllddlgurus" path="res://ui/owniverse_item/owniverse_item.gd" id="1_e6ro1"]
+[ext_resource type="Texture2D" uid="uid://56w57w6iu3np" path="res://ui/owniverse_item/selected.png" id="2_eurq3"]
 
 [node name="Button" type="Control" unique_id=667620208]
 visible = false
@@ -10,7 +10,7 @@ anchors_preset = 0
 offset_right = 216.0
 offset_bottom = 260.0
 mouse_filter = 1
-script = ExtResource("1_d5xam")
+script = ExtResource("1_e6ro1")
 
 [node name="Selection" type="TextureRect" parent="." unique_id=674793134]
 visible = false
@@ -18,7 +18,7 @@ layout_mode = 0
 offset_right = 216.0
 offset_bottom = 216.0
 mouse_filter = 2
-texture = ExtResource("2_pbv1j")
+texture = ExtResource("2_eurq3")
 
 [node name="TextureButton" type="TextureButton" parent="." unique_id=1377839155]
 custom_minimum_size = Vector2(216, 216)

export_presets.cfg

@@ -1,8 +1,12 @@
+[runnable_presets]
+
+"Windows Desktop"="Windows Desktop"
+Android="Android"
+
 [preset.0]
 
 name="Windows Desktop"
 platform="Windows Desktop"
-runnable=true
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
@@ -74,7 +78,6 @@ Remove-Item -Recurse -Force '{temp_dir}'"
 
 name="Android"
 platform="Android"
-runnable=false
 dedicated_server=false
 custom_features=""
 export_filter="all_resources"
@@ -101,8 +104,8 @@ custom_template/release=""
 gradle_build/use_gradle_build=false
 gradle_build/gradle_build_directory=""
 gradle_build/android_source_template=""
-gradle_build/compress_native_libraries=false
-gradle_build/export_format=0
+gradle_build/compress_native_libraries=true
+gradle_build/export_format=1
 gradle_build/min_sdk=""
 gradle_build/target_sdk=""
 gradle_build/custom_theme_attributes={}
@@ -110,11 +113,11 @@ architectures/armeabi-v7a=false
 architectures/arm64-v8a=true
 architectures/x86=false
 architectures/x86_64=false
-version/code=130
+version/code=129
 version/name=""
 package/unique_name="com.KIDGameProduction.Owniverse"
 package/name="Owniverse"
-package/signed=false
+package/signed=true
 package/app_category=2
 package/retain_data_on_uninstall=false
 package/exclude_from_recents=false
@@ -136,11 +139,12 @@ screen/support_normal=true
 screen/support_large=true
 screen/support_xlarge=true
 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
 command_line/extra_args=""
-apk_expansion/enable=false
-apk_expansion/SALT=""
-apk_expansion/public_key=""
 permissions/custom_permissions=PackedStringArray()
 permissions/access_checkin_properties=false
 permissions/access_coarse_location=false
@@ -295,3 +299,6 @@ permissions/write_sms=false
 permissions/write_social_stream=false
 permissions/write_sync_settings=false
 permissions/write_user_dictionary=false
+apk_expansion/enable=false
+apk_expansion/SALT=""
+apk_expansion/public_key=""

project.godot

@@ -15,7 +15,7 @@ compatibility/default_parent_skeleton_in_mesh_instance_3d=true
 [application]
 
 config/name="Owniverse"
-config/version="0.6.14"
+config/version="0.6.13"
 run/main_scene="uid://bv384dpmvjv8o"
 config/features=PackedStringArray("4.7", "Mobile")
 boot_splash/show_image=false

world/owniverse/owniverse_evolution.gd

@@ -7,6 +7,8 @@ const FLOAT_THRESHOLD: float = 1.0E14
 var state: Dictionary = {
     'year': 0.0,
     'energy': 1E14,
+    'batches': {},
+    
 }
 
 var entities: Dictionary[String, OwniverseEntity] = {}