2000764 | 34 files | M DumpSource2/.stringsignore, M DumpSource2/convars.txt, M DumpSource2/schemas/server/CSAdditionalPerRoundStats_t.h, M Protobufs/cstrike15_gcmessages.proto, M game/bin/built_from_cl.txt, M game/bin/win64/engine2_strings.txt, M game/bin/win64/rendersystemvulkan_strings.txt, M game/bin/win64/tools/cs2_item_editor_strings.txt, M game/csgo/bin/win64/client_strings.txt, M game/csgo/bin/win64/server_strings.txt, M game/csgo/cfg/gamemode_casual.cfg, M game/csgo/cfg/gamemode_competitive.cfg, M game/csgo/cfg/gamemode_competitive_tmm.cfg, M game/csgo/cfg/gamemode_retakecasual.cfg, M game/csgo/pak01_dir.txt, A game/csgo/pak01_dir/annotations/official/de_ancient/de_ancient.txt, A game/csgo/pak01_dir/annotations/official/de_anubis/de_anubis.txt, A game/csgo/pak01_dir/annotations/official/de_dust2/de_dust2.txt, A game/csgo/pak01_dir/annotations/official/de_inferno/de_inferno.txt, A game/csgo/pak01_dir/annotations/official/de_mirage/de_mirage.txt, A game/csgo/pak01_dir/annotations/official/de_nuke/de_nuke.txt, A game/csgo/p

https://steamdb.info/patchnotes/22405124/

Author: github-actions[bot]

DumpSource2/.stringsignore

@@ -600,7 +600,6 @@ Adjusts bone transforms so that physics joints don't appear violated (limits)
 Adjusts bone transforms so that physics joints don't appear violated (orientation)
 Adjusts bone transforms so that physics joints don't appear violated (translation)
 Advanced
-Advertise joinable game in progress to Steam friends, otherwise need a Steam invite (2: all servers, 1: official servers, 0: none)
 After a competitive match finishes rematch voting extra time is given for rankings.
 After hitting throttling limits for streamout, allow it to continue up to this number of milliseconds.
 After this many seconds of being basically stationary, the ragdoll will go to sleep.
@@ -4638,7 +4637,7 @@ DOOR_CLOSED
 DOOR_CLOSING
 DOOR_OPEN
 DOOR_OPENING
-DOOR_ROTATING_OPEN_BOT
+DOOR_ROT
 DOOR_SPAWN_AJAR
 DOOR_SPAWN_CLOSED
 DOOR_SPAWN_OPEN_BACK
@@ -6342,6 +6341,7 @@ Half Blend Add
 Handle Settings
 HandshakeTagState_t
 HandshakeTagType_t
+Hard limit on maximum number of rounds (per half) that annotations can be seen in a live match
 HardCancel
 Harmonics
 HaticsType_Default
@@ -13597,7 +13597,6 @@ cl_ironsight_min_channel_color
 cl_ironsight_usecrosshaircolor
 cl_itemimages_dynamically_generated
 cl_jitter_bad_threshold_up
-cl_join_advertise
 cl_lagcompensation_test_auto_target
 cl_lagcompensation_test_target
 cl_language
@@ -25211,6 +25210,7 @@ m_step
 m_stillTimer
 m_stopTime
 m_strAlias
+m_strAnnotationsWorkshopId
 m_strAttachmentName
 m_strAttrName
 m_strAttrNameForVar
@@ -29309,6 +29309,7 @@ sv_allow_switching_weapon_handedness
 sv_allow_votes
 sv_alltalk
 sv_annotation_give_weapon
+sv_annotation_limits_max_rounds_per_half
 sv_annotation_remove_weapon
 sv_auto_adjust_bot_difficulty
 sv_auto_cstrafe_attempt_window

DumpSource2/convars.txt

@@ -1531,9 +1531,6 @@ cl_itemimages_dynamically_generated 2 (clientdll archive release)
 cl_jitter_bad_threshold_up 20 (min: 1, max: 100, userinfo)
 	When upstream packet jitter in a frame exceeds this threshold (ms), the frame is considered to have 'irregular delivery'.  This is a derived value and should not be modified manually
 
