Merge pull request #1529 from heinezen/release-demos

Converter fixes + Release demos
SFTtech · Oct 1, 2023 · 0061d2f · 0061d2f
2 parents bda929f + 9a33715
commit 0061d2f
Show file tree

Hide file tree

Showing 162 changed files with 3,462 additions and 925 deletions.
diff --git a/.github/workflows/macosx-ci.yml b/.github/workflows/macosx-ci.yml
@@ -55,7 +55,7 @@ jobs:
       - name: Brew install DeJaVu fonts
         run: brew tap homebrew/cask-fonts && brew install font-dejavu
       - name: Remove python's 2to3 link so that 'brew link' does not fail
-        run: rm '/usr/local/bin/2to3'
+        run: rm '/usr/local/bin/2to3' && rm '/usr/local/bin/2to3-3.11'
       - name: Install environment helpers with homebrew
         run: brew install ccache
       - name: Install dependencies with homebrew

diff --git a/assets/test/nyan/pong.nyan b/assets/test/nyan/pong.nyan
@@ -1,3 +1,5 @@
+!version 1
+
 PongGame():
     ball : Ball
     player1 : Player

diff --git a/cfg/converter/games/aoc_demo/version_hashes.toml b/cfg/converter/games/aoc_demo/version_hashes.toml
@@ -0,0 +1,17 @@
+# version hashes of Age of Empires 2: The Conqueror's Demo
+
+file_version = "2.0"
+hash_algo = "SHA3-256"
+
+[age2_x1t]
+paths = ["age2_x1t.exe"]
+
+  [age2_x1t.map]
+  d02ef2f4935c5ef568eaa873442b4b2b547067ed8e3572758bbbbee8 = "1.0c"
+  4568f37f309c0a89fa9e84a0c0f6c61b0f394c28adc82c0b3f2203b3 = "1.0c"
+
+[empires2_x1dat]
+paths = ["Data/empires2_x1.dat"]
+
+  [empires2_x1dat.map]
+  6aab4c7468c3d319ec00f577835dc7799b70ffab1de6bfd25ac227b5 = "1.0c"