Merge branch 'main' into patch-4

.github/workflows/build.yml

@@ -2,8 +2,8 @@ name: Build
 
 on:
   push:
-    branches-ignore:
-      - main
+#    branches-ignore:
+#      - main
     paths-ignore:
       - '*.json'
       - '*.md'
@@ -18,7 +18,7 @@ env:
 jobs:
   build-linux:
     name: Build Linux (${{matrix.name}} x86_64)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     env:
       BUILDCACHE_DIR: ${{github.workspace}}/.buildcache
@@ -46,10 +46,8 @@ jobs:
           sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
           sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \
             zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
-            libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default
-
-          yarn global add @sentry/cli
-          echo "$(yarn global bin)" >> $GITHUB_PATH
+            libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev libfreetype-dev \
+            libxinerama-dev libxcursor-dev python3-markupsafe libgtk-3-dev
 
           # setup buildcache
           curl -LSfs https://github.com/encounter/buildcache/releases/download/$BUILDCACHE_VERSION/buildcache-linux.tar.gz | tar xz -C "$RUNNER_WORKSPACE"
@@ -84,12 +82,22 @@ jobs:
       - name: Print buildcache stats
         run: buildcache -s
 
+      - name: Generate AppImage
+        run: ci/build-appimage.sh
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: metaforce-${{env.METAFORCE_VERSION}}-linux-${{matrix.preset}}-x86_64
+          path: |
+            build/install/Metaforce-*.AppImage
+            build/install/debug.tar.*
+
   build-macos:
     name: Build macOS (AppleClang universal)
-    runs-on: macos-11
+    runs-on: macos-latest
 
     env:
-      Qt_VERSION: 5.15.2
       IPP_VERSION: 2021.2.0.192
       BUILDCACHE_DIR: ${{github.workspace}}/.buildcache
 
@@ -105,11 +113,7 @@ jobs:
           brew upgrade --formula
           brew install ninja graphicsmagick imagemagick
           yarn global add create-dmg
-
-          # universal qt5 from macports
-          curl -LSfs https://axiodl.com/files/qt-$Qt_VERSION.mpkg -o /tmp/qt-$Qt_VERSION.mpkg
-          sudo installer -pkg /tmp/qt-$Qt_VERSION.mpkg -target /
-          echo /opt/local/libexec/qt5/bin >> $GITHUB_PATH
+          pip3 install markupsafe
 
           # setup buildcache
           curl -LSfs https://github.com/encounter/buildcache/releases/download/$BUILDCACHE_VERSION/buildcache-macos.zip -o /tmp/buildcache-macos.zip
@@ -141,11 +145,103 @@ jobs:
         run: cmake --build --preset x-macos-ci
 
       - name: Print buildcache stats
+        if: 'false' # temporarily disabled
         run: buildcache -s
 
+      - name: Import signing certificate
+        uses: devbotsxyz/xcode-import-certificate@master
+        with:
+          certificate-data: ${{secrets.MACOS_CERTIFICATE_DATA}}
+          certificate-passphrase: ${{secrets.MACOS_CERTIFICATE_PASSWORD}}
+          keychain-password: ${{secrets.MACOS_KEYCHAIN_PASSWORD}}
+
+      - name: Deploy & codesign application
+        env:
+          ASC_USERNAME: ${{secrets.MACOS_ASC_USERNAME}}
+          ASC_PASSWORD: ${{secrets.MACOS_ASC_PASSWORD}}
+          ASC_TEAM_ID: ${{secrets.MACOS_ASC_TEAM_ID}}
+          CODESIGN_IDENT: ${{secrets.MACOS_CODESIGN_IDENT}}
+        run: ci/build-dmg.sh
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: metaforce-${{env.METAFORCE_VERSION}}-macos-appleclang-universal
+          path: |
+            build/install/Metaforce *.dmg
+            build/install/debug.tar.*
+
+  build-ios:
+    name: Build iOS (AppleClang arm64)
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew upgrade --formula
+          brew install ninja
+          pip3 install markupsafe
+
+      - name: Configure CMake
+        run: cmake --preset ios-default
+
+      - name: Build
+        run: cmake --build --preset ios-default --target install
+
+      - name: Generate IPA
+        run: ci/build-ipa.sh
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: metaforce-${{env.METAFORCE_VERSION}}-ios-appleclang-arm64
+          path: |
+            build/install/Metaforce.ipa
+            build/install/debug.tar.*
+
+  build-tvos:
+    name: Build tvOS (AppleClang arm64)
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          brew update
+          brew upgrade --formula
+          brew install ninja
+          pip3 install markupsafe
+
+      - name: Configure CMake
+        run: cmake --preset tvos-default
+
+      - name: Build
+        run: cmake --build --preset tvos-default --target install
+
+      - name: Generate IPA
+        run: ci/build-ipa.sh
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: metaforce-${{env.METAFORCE_VERSION}}-tvos-appleclang-arm64
+          path: |
+            build/install/Metaforce.ipa
+            build/install/debug.tar.*
+
   build-windows:
     name: Build Windows (${{matrix.name}} x86_64)
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     env:
       Qt_VERSION: 5.15.2