-cl_join_advertise 1 (clientdll archive)
-	Advertise joinable game in progress to Steam friends, otherwise need a Steam invite (2: all servers, 1: official servers, 0: none)
-
 cl_lagcompensation_test_auto_target false (developmentonly clientdll)
 	Auto-pick value of cl_lagcompensation_test_target.
 
@@ -9528,6 +9525,9 @@ sv_allow_votes true (gamedll release commandline_enforced)
 sv_alltalk false (gamedll notify release commandline_enforced)
 	Players can hear all other players' voice communication, no team restrictions
 
+sv_annotation_limits_max_rounds_per_half 5 (min: -1, gamedll clientdll replicated release)
+	Hard limit on maximum number of rounds (per half) that annotations can be seen in a live match
+
 sv_auto_adjust_bot_difficulty true (gamedll release commandline_enforced)
 	Adjust the difficulty of bots each round based on contribution score.
 

DumpSource2/schemas/server/CSAdditionalPerRoundStats_t.h

@@ -11,4 +11,5 @@ class CSAdditionalPerRoundStats_t
 	int32 m_nDefuseStarts;
 	int32 m_nHostagePickUps;
 	int32 m_numTeammatesFlashed;
+	CUtlString m_strAnnotationsWorkshopId;
 };

Protobufs/cstrike15_gcmessages.proto

