Merge branch 'main' of https://github.com/Nitwel/Immersive-Home

2023-11-20 23:49:00 +01:00 · 2023-11-20 23:49:00 +01:00 · 8d92ca76bb
commit 8d92ca76bb
parent b43847d280 5b84add3dc
9 changed files with 462 additions and 24 deletions
--- a/.github/workflows/build-debug.yml
+++ b/.github/workflows/build-debug.yml
@ -63,15 +63,10 @@ jobs:
          relative_project_path: ./
          archive_output: true

-      - name: Upload APK
-        uses: actions/upload-artifact@v2
-        with:
-          name: immersive-home-debug
-          path: ${{ steps.export.outputs.archive_directory }}
-
      - name: create release
        uses: ncipollo/release-action@v1.11.2
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
-          generateReleaseNotes: true
+          generateReleaseNotes: false
+          prerelease: true
          artifacts: ${{ steps.export.outputs.archive_directory }}/* # Added "/*" at the end is glob pattern match for this action
--- a/.github/workflows/build-prod.yml
+++ b/.github/workflows/build-prod.yml
@ -0,0 +1,78 @@
+# Build the Android APK on push to the master branch
+name: Build Release APK
+on:
+  push:
+    tags:
+      - "v*"
+      - "!v*-test"
+
+env:
+  GODOT_VERSION: 4.1.3
+  EXPORT_NAME: immersive-home
+
+jobs:
+  # job id, can be anything
+  export_game:
+    # Always use ubuntu-latest for this action
+    runs-on: ubuntu-latest
+    # Add permission for release creation. Can be made narrower according to your needs
+    permissions: write-all
+    # Job name, can be anything
+    name: Export Game
+    steps:
+      # Always include the checkout step so that
+      # your project is available for Godot to export
+      - name: checkout
+        uses: actions/checkout@v3.3.0
+        with:
+          lfs: true
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: "17"
+          distribution: "temurin"
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Setup Android Export
+        run: |
+          echo "${{ secrets.KEYSTORE_RELEASE }}" | base64 -di > release.keystore
+
+          rm export_presets.cfg
+          mv export_presets_prod.cfg export_presets.cfg
+
+          echo keystore/release="/home/runner/work/Immersive-Home/Immersive-Home/release.keystore" > ./export_presets.cfg
+          echo keystore/release_user="${{ secrets.RELEASE_USER }}" > ./export_presets.cfg
+          echo keystore/release_password="${{ secrets.RELEASE_PASSWORD }}" > ./export_presets.cfg
+
+          mkdir -p ~/.config/godot
+          cp -v ./editor_settings-4.tres ~/.config/godot/
+
+          mkdir -p ./android/build
+          touch ./android/build/.gdignore
+
+          wget -nv https://downloads.tuxfamily.org/godotengine/4.1.3/Godot_v4.1.3-stable_export_templates.tpz -O ./godot_templates.tpz
+          unzip -q ./godot_templates.tpz -d .
+          rm ./godot_templates.tpz
+          unzip -q ./templates/android_source.zip -d ./android/build/
+          rm ./templates/android_source.zip
+
+      - name: export game
+        id: export
+        # Use latest version (see releases for all versions)
+        uses: firebelley/godot-export@v5.2.1
+        with:
+          # Defining all the required inputs
+          godot_executable_download_url: https://downloads.tuxfamily.org/godotengine/4.1.3/Godot_v4.1.3-stable_linux.x86_64.zip
+          godot_export_templates_download_url: https://downloads.tuxfamily.org/godotengine/4.1.3/Godot_v4.1.3-stable_export_templates.tpz
+          relative_project_path: ./
+          archive_output: true
+
+      - name: create release
+        uses: ncipollo/release-action@v1.11.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          generateReleaseNotes: true
+          artifacts: ${{ steps.export.outputs.archive_directory }}/* # Added "/*" at the end is glob pattern match for this action
--- a/assets/banner.png.import
+++ b/assets/banner.png.import
@ -1,3 +1,34 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d859d4114970ee061de56a0c9e108deddaac675613b45ea1c6ac09a6225d63e
-size 759
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bhqu5ikmntth5"
+path="res://.godot/imported/banner.png-e7286fd0372c3fd293fa9b7b04a52c04.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/banner.png"
+dest_files=["res://.godot/imported/banner.png-e7286fd0372c3fd293fa9b7b04a52c04.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/logo-background.png.import
+++ b/assets/logo-background.png.import
@ -1,3 +1,34 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a3dcddb38aad078d2aa060c37fd931c564eff3241e8badadae8737ab647e54b
-size 786
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bcp24e532oyfy"
+path="res://.godot/imported/logo-background.png-3d5691e6c32be592c284587b43087aae.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/logo-background.png"
+dest_files=["res://.godot/imported/logo-background.png-3d5691e6c32be592c284587b43087aae.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/logo.png.import
+++ b/assets/logo.png.import
@ -1,3 +1,34 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1daf27643292c3a222f2a9e60dfe38db5e62963cbfa2dd313588aa98f4e053b4
-size 753
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dfjiirx86lrmv"
+path="res://.godot/imported/logo.png-e2220799298e3631eb0e245316e0501a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/logo.png"
+dest_files=["res://.godot/imported/logo.png-e2220799298e3631eb0e245316e0501a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/assets/materials/swich_on.png.import
+++ b/assets/materials/swich_on.png.import
@ -1,3 +1,36 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b936cb0718d6b36ba9070d10fe2a16b2dbff0a4f9649e80205e3218fdb4b9df9
-size 1007
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://mka0p8sibn0j"
+path.s3tc="res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.s3tc.ctex"
+path.etc2="res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/materials/swich_on.png"
+dest_files=["res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.s3tc.ctex", "res://.godot/imported/swich_on.png-aaecfc89af488277ed429205bc63e729.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0
--- a/assets/materials/switch_off.png.import
+++ b/assets/materials/switch_off.png.import
@ -1,3 +1,34 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71e68850377c2368a7433084c550cc7c5fa5110184cf59fc6d7a8f77f5f4af89
-size 1017
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://7onhvjw8ohur"
+path="res://.godot/imported/switch_off.png-c31f6b401a5d3d7cba3c9d0f2c8b28fe.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/materials/switch_off.png"
+dest_files=["res://.godot/imported/switch_off.png-c31f6b401a5d3d7cba3c9d0f2c8b28fe.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
--- a/export_presets.cfg
+++ b/export_presets.cfg
@ -1,6 +1,6 @@
 [preset.0]

-name="Android"
+name="android-debug"
 platform="Android"
 runnable=true
 dedicated_server=false
@ -205,4 +205,4 @@ permissions/write_sync_settings=false
 permissions/write_user_dictionary=false
 package/show_in_android_tv=false
 package/show_in_app_library=true
-package/show_as_launcher_app=false
+package/show_as_launcher_app=false
--- a/export_presets_prod.cfg
+++ b/export_presets_prod.cfg
@ -0,0 +1,208 @@
+[preset.0]
+
+name="android-release"
+platform="Android"
+runnable=false
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter="*.j2"
+exclude_filter=""
+export_path="builds/android/immersive-home.apk"
+encryption_include_filters=""
+encryption_exclude_filters=""
+encrypt_pck=false
+encrypt_directory=false
+
+[preset.0.options]
+
+custom_template/debug=""
+custom_template/release=""
+gradle_build/use_gradle_build=true
+gradle_build/export_format=0
+gradle_build/min_sdk=""
+gradle_build/target_sdk=""
+plugins/GodotOpenXRKHR=false
+plugins/GodotOpenXRLynx=false
+plugins/GodotOpenXRMeta=true
+plugins/GodotOpenXRPico=false
+architectures/armeabi-v7a=false
+architectures/arm64-v8a=true
+architectures/x86=false
+architectures/x86_64=false
+version/code=3
+version/name="v0.1.2"
+package/unique_name="de.nitwel.$genname"
+package/name="Immersive Home"
+package/signed=true
+package/app_category=2
+package/retain_data_on_uninstall=false
+package/exclude_from_recents=false
+launcher_icons/main_192x192=""
+launcher_icons/adaptive_foreground_432x432=""
+launcher_icons/adaptive_background_432x432=""
+graphics/opengl_debug=false
+xr_features/xr_mode=1
+xr_features/hand_tracking=0
+xr_features/hand_tracking_frequency=1
+xr_features/passthrough=1
+screen/immersive_mode=true
+screen/support_small=true
+screen/support_normal=true
+screen/support_large=true
+screen/support_xlarge=true
+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
+permissions/access_fine_location=false
+permissions/access_location_extra_commands=false
+permissions/access_mock_location=false
+permissions/access_network_state=false
+permissions/access_surface_flinger=false
+permissions/access_wifi_state=false
+permissions/account_manager=false
+permissions/add_voicemail=false
+permissions/authenticate_accounts=false
+permissions/battery_stats=false
+permissions/bind_accessibility_service=false
+permissions/bind_appwidget=false
+permissions/bind_device_admin=false
+permissions/bind_input_method=false
+permissions/bind_nfc_service=false
+permissions/bind_notification_listener_service=false
+permissions/bind_print_service=false
+permissions/bind_remoteviews=false
+permissions/bind_text_service=false
+permissions/bind_vpn_service=false
+permissions/bind_wallpaper=false
+permissions/bluetooth=false
+permissions/bluetooth_admin=false
+permissions/bluetooth_privileged=false
+permissions/brick=false
+permissions/broadcast_package_removed=false
+permissions/broadcast_sms=false
+permissions/broadcast_sticky=false
+permissions/broadcast_wap_push=false
+permissions/call_phone=false
+permissions/call_privileged=false
+permissions/camera=false
+permissions/capture_audio_output=false
+permissions/capture_secure_video_output=false
+permissions/capture_video_output=false
+permissions/change_component_enabled_state=false
+permissions/change_configuration=false
+permissions/change_network_state=false
+permissions/change_wifi_multicast_state=false
+permissions/change_wifi_state=false
+permissions/clear_app_cache=false
+permissions/clear_app_user_data=false
+permissions/control_location_updates=false
+permissions/delete_cache_files=false
+permissions/delete_packages=false
+permissions/device_power=false
+permissions/diagnostic=false
+permissions/disable_keyguard=false
+permissions/dump=false
+permissions/expand_status_bar=false
+permissions/factory_test=false
+permissions/flashlight=false
+permissions/force_back=false
+permissions/get_accounts=false
+permissions/get_package_size=false
+permissions/get_tasks=false
+permissions/get_top_activity_info=false
+permissions/global_search=false
+permissions/hardware_test=false
+permissions/inject_events=false
+permissions/install_location_provider=false
+permissions/install_packages=false
+permissions/install_shortcut=false
+permissions/internal_system_window=false
+permissions/internet=true
+permissions/kill_background_processes=false
+permissions/location_hardware=false
+permissions/manage_accounts=false
+permissions/manage_app_tokens=false
+permissions/manage_documents=false
+permissions/manage_external_storage=false
+permissions/master_clear=false
+permissions/media_content_control=false
+permissions/modify_audio_settings=false
+permissions/modify_phone_state=false
+permissions/mount_format_filesystems=false
+permissions/mount_unmount_filesystems=false
+permissions/nfc=false
+permissions/persistent_activity=false
+permissions/process_outgoing_calls=false
+permissions/read_calendar=false
+permissions/read_call_log=false
+permissions/read_contacts=false
+permissions/read_external_storage=false
+permissions/read_frame_buffer=false
+permissions/read_history_bookmarks=false
+permissions/read_input_state=false
+permissions/read_logs=false
+permissions/read_phone_state=false
+permissions/read_profile=false
+permissions/read_sms=false
+permissions/read_social_stream=false
+permissions/read_sync_settings=false
+permissions/read_sync_stats=false
+permissions/read_user_dictionary=false
+permissions/reboot=false
+permissions/receive_boot_completed=false
+permissions/receive_mms=false
+permissions/receive_sms=false
+permissions/receive_wap_push=false
+permissions/record_audio=false
+permissions/reorder_tasks=false
+permissions/restart_packages=false
+permissions/send_respond_via_message=false
+permissions/send_sms=false
+permissions/set_activity_watcher=false
+permissions/set_alarm=false
+permissions/set_always_finish=false
+permissions/set_animation_scale=false
+permissions/set_debug_app=false
+permissions/set_orientation=false
+permissions/set_pointer_speed=false
+permissions/set_preferred_applications=false
+permissions/set_process_limit=false
+permissions/set_time=false
+permissions/set_time_zone=false
+permissions/set_wallpaper=false
+permissions/set_wallpaper_hints=false
+permissions/signal_persistent_processes=false
+permissions/status_bar=false
+permissions/subscribed_feeds_read=false
+permissions/subscribed_feeds_write=false
+permissions/system_alert_window=false
+permissions/transmit_ir=false
+permissions/uninstall_shortcut=false
+permissions/update_device_stats=false
+permissions/use_credentials=false
+permissions/use_sip=false
+permissions/vibrate=false
+permissions/wake_lock=false
+permissions/write_apn_settings=false
+permissions/write_calendar=false
+permissions/write_call_log=false
+permissions/write_contacts=false
+permissions/write_external_storage=false
+permissions/write_gservices=false
+permissions/write_history_bookmarks=false
+permissions/write_profile=false
+permissions/write_secure_settings=false
+permissions/write_settings=false
+permissions/write_sms=false
+permissions/write_social_stream=false
+permissions/write_sync_settings=false
+permissions/write_user_dictionary=false
+package/show_in_android_tv=false
+package/show_in_app_library=true
+package/show_as_launcher_app=false