Skip to content

2025-11-12 CS2 update fixes & misc dev #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tilgep merged 11 commits into from
Nov 14, 2025
Merged

2025-11-12 CS2 update fixes & misc dev #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fcb7521
remove setparent sig call
Kxnrl Nov 6, 2025
3ab5e32
Fix BotNavIgnore patch causing game crashes while map isn't loaded
Vauff Nov 9, 2025
f5a6859
Fix plugin unload crashing while map isn't loaded
Vauff Nov 9, 2025
6539f83
Fixed Hook_ClientDisconnect calling ZR functions when not enabled (#404)
JayCroghan Nov 9, 2025
98e3b7a
Fix a regression with subtick viewangles jump behaviour
Vauff Nov 9, 2025
3da5f98
Update protobufs to fix silenced stopsound
Vauff Nov 12, 2025
a66560e
Update gamedata for 2025-11-12 CS2 update
Vauff Nov 12, 2025
b9026eb
Update protobufs to fix silenced stopsound (again)
Vauff Nov 12, 2025
853e8e2
Update CheckMovingGround offset for 2025-11-12 CS2 update
Vauff Nov 13, 2025
6751ea4
Stop using our .protos in ambuild
xen-000 Nov 13, 2025
74dd273
Update VS solution to use AMBuild protobufs to avoid duplication
Vauff Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions AMBuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,14 @@ for sdk_target in MMSPlugin.sdk_targets:
os.path.join(sdk['path'], 'game', 'shared', 'te.proto'),
os.path.join(sdk['path'], 'game', 'shared', 'usercmd.proto'),
os.path.join(sdk['path'], 'game', 'shared', 'usermessages.proto'),
os.path.join(builder.sourcePath, 'protobuf', 'cs_gameevents.proto'),
os.path.join(builder.sourcePath, 'protobuf', 'cs_usercmd.proto'),
os.path.join(builder.sourcePath, 'protobuf', 'cstrike15_gcmessages.proto'),
os.path.join(builder.sourcePath, 'protobuf', 'cstrike15_usermessages.proto'),
os.path.join(builder.sourcePath, 'protobuf', 'networksystem_protomessages.proto'),
os.path.join(sdk['path'], 'game', 'shared', 'cs', 'cs_gameevents.proto'),
os.path.join(sdk['path'], 'game', 'shared', 'cs', 'cs_usercmd.proto'),
os.path.join(sdk['path'], 'game', 'shared', 'cstrike15', 'cstrike15_gcmessages.proto'),
os.path.join(sdk['path'], 'game', 'shared', 'cstrike15', 'cstrike15_usermessages.proto'),
os.path.join(sdk['path'], 'networksystem', 'networksystem_protomessages.proto'),
])
protoc_builder.protoc.includes += [
os.path.join(sdk['path'], 'gcsdk'),
os.path.join(sdk['path'], 'common'),
os.path.join(sdk['path'], 'game', 'shared'),
os.path.join(builder.sourcePath, 'protobuf'),
]

