Merge branch 'develop'

auroramod · Dec 21, 2023 · a40cd64 · a40cd64
2 parents 962ca7b + d489a20
commit a40cd64
Show file tree

Hide file tree

Showing 139 changed files with 15,133 additions and 13,149 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,9 @@ on:
     branches:
       - "*"
     types: [opened, synchronize, reopened]
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: false
 jobs:
   build:
     name: Build binaries
@@ -18,17 +21,6 @@ jobs:
           - Debug
           - Release
     steps:
-      - name: Wait for previous workflows
-        if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')
-        uses: softprops/turnstyle@v1
-        with:
-          poll-interval-seconds: 10
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up git config
-        run: git config --global url."https://".insteadOf git://
-
       - name: Check out files
         uses: actions/checkout@v3
         with:
@@ -38,10 +30,9 @@ jobs:
           lfs: false
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.1.3
 
       - name: Generate project files
-        #run: tools/premake5 vs2022 --ci-build
         run: tools/premake5 vs2022
 
       - name: Set up problem matching
@@ -51,15 +42,15 @@ jobs:
         run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=x64 build/h1-mod.sln
 
       - name: Upload ${{matrix.configuration}} binaries
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: ${{matrix.configuration}} binaries
           path: |
             build/bin/x64/${{matrix.configuration}}/h1-mod.exe
             build/bin/x64/${{matrix.configuration}}/h1-mod.pdb
             
       - name: Upload ${{matrix.configuration}} data artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: ${{matrix.configuration}} data artifacts
           path: |
@@ -79,12 +70,12 @@ jobs:
         run: echo "H1_MOD_MASTER_PATH=${{ secrets.H1_MOD_MASTER_SSH_PATH_DEV }}" >> $GITHUB_ENV
 
       - name: Download Release binaries
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: Release binaries
 
       - name: Download Release data artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: Release data artifacts
           path: data
@@ -98,13 +89,6 @@ jobs:
       - name: Add known hosts
         run: ssh-keyscan -H ${{ secrets.H1_MOD_MASTER_SSH_ADDRESS }} >> ~/.ssh/known_hosts
 
-      - name: Wait for previous workflows
-        uses: softprops/turnstyle@v1
-        with:
-          poll-interval-seconds: 10
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Remove old data files
         run: ssh ${{ secrets.H1_MOD_MASTER_SSH_USER }}@${{ secrets.H1_MOD_MASTER_SSH_ADDRESS }} rm -rf ${{ env.H1_MOD_MASTER_PATH }}/h1-mod/*
 

diff --git a/.gitmodules b/.gitmodules
@@ -12,7 +12,7 @@
 	url = https://github.com/TsudaKageyu/minhook.git
 [submodule "deps/discord-rpc"]
 	path = deps/discord-rpc
-	url = https://github.com/discord/discord-rpc.git
+	url = https://github.com/fedddddd/discord-rpc.git
 [submodule "deps/asmjit"]
 	path = deps/asmjit
 	url = https://github.com/asmjit/asmjit.git
@@ -50,7 +50,7 @@
 [submodule "deps/gsc-tool"]
 	path = deps/gsc-tool
 	url = https://github.com/xensik/gsc-tool.git
-	branch = xlabs
+	branch = dev
 [submodule "deps/stb"]
 	path = deps/stb
 	url = https://github.com/nothings/stb.git
diff --git a/README.md b/README.md
@@ -10,9 +10,7 @@
   <img src="assets/github/banner.png?raw=true" />
 </p>
 
-A client for Call of Duty: Modern Warfare Remastered.
-
-[This project is based on S1x.](https://github.com/XLabsProject/s1x-client)
+NOTE: You must legally own Call of Duty®: Modern Warfare Remastered to run this mod. Cracked/Pirated versions of the game are **NOT** supported.
 
 ## Compile from source
 
@@ -27,13 +25,11 @@ A client for Call of Duty: Modern Warfare Remastered.
 | `--copy-to=PATH`            | Optional, copy the EXE to a custom folder after build, define the path here if wanted. |
 | `--dev-build`               | Enable development builds of the client. |
 
-## Credits:
+## Credits
 
-- [XLabsProject](https://github.com/XLabsProject) - codebase and iw6x/s1x research
-- [quaK](https://github.com/Joelrau) - lots of insight and help
-- [fed](https://github.com/fedddddd) - fixed DW/networking, work from [h2-mod](https://github.com/fedddddd/h2-mod)
-- [Skull](https://github.com/skkuull) + [mjkzy](https://github.com/mjkzy) - porting code from s1x
-- [momo5502](https://github.com/momo5502) - Arxan/Steam research, developer of XLabsProject :D
+- [S1x](https://github.com/XLabsProject/s1x-client) - codebase and research (predecessor of MWR)
+- [h2-mod](https://github.com/fedddddd/h2-mod) - research (successor of MWR)
+- [momo5502](https://github.com/momo5502) - Arxan/Steam research, developer of [XLabsProject](https://github.com/XLabsProject)
 
 ## Disclaimer
 

diff --git a/data/cdata/scripts/mp/classes.gsc b/data/cdata/scripts/mp/classes.gsc
@@ -0,0 +1,34 @@
+main()
+{
+    replacefunc(maps\mp\gametypes\_menus::getclasschoice, ::getclasschoice);
+}
+
+getclasschoice(choice)
+{
+    if (choice <= 100)
+    {
+        if (getdvar("sv_disableCustomClasses") == "1") 
+        {
+            return "class0";
+        }
+
+        choice = "custom" + choice;
+    }
+    else if (choice <= 200)
+    {
+        choice -= 101;
+        choice = "class" + choice;
+    }
+    else if ( choice <= 206 )
+    {
+        choice -= 200;
+        choice = "axis_recipe" + choice;
+    }
+    else
+    {
+        choice -= 206;
+        choice = "allies_recipe" + choice;
+    }
+
+    return choice;
+}