Merge branch 'penolakushari:boneselect' into boneselect

This commit is contained in:
vlazed 2024-08-17 14:54:10 -04:00 committed by GitHub
commit 9682186a42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions

View File

@ -1063,7 +1063,6 @@ function DrawBoneCircle(ent, bones)
local thisang = (360 / count * (k - 1))
local thisrad = thisang / 180 * math.pi
local uix, uiy = (math.sin(thisrad) * 250), (math.cos(thisrad) * -250)
local uix2, uiy2 = uix * 1.1 + midw, uiy * 1.1 + midh
local color = COLOR_WHITE
uix, uiy = uix + midw, uiy + midh
@ -1093,7 +1092,7 @@ function DrawBoneCircle(ent, bones)
surface.DrawPoly(circ)
surface.DrawCircle(uix, uiy, 3.5, color)
draw.SimpleText(name, "Default", uix2, uiy2, color, TEXT_ALIGN_CENTER, TEXT_ALIGN_BOTTOM)
draw.SimpleText(name, "Default", uix, uiy - 14, color, TEXT_ALIGN_CENTER, TEXT_ALIGN_BOTTOM)
end
end

View File

@ -2053,15 +2053,16 @@ end
function TOOL:RightClick()
local pl = self:GetOwner()
local eyepos, eyeang = rgm.EyePosAng(pl)
local tr = util.TraceLine({
start = eyepos,
endpos = eyepos + pl:GetAimVector() * 16384,
filter = { pl, pl:GetViewEntity() }
})
if self:GetOperation() == 1 then
if SERVER then
local tr = util.TraceLine({
start = eyepos,
endpos = eyepos + pl:GetAimVector() * 16384,
filter = { pl, pl:GetViewEntity() }
})
local axis = RAGDOLLMOVER[pl].Axis
local ent, rgment = tr.Entity, RAGDOLLMOVER[pl].Entity
local offset