Merge branch 'Keriew:master' into master

Keriew · Jan 27, 2025 · da47833 · da47833
2 parents 65ce9ac + 06d7191
commit da47833
Show file tree

Hide file tree

Showing 109 changed files with 17 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
           - name: Linux x64
             os: ubuntu-22.04
             cache-key: linux-x64
-            SDL_VERSION: 2.30.9
+            SDL_VERSION: 2.30.11
             SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: linux
             DEPLOY: linux
@@ -36,17 +36,25 @@ jobs:
             BUILD_TARGET: linux
             DEPLOY: linux
             SKIP_UPLOAD: true
+          - name: Linux arm64
+            os: ubuntu-24.04-arm
+            cache-key: linux-arm64
+            SDL_VERSION: 2.30.11
+            SDL_MIXER_VERSION: 2.8.0
+            BUILD_TARGET: linux
+            DEPLOY: linux
+            SKIP_UPLOAD: true
           - name: macOS
             os: macos-latest
             cache-key: macos
-            SDL_VERSION: 2.30.9
+            SDL_VERSION: 2.30.11
             SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: mac
             DEPLOY: mac
           - name: iOS
             os: macos-latest
             cache-key: ios
-            SDL_VERSION: 2.30.9
+            SDL_VERSION: 2.30.11
             SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: ios
             DEPLOY: ios
@@ -61,7 +69,7 @@ jobs:
           - name: Android
             os: ubuntu-20.04
             cache-key: android
-            SDL_VERSION: 2.30.9
+            SDL_VERSION: 2.30.11
             SDL_MIXER_VERSION: 2.8.0
             BUILD_TARGET: android
             DEPLOY: android
@@ -143,7 +151,7 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: windows-latest
     env:
-      SDL_VERSION: 2.30.9
+      SDL_VERSION: 2.30.11
       SDL_MIXER_VERSION: 2.8.0
       COMPILER: ${{ matrix.COMPILER }}
       SKIP_UPLOAD: ${{ matrix.SKIP_UPLOAD }}

