Merge branch 'main' into khook

Author: Vauff

.github/workflows/build.yml

@@ -58,7 +58,11 @@ jobs:
           path: ambuild
 
       - name: Install AMBuild
+        shell: bash
         run: |
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            pip install setuptools
+          fi
           cd ambuild && python setup.py install && cd ..
 
       - name: Install Clang 21

AMBuilder

@@ -72,6 +72,7 @@ for sdk_target in MMSPlugin.sdk_targets:
     'src/buttonwatch.cpp',
     'src/topdefender.cpp',
     'src/idlemanager.cpp',
+    'src/mapmigrations.cpp',
     'sdk/entity2/entitysystem.cpp',
     'sdk/entity2/entityidentity.cpp',
     'sdk/entity2/entitykeyvalues.cpp',
@@ -80,6 +81,7 @@ for sdk_target in MMSPlugin.sdk_targets:
 
   protoc_builder = builder.tools.Protoc(protoc = sdk_target.protoc, sources = [
     os.path.join(sdk['path'], 'common', 'network_connection.proto'),
+    os.path.join(sdk['path'], 'common', 'source2_steam_stats.proto'),
     os.path.join(sdk['path'], 'common', 'netmessages.proto'),
     os.path.join(sdk['path'], 'common', 'networkbasetypes.proto'),
     os.path.join(sdk['path'], 'common', 'engine_gcmessages.proto'),

CS2Fixes.vcxproj

@@ -213,6 +213,7 @@
     <ClCompile Include="src\zombiereborn.cpp" />
     <ClCompile Include="src\entitylistener.cpp" />
     <ClCompile Include="src\leader.cpp" />
+    <ClCompile Include="src\mapmigrations.cpp" />
     <ClCompile Include="sdk\tier1\convar.cpp" />
     <ClCompile Include="src\utils\entity.cpp" />
     <ClCompile Include="src\utils\plat_unix.cpp" />
@@ -291,6 +292,7 @@
     <ClInclude Include="src\zombiereborn.h" />
     <ClInclude Include="src\entitylistener.h" />
     <ClInclude Include="src\leader.h" />
+    <ClCompile Include="src\mapmigrations.h" />
     <ClInclude Include="src\utils\entity.h" />
     <ClInclude Include="src\utils\module.h" />
     <ClInclude Include="src\utils\plat.h" />

CS2Fixes.vcxproj.filters

@@ -200,6 +200,9 @@
     <ClCompile Include="src\topdefender.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\mapmigrations.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\mempatch.h">
@@ -427,5 +430,8 @@
     <ClInclude Include="src\topdefender.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\mapmigrations.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

Dockerfile

@@ -9,7 +9,7 @@ RUN apt update && apt install -y clang-21
 RUN ln -sf /usr/bin/clang-21 /usr/bin/clang && ln -sf /usr/bin/clang++-21 /usr/bin/clang++
 RUN git clone https://github.com/alliedmodders/ambuild
 RUN cd ambuild && python setup.py install && cd ..
-RUN git clone --recurse-submodules -b k/sourcehook_alternative https://github.com/alliedmodders/metamod-source
+RUN git clone --recurse-submodules -b fix-submodule https://github.com/Vauff/metamod-source
 RUN git config --global --add safe.directory /app
 
 COPY ./docker-entrypoint.sh ./

cfg/cs2fixes/cs2fixes.cfg

@@ -162,4 +162,7 @@ entwatch_glow_team				0		// Whether dropped item glow is only visible to the tea
 // Hud settings
 cs2f_fix_hud_flashing			0		// Whether to fix hud flashing using a workaround, this BREAKS warmup so pick one or the other
 cs2f_disable_hud_outside_round	0		// Whether to disable hud messages that would flash when a round is not ongoing, since flashing fix cannot run then
-cs2f_hud_duration_leeway		2		// Extra seconds duration to leave hud messages visible (without priority), reduces transition flashes between different priority messages
+cs2f_hud_duration_leeway		2		// Extra seconds duration to leave hud messages visible (without priority), reduces transition flashes between different priority messages
+
+// Map migrations
+cs2f_mapmigrations_20260121		2		// Current mode for 2026-01-21 CS2 update map migrations. [0 = Force disabled, 1 = Force enabled, 2 = Automatically enabled for maps updated before 2026-01-21 & disabled if updated after]