Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
### Fixed

- Fixed markerVision not relaying engine-native entities out of PVS (by @MrXonte)
- Fixed thirdperson animations from third-party addons (by @mexikoedi)

## [v0.14.6b](https://github.com/TTT-2/TTT2/tree/v0.14.6b) (2026-04-06)

Expand Down
26 changes: 26 additions & 0 deletions gamemodes/terrortown/gamemode/client/cl_player_ext.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,37 @@ local function MakeSimpleRunner(act)
end
end

local function IsCustomSlotOverridden(ply)
local slot = GESTURE_SLOT_CUSTOM

-- if weight is 0, the layer is not active, so no collision can occur
local weight = ply:GetLayerWeight(slot) or 0
if weight <= 0 then
return false
end

-- if currentSeq is invalid, the layer is not active, so no collision can occur
local currentSeq = ply:GetLayerSequence(slot)
if not currentSeq or currentSeq < 0 then
return false
end

local act = ply:GetSequenceActivity(currentSeq)

-- if act isn't ACT_GMOD_IN_CHAT, the layer is being used by another gesture
return act ~= ACT_GMOD_IN_CHAT
end

-- act -> gesture runner fn
local act_runner = {
-- ear grab needs weight control
-- sadly it's currently the only one
[ACT_GMOD_IN_CHAT] = function(ply, w)
-- prevent voice chat ear grab gesture from interfering with active third-party gestures
if IsCustomSlotOverridden(ply) then
return 0
end

Comment thread
saibotk marked this conversation as resolved.
local dest = ply:IsSpeaking() and 1 or 0

w = math.Approach(w, dest, FrameTime() * 10)
Expand Down
Loading