@@ -752,6 +752,7 @@ message CMsgGCCStrike15_v2_ClientRequestJoinFriendData {
 	optional uint32 join_ipp = 4;
 	optional .CMsgGCCStrike15_v2_MatchmakingGC2ClientReserve res = 5;
 	optional string errormsg = 6;
+	optional bool is_local_server = 7;
 }
 
 message CMsgGCCStrike15_v2_ClientRequestJoinServerData {

game/bin/built_from_cl.txt

@@ -1 +1 @@
-10527011
+10533742

game/bin/win64/engine2_strings.txt

@@ -3122,6 +3122,7 @@ $tI(knN
 ?WriteZeroed@CCircularBuffer@@QEAAHH@Z
 ?ati_compress_wrapper.dll
 ?f`Y4
+?hCW
 ?qBJ
 ?rAj
 ?rJRTS\Rg>`H`CeIkHq7v4}4v4u7

game/bin/win64/rendersystemvulkan_strings.txt

@@ -162,10 +162,11 @@
 ( result == VK_SUCCESS )
 (%s): ADD %s = %s\n
 (%s): Setting %s to %s\n
-(92Z
-(93Z
+(90Z
+(A1Z
 (On the line reading %s):\n
-(i0Z
+(Y2Z
+(Y3Z
 *** CVfx::StartupSanityCheck(7060): Programmer Error! The order of VfxVariableSourceType_t does not match s_shaderVariableSource!\n
 *** Error masking unused parts! Equal sign not found after token "%s"! (line %d)\n
 *** IL "%s": Unable to create input layout; layout has %d fields, which is more than %d!\n
@@ -428,28 +429,27 @@
 .vfx_
 .vpk:
 .wN\f9
+00g(
 0123456789)"
 0123456789-
 0123456789ABCDEFabcdef-+Xx
 0123456789ABCDEFabcdef-+XxPp
-0h3,
-0pc(
+0Hd(
 0x%x
 1:1: Tokens : ( T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | BOOLLITERAL | ID | INTEGERLITERAL | HEXINTEGERLITERAL | FLOATLITERAL | COMMENT | WS );
 2\f%24
 2\fu24*
 2\nP!E
-2\vph3,
+2\vp0g(
+2\vpHd(
 58x\t
 5;FJ$,XEK4<
-60J,
-6HW(
 6\fE647
 7&F|If
 7T2,
 8"3hrf
 8&Kx
-8Fpj,
+8FHh,
 969p
 :AM:am:PM:pm
 :Jan:January:Feb:February:Mar:March:Apr:April:May:May:Jun:June:Jul:July:Aug:August:Sep:September:Oct:October:Nov:November:Dec:December
@@ -623,9 +623,9 @@ CInputLayoutDict<class CInputLayoutVulkan>::ConcatentateInputLayouts
 CLargeCommandBufferChunk CUtlMemoryPool
 CMediumCommandBufferChunk CUtlMemoryPool
 CMemoryManagerVulkan::Allocate
-CMemoryManagerVulkan::AllocateBufferInCustomPoolGroup(1587): vmaCreatePool failed with error: %d\n
-CMemoryManagerVulkan::AllocateImageInCustomPoolGroup(1516): vmaCreatePool failed with error: %d\n
-CMemoryManagerVulkan::VmaDefragProcessDeletionQueueInternal(), C:\buildworker\csgo_rel_win64\build\src\rendersystem\vulkan\memorymgrvulkan.cpp:750
+CMemoryManagerVulkan::AllocateBufferInCustomPoolGroup(1594): vmaCreatePool failed with error: %d\n
+CMemoryManagerVulkan::AllocateImageInCustomPoolGroup(1523): vmaCreatePool failed with error: %d\n
+CMemoryManagerVulkan::VmaDefragProcessDeletionQueueInternal(), C:\buildworker\csgo_rel_win64\build\src\rendersystem\vulkan\memorymgrvulkan.cpp:756
 CNVReflexVulkan::LateWarpUpdateResolution(425): 
 COLOR0
 COMMENT
@@ -675,40 +675,40 @@ CRenderDeviceBase::InitPerFrameMemoryStack
 CRenderDeviceBase::Present(598): 
 CRenderDeviceBase::StartRenderDocCapture(3483): 
 CRenderDeviceVulkan::AllocateBufferInPool - invalid memory pool handle.\n
-CRenderDeviceVulkan::AllocateBufferInPool(10027): vmaBindImageMemory failed for buffer %s with error %d.\n
-CRenderDeviceVulkan::AllocateBufferInPool(9972): failed to allocate GPU memory in custom pool for %s.\n
+CRenderDeviceVulkan::AllocateBufferInPool(10032): vmaBindImageMemory failed for buffer %s with error %d.\n
+CRenderDeviceVulkan::AllocateBufferInPool(9977): failed to allocate GPU memory in custom pool for %s.\n
 CRenderDeviceVulkan::AllocateStaticDescriptorSet: Failed to allocate descriptor set.\n
 CRenderDeviceVulkan::AllocateTextureInPool - invalid memory pool handle.\n
-CRenderDeviceVulkan::AllocateTextureInPool(9654): Allocation already set for %s, it is not valid to assign a new allocation.\n
-CRenderDeviceVulkan::AllocateTextureInPool(9729): failed to allocate GPU memory in custom pool for %s.\n
-CRenderDeviceVulkan::AllocateTextureInPool(9795): vmaBindImageMemory failed for image %s with error %d.\n
+CRenderDeviceVulkan::AllocateTextureInPool(9659): Allocation already set for %s, it is not valid to assign a new allocation.\n
+CRenderDeviceVulkan::AllocateTextureInPool(9734): failed to allocate GPU memory in custom pool for %s.\n
+CRenderDeviceVulkan::AllocateTextureInPool(9800): vmaBindImageMemory failed for image %s with error %d.\n
 CRenderDeviceVulkan::AllocateUpdateAfterBindDescriptorSet: Failed to allocate descriptor set.\n
-CRenderDeviceVulkan::BeginSubmittingDisplayLists(4433): 
-CRenderDeviceVulkan::CreateDefaultBuffers(2511): 
+CRenderDeviceVulkan::BeginSubmittingDisplayLists(4438): 
+CRenderDeviceVulkan::CreateDefaultBuffers(2516): 
 CRenderDeviceVulkan::CreateDefaultShaders
 CRenderDeviceVulkan::CreateDescriptorSet: Failed to create descriptor set.\n
 CRenderDeviceVulkan::CreateIndirectCommandsPreprocessBuffer- invalid layout handle.\n
 CRenderDeviceVulkan::CreateIndirectExecutionSet
-CRenderDeviceVulkan::CreateTLAS(7757): 
-CRenderDeviceVulkan::DeleteQueryObject(4647): 
+CRenderDeviceVulkan::CreateTLAS(7762): 
+CRenderDeviceVulkan::DeleteQueryObject(4652): 
 CRenderDeviceVulkan::DestroyDeviceMemoryPool - invalid memory pool handle.\n
 CRenderDeviceVulkan::DestroyIndirectCommandsLayout - invalid layout handle.\n
-CRenderDeviceVulkan::FreeBufferFromPool(10066): Unable to get Vulkan buffer.\n
-CRenderDeviceVulkan::FreeBufferFromPool(10072): no allocation for buffer %s.\n
+CRenderDeviceVulkan::FreeBufferFromPool(10071): Unable to get Vulkan buffer.\n
+CRenderDeviceVulkan::FreeBufferFromPool(10077): no allocation for buffer %s.\n
 CRenderDeviceVulkan::FreeTextureFromPool - invalid memory pool handle.\n
-CRenderDeviceVulkan::FreeTextureFromPool(9827): Unable to get Vulkan image for %s.\n
-CRenderDeviceVulkan::FreeTextureFromPool(9833): no allocation for image %s.\n
-CRenderDeviceVulkan::GetDeviceMemoryBufferAllocationInfo(10168): Unable to get Vulkan buffer.\n
-CRenderDeviceVulkan::GetDeviceMemoryBufferAllocationInfo(10174): no allocation for buffer %s.\n
-CRenderDeviceVulkan::GetDeviceMemoryTextureAllocationInfo(10143): Unable to get Vulkan image for %s.\n
-CRenderDeviceVulkan::GetDeviceMemoryTextureAllocationInfo(10149): no allocation for image %s.\n
+CRenderDeviceVulkan::FreeTextureFromPool(9832): Unable to get Vulkan image for %s.\n
+CRenderDeviceVulkan::FreeTextureFromPool(9838): no allocation for image %s.\n
+CRenderDeviceVulkan::GetDeviceMemoryBufferAllocationInfo(10173): Unable to get Vulkan buffer.\n
+CRenderDeviceVulkan::GetDeviceMemoryBufferAllocationInfo(10179): no allocation for buffer %s.\n
+CRenderDeviceVulkan::GetDeviceMemoryTextureAllocationInfo(10148): Unable to get Vulkan image for %s.\n
+CRenderDeviceVulkan::GetDeviceMemoryTextureAllocationInfo(10154): no allocation for image %s.\n
 CRenderDeviceVulkan::GetDeviceSpecificTexture
 CRenderDeviceVulkan::GetDeviceSpecificTexture() failed to get texture data.\n
 CRenderDeviceVulkan::InitDevice: failed to get queue properties\n
 CRenderDeviceVulkan::InitDevice: no graphics queue found\n
 CRenderDeviceVulkan::InitDevice: vkEnumerateDeviceExtensionProperties( ... ) failed.\n
 CRenderDeviceVulkan::OnLowMemoryNotification - evicting all textures to reduce memory pressure.\n
-CRenderDeviceVulkan::ReadTexturePixels(4230): 
+CRenderDeviceVulkan::ReadTexturePixels(4235): 
 CRenderDeviceVulkan::RebakeDescriptorSetsReferencing - could not allocate descriptor in new pool.\n
 CRenderDeviceVulkan::SetHardwareGammaRamp failed to get swap chain.\n
 CRenderDeviceVulkan::UpdateDescriptorSet: Failed to update descriptor set.\n
@@ -721,7 +721,7 @@ CRenderThreadVulkan::OnReadPixels(233): Error! NULL texture pointer sent to OnRe
 CSheetDataTextureCache::AllocateAndUploadSequenceData(582): 
 CSwapChainBase::QueuePresentAndWait() looped for %d iterations without a present event.\n
 CSwapChainVulkan::CreateSwapChain
-CSwapChainVulkan::CreateSwapChain(3281): 
+CSwapChainVulkan::CreateSwapChain(3286): 
 CSwapChainVulkan::CreateSwapChain::<lambda_2>::operator ()
 CSwapChainVulkan::SwapBuffers
 CSwapChainVulkan::SwapBuffers vkAcquireNextImageKHR - completed result = %s\n
@@ -1169,18 +1169,17 @@ Group4Options
 HEADER
 HEXINTEGERLITERAL
 HEX_DIGIT
-HI!Z
 HLSL SM6.0 level subgroup wave ops supported, subgroup size = %d\n
 HOST_CACHED
 HOST_COHERENT
 HOST_VISIBLE
 HalftoneHints
 Header size does not contain enough data in pipeline cache file %s.  Deleting.\n
 Heap 
+Hi!Z
 Hitch alert: Present was waiting for %d iterations and %.1f seconds.\n
 Horizontal differencing "Predictor" not supported with %d-bit samples
 HostComputer
-I2"Z
 IB Size: %s (Count: %d)\n
 IBPool
 ICC Profile
@@ -1193,6 +1192,7 @@ IOS_VULKAN
 IOS_VULKAN_4_0
 IOS_VULKAN_4_1
 IOS_VULKAN_5_0
+IR"Z
 ISO JBIG
 IS_DIRECTX
 IS_MOBILE
@@ -1510,6 +1510,7 @@ PC_SM_5_0_VULKAN
 PC_SM_6_0_VULKAN
 PERF WARNING: Texture pool size set to more than 80%% of total GPU memory.\n
 PERFORMANCE
+PHd(
 PLAT_
 POSITION
 POSITION0
@@ -1543,7 +1544,6 @@ PooledDynamicConstantBuffer
 Position.ViewSpace
 PostMessageW
 PostThreadMessageW
-Ppc(
 Predictor
 PredictorEncodeTile
 PredictorSetup
@@ -1570,8 +1570,7 @@ RESOURCE_TYPE_TEXTURE
 RJqn
 RSDS@d
 RTX\n
-R\vph3,
-R\vppc(
+R\fp0g(
 R_T5Y
 Ran out of query slots.\n
 Rasterizer state is VK_POLYGON_MODE_LINE but VkPhysicalDeviceFeatures.fillModeNonSolid is not supported.  Forcing to VK_POLYGON_MODE_FILL.  May result in incorrect rendering.\n
@@ -2278,7 +2277,6 @@ ZIPVSetField
 \nGetVfxDll(93): ERROR! Can't load %s dll, automatic RenderDoc shader debug info not available.\n
 \nMS,\nVS_MS_RTX
 \nPS_RENDER_STATE
-\nPpc(
 \nRTX
 \n\tCommand Buffer Labels - %d\n
 \n\tObjects - %d\n
@@ -2302,7 +2300,7 @@ ZIPVSetField
 \t_V_StringAfterPrefixCaseSensitive
 \t_V_strcspn
 \tg_TSPointerListNodes
-\vppc(
+\vp0g(
 \ysK
 ]rHa
 _DOVK
@@ -2725,14 +2723,15 @@ out.var.SV_TARGET0
 out.var.TEXCOORD0
 outReactiveMask
 outputpatch
+p0g(
 pH_r
+pHd(
 pNext
 panorama_
 panorama_rt_
 passOp
 patchControlPoints
 pc2g
-ph3,
 physicalDeviceFeatures
 pipelineBindPoint
 pipelineLayoutFlags
@@ -2743,7 +2742,6 @@ png/jpg
 polygonMode
 positiont
 powf
-ppc(
 preserveAttachments
 primitiveRestartEnable
 printf_enable
@@ -2757,8 +2755,8 @@ psize
 psrs
 pushConstantRanges
 quAt
-r\fppc(
 r\tV_strspn
+r\vp0g(
 r_allow_low_gpu_memory_mode
 r_cache_pool_allocations
 r_dilatedDepth