mirror of
https://github.com/JonnyBro/beatrun.git
synced 2024-12-28 12:53:02 +05:00
punching while crouching + fixed anims when crouching and going sideways + new anims + i forgor
This commit is contained in:
parent
f0da7a7865
commit
25a98cdbf2
24 changed files with 16 additions and 14 deletions
|
@ -8,7 +8,7 @@ namespace BeatrunAnimInstaller
|
|||
{
|
||||
private static readonly string inDir = ".";
|
||||
private static readonly string outDir = "gamemodes\\beatrun\\content\\models";
|
||||
private static readonly List<string> choices = new List<string>() { "Beatrun Reanimated", "OG (but fixed) Animations" };
|
||||
private static readonly List<string> choices = new List<string>() { "Beatrun Reanimated", "Original Animations" };
|
||||
|
||||
static void RecursiveCopyDir(string inputDir, string outputDir)
|
||||
{
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
beatrun/Original Animations/climbanim.dx80.vtx
Normal file
BIN
beatrun/Original Animations/climbanim.dx80.vtx
Normal file
Binary file not shown.
BIN
beatrun/Original Animations/climbanim.dx90.vtx
Normal file
BIN
beatrun/Original Animations/climbanim.dx90.vtx
Normal file
Binary file not shown.
Binary file not shown.
BIN
beatrun/Original Animations/climbanim.sw.vtx
Normal file
BIN
beatrun/Original Animations/climbanim.sw.vtx
Normal file
Binary file not shown.
BIN
beatrun/Original Animations/climbanim.vvd
Normal file
BIN
beatrun/Original Animations/climbanim.vvd
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -419,7 +419,7 @@ function SWEP:PrimaryAttack()
|
|||
return
|
||||
end
|
||||
|
||||
if not ply:OnGround() or ply:Crouching() or ply:GetSliding() or ply:GetGrappling() or ply:GetWallrun() ~= 0 then return end
|
||||
if not ply:OnGround() or ply:GetSliding() or ply:GetGrappling() or ply:GetWallrun() ~= 0 then return end
|
||||
|
||||
local curseq = self:GetSequence()
|
||||
local infall = curseq == 19
|
||||
|
|
|
@ -501,9 +501,9 @@ local customarmoffset = {
|
|||
ladderexittoprighthand = Vector(5, 0, 0),
|
||||
ladderclimbhangstart = Vector(-5, 0, 0),
|
||||
ladderenterbottom = Vector(-7.5, 0, 0),
|
||||
crouchstill = Vector(-10, 0, 10),
|
||||
crouchfwd = Vector(-10, 0, 10),
|
||||
crouchbwd = Vector(-10, 0, 10),
|
||||
crouchstill = Vector(-4, 0, -5),
|
||||
crouchfwd = Vector(-4, 0, -5),
|
||||
crouchbwd = Vector(0, 0, 0),
|
||||
walkfwd = Vector(10, 0, -10),
|
||||
runbwd = Vector(0, 0, 3),
|
||||
stand = Vector(10, 0, -10),
|
||||
|
@ -526,9 +526,9 @@ local customcamoffset = {
|
|||
hangstrafeleft = Vector(-2.5, 0, 0),
|
||||
hangstraferight = Vector(-2.5, 0, 0),
|
||||
snatchscar = snatchscarcam1,
|
||||
crouchstill = Vector(0, 0, -10),
|
||||
crouchfwd = Vector(10, 0, -17.5),
|
||||
crouchbwd = Vector(20, 0, -10)
|
||||
crouchstill = Vector(0, 0, 2.5),
|
||||
crouchfwd = Vector(0, 0, 2.5),
|
||||
crouchbwd = Vector(0, 0, 2.5)
|
||||
}
|
||||
|
||||
local transitionchecks = {
|
||||
|
@ -1482,6 +1482,8 @@ local function JumpThink()
|
|||
|
||||
if ply:KeyDown(IN_FORWARD) then
|
||||
moveback = false
|
||||
elseif ply:Crouching() and moveback then
|
||||
BodyAnim:SetSequence(BodyAnim:LookupSequence("crouchbwd"))
|
||||
else
|
||||
BodyAnim:SetSequence(BodyAnim:LookupSequence("runbwd"))
|
||||
end
|
||||
|
|
|
@ -224,7 +224,7 @@ local function ClimbingThink(ply, mv, cmd)
|
|||
|
||||
--[[ TODO: Make this work
|
||||
for i = -64, 64, 1 do
|
||||
tr.endpos = tr.start + Vector(i, mins.z, maxs.z)
|
||||
tr.endpos = tr.start + ply:GetClimbingAngle():Forward() * i
|
||||
|
||||
util.TraceHull(tr)
|
||||
|
||||
|
@ -232,16 +232,16 @@ local function ClimbingThink(ply, mv, cmd)
|
|||
print(tr.endpos)
|
||||
|
||||
if not trout.Hit then
|
||||
tr.start = tr.endpos
|
||||
tr.endpos = tr.start - ply:GetClimbingAngle():Forward() * 20
|
||||
-- tr.start = tr.endpos
|
||||
-- tr.endpos = tr.start - ply:GetClimbingAngle():Forward() * i
|
||||
|
||||
util.TraceHull(tr)
|
||||
-- util.TraceHull(tr)
|
||||
|
||||
if not trout.Hit then
|
||||
-- if not trout.Hit then
|
||||
ply:SetClimbingEnd(tr.endpos)
|
||||
ply:SetClimbing(2)
|
||||
ParkourEvent("climbheave", ply)
|
||||
end
|
||||
-- end
|
||||
end
|
||||
end
|
||||
--]]
|
||||
|
|
Loading…
Reference in a new issue