@@ -158,11 +254,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Disabled due to memory constraints
-#          - name: MSVC
-#            preset: msvc
-          - name: Clang
-            preset: clang
+          - name: MSVC
+            preset: msvc
+          #- name: Clang
+          #  preset: clang
 
     steps:
       - uses: actions/checkout@v2
@@ -191,6 +286,7 @@ jobs:
       - name: Install dependencies
         run: |
           choco install ninja vulkan-sdk
+          pip install markupsafe
 
           # set up buildcache
           $TempDir = "$env:RUNNER_WORKSPACE\temp"
@@ -221,3 +317,11 @@ jobs:
 
       - name: Print buildcache stats
         run: buildcache -s
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: metaforce-${{env.METAFORCE_VERSION}}-win32-${{matrix.preset}}-x86_64
+          path: |
+            ${{env.BUILD_DIR}}/install/*.exe
+            ${{env.BUILD_DIR}}/install/debug.7z

.github/workflows/release.yml

@@ -1,13 +1,14 @@
 name: Release
 
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '*.json'
-      - '*.md'
-      - '*LICENSE'
+on: workflow_dispatch
+#on:
+#  push:
+#    branches:
+#      - main
+#    paths-ignore:
+#      - '*.json'
+#      - '*.md'
+#      - '*LICENSE'
 
 env:
   BUILDCACHE_VERSION: v0.27.3
@@ -46,7 +47,7 @@ jobs:
           sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main"
           sudo apt-get -y install ninja-build clang lld libcurl4-openssl-dev intel-oneapi-ipp-devel \
             zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
-            libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default
+            libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev qt5-default libfreetype-dev
 
           yarn global add @sentry/cli
           echo "$(yarn global bin)" >> $GITHUB_PATH
@@ -121,7 +122,7 @@ jobs:
         run: |
           brew update
           brew upgrade --formula
-          brew install ninja graphicsmagick imagemagick getsentry/tools/sentry-cli
+          brew install ninja graphicsmagick imagemagick getsentry/tools/sentry-cli freetype
           yarn global add create-dmg
 
           # universal qt5 from macports

.gitmodules

@@ -1,59 +1,48 @@
-[submodule "nod"]
+[submodule "extern/nod"]
 	path = extern/nod
 	url = ../nod.git
 	branch = master
-[submodule "amuse"]
-	path = extern/amuse
-	url = ../amuse.git
-	branch = master
-[submodule "kabufuda"]
+[submodule "extern/kabufuda"]
 	path = extern/kabufuda
 	url = ../kabufuda.git
 	branch = master
-[submodule "jbus"]
+[submodule "extern/jbus"]
 	path = extern/jbus
 	url = ../jbus.git
 	branch = master
-[submodule "assetnameparser/tinyxml2"]
-	path = extern/tinyxml2
-	url = ../tinyxml2.git
-	branch = master
-[submodule "sanitizers-cmake"]
-	path = extern/sanitizers-cmake
-	url = https://github.com/arsenm/sanitizers-cmake.git
-	branch = master
-[submodule "discord-rpc"]
+[submodule "extern/discord-rpc"]
 	path = extern/discord-rpc
 	url = https://github.com/discordapp/discord-rpc.git
 	branch = master
-[submodule "rapidjson"]
+[submodule "extern/rapidjson"]
 	path = extern/rapidjson
 	url = https://github.com/Tencent/rapidjson.git
 	branch = master
-[submodule "NESEmulator/fixNES"]
+[submodule "extern/fixNES"]
 	path = extern/fixNES
 	url = https://github.com/FIX94/fixNES.git
 	branch = master
-[submodule "extern/libSquish"]
-	path = extern/libSquish
-	url = ../libSquish.git
-	branch = master
 [submodule "extern/athena"]
 	path = extern/athena
 	url = ../../libAthena/athena.git
 	branch = master
-[submodule "extern/boo"]
-	path = extern/boo
-	url = ../boo.git
-	branch = master
 [submodule "extern/libjpeg-turbo"]
 	path = extern/libjpeg-turbo
 	url = ../libjpeg-turbo.git
 	branch = thp
-[submodule "zeus"]
+[submodule "extern/zeus"]
 	path = extern/zeus
 	url = ../zeus.git
 	branch = master
-[submodule "extern/imgui"]
-	path = extern/imgui
-	url = https://github.com/ocornut/imgui.git
+[submodule "extern/nativefiledialog-extended"]
+	path = extern/nativefiledialog-extended
+	url = https://github.com/encounter/nativefiledialog-extended.git
+	branch = nfd-install-option
+[submodule "extern/optick"]
+	path = extern/optick
+	url = https://github.com/AxioDL/optick.git
+	branch = master
+[submodule "extern/aurora"]
+	path = extern/aurora
+	url = https://github.com/encounter/aurora.git
+	branch = main