diff --git a/README.md b/README.md index 99e4405..ebd338c 100644 --- a/README.md +++ b/README.md @@ -50,11 +50,11 @@ Installer's source can be found [here](/BeatrunAnimInstaller). * Added a ConVar to allow QuickTurn with any weapon or only with *Runner Hands* - `Beatrun_QuickturnHandsOnly`. * Implemented Discord Rich Presence using open source tools (See [credits](https://github.com/JonnyBro/beatrun?tab=readme-ov-file#credits-3)). * Added small camera punch when diving. -* Added the ability to remove ziplines that created with *Zipline Gun* - RMB. +* Added the ability to remove ziplines that created with *Zipline Gun* - `RMB`. +* Fixed some playermodels show up as ERROR. * SteamID in the right corner is no longer present. ## Notable changes and fixes done by the community -* Made QuickTurn work only with `Runner Hands`. * Fixed leaderboard sorting in gamemodes. * Fixed grapple usage in courses and gamemodes. * Fixed a crash in DataTheft when touching data bank. diff --git a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx index f2ce3cc..03e27e7 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx index d3b3698..a94b7de 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.dx90.vtx and b/beatrun/Beatrun Reanimated/climbanim.dx90.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.mdl b/beatrun/Beatrun Reanimated/climbanim.mdl index 60479c6..ce4fa8a 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.mdl and b/beatrun/Beatrun Reanimated/climbanim.mdl differ diff --git a/beatrun/Beatrun Reanimated/climbanim.sw.vtx b/beatrun/Beatrun Reanimated/climbanim.sw.vtx index 7732099..5a2ef11 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.sw.vtx and b/beatrun/Beatrun Reanimated/climbanim.sw.vtx differ diff --git a/beatrun/Beatrun Reanimated/climbanim.vvd b/beatrun/Beatrun Reanimated/climbanim.vvd index 4ec5dba..2c70789 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.vvd and b/beatrun/Beatrun Reanimated/climbanim.vvd differ diff --git a/beatrun/Original Animations/climbanim.dx80.vtx b/beatrun/Original Animations/climbanim.dx80.vtx index 739bfdb..f28ab2b 100644 Binary files a/beatrun/Original Animations/climbanim.dx80.vtx and b/beatrun/Original Animations/climbanim.dx80.vtx differ diff --git a/beatrun/Original Animations/climbanim.dx90.vtx b/beatrun/Original Animations/climbanim.dx90.vtx index 64b3292..1b90b98 100644 Binary files a/beatrun/Original Animations/climbanim.dx90.vtx and b/beatrun/Original Animations/climbanim.dx90.vtx differ diff --git a/beatrun/Original Animations/climbanim.mdl b/beatrun/Original Animations/climbanim.mdl index 9d472b1..4aa0ee5 100644 Binary files a/beatrun/Original Animations/climbanim.mdl and b/beatrun/Original Animations/climbanim.mdl differ diff --git a/beatrun/Original Animations/climbanim.sw.vtx b/beatrun/Original Animations/climbanim.sw.vtx index 5453bcb..bcc0625 100644 Binary files a/beatrun/Original Animations/climbanim.sw.vtx and b/beatrun/Original Animations/climbanim.sw.vtx differ diff --git a/beatrun/Original Animations/climbanim.vvd b/beatrun/Original Animations/climbanim.vvd index 4a81267..92bedb2 100644 Binary files a/beatrun/Original Animations/climbanim.vvd and b/beatrun/Original Animations/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx index f2ce3cc..03e27e7 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx index d3b3698..a94b7de 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.dx90.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl index 60479c6..ce4fa8a 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.mdl and b/beatrun/gamemodes/beatrun/content/models/climbanim.mdl differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx index 7732099..5a2ef11 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx and b/beatrun/gamemodes/beatrun/content/models/climbanim.sw.vtx differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd index 4ec5dba..2c70789 100644 Binary files a/beatrun/gamemodes/beatrun/content/models/climbanim.vvd and b/beatrun/gamemodes/beatrun/content/models/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/BodyAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/BodyAnim.lua index e0587d5..b409ce3 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/BodyAnim.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/BodyAnim.lua @@ -343,8 +343,8 @@ function StartBodyAnim(animtable) if not IsValid(ply:GetHands()) then return end local plymodel = ply - local playermodel = string.Replace(ply:GetModel(), "models/models/", "models/") - local handsmodel = string.Replace(ply:GetHands():GetModel(), "models/models/", "models/") + local playermodel = ply:GetModel() + local handsmodel = ply:GetHands():GetModel() if usefullbody == 2 then BodyAnimMDL = ClientsideModel(playermodel, RENDERGROUP_BOTH) @@ -480,8 +480,7 @@ function BodyAnimCalcView2(ply, pos, angles, fov) return end - -- This is the issue with disappearing model when sliding, should be fixed for now - if IsValid(BodyAnim) and pos:Distance(ply:EyePos()) > 20 then -- TODO: Something if appears again... + if IsValid(BodyAnim) and pos:Distance(ply:EyePos()) > 20 then if updatethirdperson then ply:SetNoDraw(false) BodyAnim:SetNoDraw(true) diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua b/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua index b6e2d84..41220ee 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua @@ -9,6 +9,7 @@ local discord_start = discord_start or -1 function DiscordUpdate() local ply = LocalPlayer() + if not ply.GetLevel then return end local rpc_data = {} diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/Fall.lua b/beatrun/gamemodes/beatrun/gamemode/cl/Fall.lua index 809b8d0..cb6a91f 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/Fall.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/Fall.lua @@ -16,6 +16,7 @@ local vignettealpha = 0 local function FallCheck() local ply = LocalPlayer() if not IsValid(ply) then return end + local speed = ply:GetVelocity().z if not ply.FallStatic and speed <= -800 and ply:GetMoveType() ~= MOVETYPE_NOCLIP and ply:GetDive() == false then diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua index 05b6ffb..5c69c4a 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua @@ -486,7 +486,8 @@ local nocyclereset = { local ignorebac = { evaderoll = true, - meroll = true + meroll = true, + merollgun = true } local customspeed = { diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/OnlineCourse.lua b/beatrun/gamemodes/beatrun/gamemode/cl/OnlineCourse.lua index 8fd909a..6784536 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/OnlineCourse.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/OnlineCourse.lua @@ -3,17 +3,23 @@ local domain = CreateClientConVar("Beatrun_Domain", "courses.beatrun.ru", true, local QueuedArgs = NULL local QueuedFunction = NULL -concommand.Add("beatrun_confirm", function() + +concommand.Add("Beatrun_Confirm", function() if QueuedArgs and QueuedFunction then QueuedFunction(QueuedArgs) + return end + if QueuedFunction then QueuedFunction() + return end end) -concommand.Add("beatrun_cancel", function() + +concommand.Add("Beatrun_Cancel", function() + QueuedArgs = NULL QueuedFunction = NULL end) @@ -54,8 +60,9 @@ end concommand.Add("Beatrun_UploadCourse", function() QueuedFunction = UploadCourse - print("You're trying to upload a course with the name "..Course_Name.." and on map "..game.GetMap()..".") - print("Write beatrun_confirm to continue, or beatrun_cancel to stop.") + + print("You're trying to upload a course with the name " .. Course_Name .. " and on map " .. game.GetMap() .. ".") + print("Write Beatrun_Confirm to continue, or Beatrun_Cancel to cancel.") end) function GetCourse(sharecode) @@ -128,6 +135,7 @@ end concommand.Add("Beatrun_UpdateCode", function(ply, cmd, args, argstr) QueuedFunction = UpdateCourse QueuedArgs = args[1] - print("You're trying to update a course with this code: "..args[1]..", with a course on map "..game.GetMap().." and name "..Course_Name..".") - print("Write beatrun_confirm to continue, or beatrun_cancel to stop.") -end) + + print("You're trying to update a course with this code: " .. args[1] .. ", with a course on map " .. game.GetMap() .. " and name " .. Course_Name .. ".") + print("Write Beatrun_Confirm to continue, or Beatrun_Cancel to cancel.") +end) \ No newline at end of file diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua b/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua index f1c05fa..31108a0 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua @@ -7,6 +7,7 @@ local refresh_time = 60 local function UpdateRichPresence() local ply = LocalPlayer() + if not ply.GetLevel then return end local map = game.GetMap() diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/Watermark.lua b/beatrun/gamemodes/beatrun/gamemode/cl/Watermark.lua index 0e903f6..2e96dda 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/Watermark.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/Watermark.lua @@ -24,4 +24,4 @@ hook.Add("PostRender", "Watermark", function() surface.DrawText(LocalPlayer():Nick()) cam.End2D() end) -]] \ No newline at end of file +--]] \ No newline at end of file diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/Whitescale.lua b/beatrun/gamemodes/beatrun/gamemode/cl/Whitescale.lua index 0e7bf2a..1ebfaec 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/Whitescale.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/Whitescale.lua @@ -72,4 +72,4 @@ local function ToggleWhitescale() end end -concommand.Add("ToggleWhitescale", ToggleWhitescale) \ No newline at end of file +concommand.Add("Beatrun_ToggleWhitescale", ToggleWhitescale) \ No newline at end of file diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/XP.lua b/beatrun/gamemodes/beatrun/gamemode/cl/XP.lua index 4ebe447..9ce75c3 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/XP.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/XP.lua @@ -1,5 +1,4 @@ local meta = FindMetaTable("Player") --- local XP_max = 2000000 local XP_ratiocache = nil local parkourevent_lastpos = Vector() diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua index 5d404da..8dcb0db 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua @@ -57,6 +57,8 @@ local roll = { } net.Receive("RollAnimSP", function() + local ply = LocalPlayer() + if net.ReadBool() then roll.AnimString = "land" roll.animmodelstring = "climbanim" @@ -66,7 +68,12 @@ net.Receive("RollAnimSP", function() roll.animmodelstring = "climbanim" roll.BodyAnimSpeed = 1.5 else - roll.AnimString = "meroll" + if ply:GetActiveWeapon():GetClass() ~= "runnerhands" then + roll.AnimString = "merollgun" + else + roll.AnimString = "meroll" + end + roll.animmodelstring = "climbanim" roll.BodyAnimSpeed = 1.15 end @@ -165,7 +172,12 @@ hook.Add("OnPlayerHitGround", "SafetyRoll", function(ply, water, floater, speed) ply:SetSafetyRollAng(ang) ply:SetSafetyRollTime(CurTime() + 1.05) - roll.AnimString = "meroll" + if ply:GetActiveWeapon():GetClass() ~= "runnerhands" then + roll.AnimString = "merollgun" + else + roll.AnimString = "meroll" + end + roll.animmodelstring = "climbanim" roll.usefullbody = false end diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Zipline.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Zipline.lua index f4c3fa6..4774bbd 100644 --- a/beatrun/gamemodes/beatrun/gamemode/sh/Zipline.lua +++ b/beatrun/gamemodes/beatrun/gamemode/sh/Zipline.lua @@ -105,7 +105,6 @@ local function ZiplineCheck(ply, mv, cmd, zipline) ply:SetCrouchJumpBlocked(false) if CLIENT and IsFirstTimePredicted() then - -- local zipline = ply:GetZipline() ply.OrigEyeAng = (endpos - startpos):Angle() elseif game.SinglePlayer() then net.Start("Zipline_SPFix")