diff --git a/res/assets/Graphics/Terrain_Maps/Native_Decoration_Central_01.png b/res/assets/Graphics/Terrain_Maps/Native_Decoration_Central_01.png
diff --git a/res/assets/Graphics/Terrain_Maps/Native_Decoration_Northern_01.png b/res/assets/Graphics/Terrain_Maps/Native_Decoration_Northern_01.png
diff --git a/res/assets/Graphics/Terrain_Maps/Native_Decoration_Southern_01.png b/res/assets/Graphics/Terrain_Maps/Native_Decoration_Southern_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_01.png b/res/assets/Graphics/Warriors/native_warrior_death_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_02.png b/res/assets/Graphics/Warriors/native_warrior_death_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_03.png b/res/assets/Graphics/Warriors/native_warrior_death_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_04.png b/res/assets/Graphics/Warriors/native_warrior_death_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_05.png b/res/assets/Graphics/Warriors/native_warrior_death_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_06.png b/res/assets/Graphics/Warriors/native_warrior_death_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_death_07.png b/res/assets/Graphics/Warriors/native_warrior_death_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_01.png b/res/assets/Graphics/Warriors/native_warrior_e_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_02.png b/res/assets/Graphics/Warriors/native_warrior_e_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_03.png b/res/assets/Graphics/Warriors/native_warrior_e_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_04.png b/res/assets/Graphics/Warriors/native_warrior_e_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_05.png b/res/assets/Graphics/Warriors/native_warrior_e_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_06.png b/res/assets/Graphics/Warriors/native_warrior_e_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_07.png b/res/assets/Graphics/Warriors/native_warrior_e_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_08.png b/res/assets/Graphics/Warriors/native_warrior_e_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_09.png b/res/assets/Graphics/Warriors/native_warrior_e_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_10.png b/res/assets/Graphics/Warriors/native_warrior_e_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_11.png b/res/assets/Graphics/Warriors/native_warrior_e_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_e_12.png b/res/assets/Graphics/Warriors/native_warrior_e_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_01.png b/res/assets/Graphics/Warriors/native_warrior_n_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_02.png b/res/assets/Graphics/Warriors/native_warrior_n_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_03.png b/res/assets/Graphics/Warriors/native_warrior_n_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_04.png b/res/assets/Graphics/Warriors/native_warrior_n_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_05.png b/res/assets/Graphics/Warriors/native_warrior_n_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_06.png b/res/assets/Graphics/Warriors/native_warrior_n_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_07.png b/res/assets/Graphics/Warriors/native_warrior_n_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_08.png b/res/assets/Graphics/Warriors/native_warrior_n_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_09.png b/res/assets/Graphics/Warriors/native_warrior_n_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_10.png b/res/assets/Graphics/Warriors/native_warrior_n_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_11.png b/res/assets/Graphics/Warriors/native_warrior_n_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_n_12.png b/res/assets/Graphics/Warriors/native_warrior_n_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_01.png b/res/assets/Graphics/Warriors/native_warrior_ne_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_02.png b/res/assets/Graphics/Warriors/native_warrior_ne_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_03.png b/res/assets/Graphics/Warriors/native_warrior_ne_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_04.png b/res/assets/Graphics/Warriors/native_warrior_ne_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_05.png b/res/assets/Graphics/Warriors/native_warrior_ne_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_06.png b/res/assets/Graphics/Warriors/native_warrior_ne_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_07.png b/res/assets/Graphics/Warriors/native_warrior_ne_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_08.png b/res/assets/Graphics/Warriors/native_warrior_ne_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_09.png b/res/assets/Graphics/Warriors/native_warrior_ne_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_10.png b/res/assets/Graphics/Warriors/native_warrior_ne_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_11.png b/res/assets/Graphics/Warriors/native_warrior_ne_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_ne_12.png b/res/assets/Graphics/Warriors/native_warrior_ne_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_01.png b/res/assets/Graphics/Warriors/native_warrior_nw_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_02.png b/res/assets/Graphics/Warriors/native_warrior_nw_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_03.png b/res/assets/Graphics/Warriors/native_warrior_nw_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_04.png b/res/assets/Graphics/Warriors/native_warrior_nw_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_05.png b/res/assets/Graphics/Warriors/native_warrior_nw_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_06.png b/res/assets/Graphics/Warriors/native_warrior_nw_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_07.png b/res/assets/Graphics/Warriors/native_warrior_nw_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_08.png b/res/assets/Graphics/Warriors/native_warrior_nw_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_09.png b/res/assets/Graphics/Warriors/native_warrior_nw_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_10.png b/res/assets/Graphics/Warriors/native_warrior_nw_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_11.png b/res/assets/Graphics/Warriors/native_warrior_nw_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_nw_12.png b/res/assets/Graphics/Warriors/native_warrior_nw_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_portrait.png b/res/assets/Graphics/Warriors/native_warrior_portrait.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_01.png b/res/assets/Graphics/Warriors/native_warrior_s_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_02.png b/res/assets/Graphics/Warriors/native_warrior_s_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_03.png b/res/assets/Graphics/Warriors/native_warrior_s_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_04.png b/res/assets/Graphics/Warriors/native_warrior_s_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_05.png b/res/assets/Graphics/Warriors/native_warrior_s_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_06.png b/res/assets/Graphics/Warriors/native_warrior_s_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_07.png b/res/assets/Graphics/Warriors/native_warrior_s_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_08.png b/res/assets/Graphics/Warriors/native_warrior_s_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_09.png b/res/assets/Graphics/Warriors/native_warrior_s_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_10.png b/res/assets/Graphics/Warriors/native_warrior_s_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_11.png b/res/assets/Graphics/Warriors/native_warrior_s_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_s_12.png b/res/assets/Graphics/Warriors/native_warrior_s_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_01.png b/res/assets/Graphics/Warriors/native_warrior_se_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_02.png b/res/assets/Graphics/Warriors/native_warrior_se_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_03.png b/res/assets/Graphics/Warriors/native_warrior_se_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_04.png b/res/assets/Graphics/Warriors/native_warrior_se_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_05.png b/res/assets/Graphics/Warriors/native_warrior_se_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_06.png b/res/assets/Graphics/Warriors/native_warrior_se_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_07.png b/res/assets/Graphics/Warriors/native_warrior_se_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_08.png b/res/assets/Graphics/Warriors/native_warrior_se_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_09.png b/res/assets/Graphics/Warriors/native_warrior_se_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_10.png b/res/assets/Graphics/Warriors/native_warrior_se_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_11.png b/res/assets/Graphics/Warriors/native_warrior_se_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_se_12.png b/res/assets/Graphics/Warriors/native_warrior_se_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_01.png b/res/assets/Graphics/Warriors/native_warrior_sw_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_02.png b/res/assets/Graphics/Warriors/native_warrior_sw_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_03.png b/res/assets/Graphics/Warriors/native_warrior_sw_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_04.png b/res/assets/Graphics/Warriors/native_warrior_sw_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_05.png b/res/assets/Graphics/Warriors/native_warrior_sw_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_06.png b/res/assets/Graphics/Warriors/native_warrior_sw_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_07.png b/res/assets/Graphics/Warriors/native_warrior_sw_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_08.png b/res/assets/Graphics/Warriors/native_warrior_sw_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_09.png b/res/assets/Graphics/Warriors/native_warrior_sw_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_10.png b/res/assets/Graphics/Warriors/native_warrior_sw_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_11.png b/res/assets/Graphics/Warriors/native_warrior_sw_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_sw_12.png b/res/assets/Graphics/Warriors/native_warrior_sw_12.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_01.png b/res/assets/Graphics/Warriors/native_warrior_w_01.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_02.png b/res/assets/Graphics/Warriors/native_warrior_w_02.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_03.png b/res/assets/Graphics/Warriors/native_warrior_w_03.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_04.png b/res/assets/Graphics/Warriors/native_warrior_w_04.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_05.png b/res/assets/Graphics/Warriors/native_warrior_w_05.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_06.png b/res/assets/Graphics/Warriors/native_warrior_w_06.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_07.png b/res/assets/Graphics/Warriors/native_warrior_w_07.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_08.png b/res/assets/Graphics/Warriors/native_warrior_w_08.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_09.png b/res/assets/Graphics/Warriors/native_warrior_w_09.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_10.png b/res/assets/Graphics/Warriors/native_warrior_w_10.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_11.png b/res/assets/Graphics/Warriors/native_warrior_w_11.png
diff --git a/res/assets/Graphics/Warriors/native_warrior_w_12.png b/res/assets/Graphics/Warriors/native_warrior_w_12.png
diff --git a/res/assets/Graphics/terrain_maps.xml b/res/assets/Graphics/terrain_maps.xml
@@ -36,4 +36,8 @@
 	<image id="Native_Watchtower_Central_01" src="Native_Watchtower_Central_01" isometric="true"/>
 	<image id="Native_Watchtower_Northern_01" src="Native_Watchtower_Northern_01" isometric="true"/>
 	<image id="Native_Watchtower_Southern_01" src="Native_Watchtower_Southern_01" isometric="true"/>
+	<!-- Note: Small Native Decorations -->
+	<image id="Native_Decoration_Central_01" src="Native_Decoration_Central_01" isometric="true"/>
+	<image id="Native_Decoration_Northern_01" src="Native_Decoration_Northern_01" isometric="true"/>
+	<image id="Native_Decoration_Southern_01" src="Native_Decoration_Southern_01" isometric="true"/>
 </assetlist>