binary.custom = [protoc_builder]
Expand Down
26 changes: 13 additions & 13 deletions CS2Fixes.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp20</LanguageStandard>
<AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>build/cs2fixes.cs2/windows-x86_64;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand All @@ -150,7 +150,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp20</LanguageStandard>
<AdditionalIncludeDirectories>protobuf/generated;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>build/cs2fixes.cs2/windows-x86_64;src/utils;src/cs2_sdk;sdk/public;sdk/public/tier0;sdk/game/shared;sdk/game/server;sdk/public/tier1;sdk/public/mathlib;minhook/include;$(MMSOURCE112)/core;$(MMSOURCE112)/core/sourcehook;$(MMSOURCE_DEV)/core;$(MMSOURCE_DEV)/core/sourcehook;vendor/subhook;vendor/funchook/include;sdk/public/entity2;sdk/public/game/server;sdk/thirdparty/protobuf-3.21.8/src;$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<UndefinePreprocessorDefinitions>%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand All @@ -169,17 +169,17 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\buttonwatch.cpp" />
<ClCompile Include="protobuf\generated\cs_usercmd.pb.cc" />
<ClCompile Include="protobuf\generated\networkbasetypes.pb.cc" />
<ClCompile Include="protobuf\generated\network_connection.pb.cc" />
<ClCompile Include="protobuf\generated\usercmd.pb.cc" />
<ClCompile Include="protobuf\generated\usermessages.pb.cc" />
<ClCompile Include="protobuf\generated\cstrike15_gcmessages.pb.cc" />
<ClCompile Include="protobuf\generated\cstrike15_usermessages.pb.cc" />
<ClCompile Include="protobuf\generated\gcsdk_gcmessages.pb.cc" />
<ClCompile Include="protobuf\generated\engine_gcmessages.pb.cc" />
<ClCompile Include="protobuf\generated\netmessages.pb.cc" />
<ClCompile Include="protobuf\generated\steammessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cs_usercmd.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\networkbasetypes.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\network_connection.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usercmd.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usermessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_gcmessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_usermessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\gcsdk_gcmessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\engine_gcmessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\netmessages.pb.cc" />
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\steammessages.pb.cc" />
<ClCompile Include="sdk\entity2\entityidentity.cpp" />
<ClCompile Include="sdk\entity2\entitykeyvalues.cpp" />
<ClCompile Include="sdk\entity2\entitysystem.cpp" />
Expand Down
22 changes: 11 additions & 11 deletions CS2Fixes.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,37 +137,37 @@
<ClCompile Include="src\panoramavote.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\usermessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usermessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\cs_usercmd.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cs_usercmd.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\cstrike15_gcmessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_gcmessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\cstrike15_usermessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\cstrike15_usermessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\engine_gcmessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\engine_gcmessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\gcsdk_gcmessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\gcsdk_gcmessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\netmessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\netmessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\network_connection.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\network_connection.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\networkbasetypes.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\networkbasetypes.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\steammessages.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\steammessages.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="protobuf\generated\usercmd.pb.cc">
<ClCompile Include="build\cs2fixes.cs2\windows-x86_64\usercmd.pb.cc">
<Filter>Source Files\protobuf</Filter>
</ClCompile>
<ClCompile Include="sdk\public\tier0\memoverride.cpp">
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ambuild

#### Windows

Make sure to run in "x64 Native Tools Command Prompt for VS"
Make sure to run in "x64 Native Tools Command Prompt for VS". Doing an initial build here is also required to setup the protobuf headers for Visual Studio to reference.

```bash
set MMSOURCE_DEV=\path\to\metamod
Expand Down
13 changes: 3 additions & 10 deletions gamedata/cs2fixes.games.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,6 @@
"windows" "\x48\x89\x5C\x24\x2A\x48\x89\x74\x24\x2A\x48\x89\x7C\x24\x2A\x55\x48\x8B\xEC\x48\x81\xEC\x2A\x2A\x2A\x2A\x33\xC0"
"linux" "\x48\xB8\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x55\x0F\x28\xD0"
}
// Called right after this in windows "Entity %s(%s) is ambiguously parented to..."
"CBaseEntity_SetParent"
{
"library" "server"
"windows" "\x4D\x8B\xD9\x48\x85\xD2\x74\x2A"
"linux" "\x48\x85\xF6\x74\x2A\x48\x8B\x47\x10\xF6\x40\x31\x02\x75\x2A\x48\x8B\x46\x10\xF6\x40\x31\x02\x75\x2A\xB8\x2A\x2A\x2A\x2A"
}
// "ParticleEffect", found in a function with 9 arguments
"DispatchParticleEffect"
{
Expand Down Expand Up @@ -353,7 +346,7 @@
{
"library" "server"
"windows" "\x41\x54\x48\x81\xEC\x2A\x2A\x2A\x2A\xBA\x2A\x2A\x2A\x2A\x48\x8D\x0D\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x48\x85\xC0"
"linux" "\x55\x48\x8D\x3D\x2A\x2A\x2A\x2A\xBE\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x81\xEC\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x48\x85\xC0\x0F\x84\x2A\x2A\x2A\x2A\x8B\x10"
"linux" "\x55\x48\x8D\x3D\x2A\x2A\x2A\x2A\xBE\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC"
}
// Location to CUtlMap unk that is referenced on Windows by function with "Notification about user penalty: %u/%u (%u sec)\n" string
// On Linux, a qword appears twice in GameSystem_Think_CheckSteamBan, and thrice in a sub-function of the function used for Windows (1 top, 2 bottom), the only other reference to this qword is some convar registration function with two unks above, sm_mapGcBanInformation is the unk further away
Expand Down Expand Up @@ -512,8 +505,8 @@
// There's no easy way to find this, but it's a function that checks entity flags (0x370) and ends by calling RemoveFlag with 0x800000 (FL_BASEVELOCITY)
"CCSPlayer_MovementServices::CheckMovingGround"
{
"windows" "36"
"linux" "37"
"windows" "37"
"linux" "38"
}
"CCSPlayer_WeaponServices::DropWeapon"
{
Expand Down
Loading