diff --git a/README.md b/README.md index dd72eb7..e2bb349 100644 --- a/README.md +++ b/README.md @@ -9,19 +9,22 @@ This version does not include malicious modules, code or networking. What it doe **All of this is optional and you may remove all of it. (modules are located [here](https://github.com/JonnyBro/beatrun/blob/master/lua/bin/) and online courses functionality is [here](https://github.com/JonnyBro/beatrun/blob/master/beatrun/gamemodes/beatrun/gamemode/cl/OnlineCourse.lua))** -# Installation (Manual) +**PLEASE READ ALL BEFORE ASKING QUESTIONS ON OUR SERVER!** + +# (Prefered) Installation (Automatic | Windows only) +Run the command below in the Powershell. +> (Win + R > powershell > command in question) +```powershell +iex (iwr "beatrun.ru/install.ps1" -UseBasicParsing) +``` + +## Installation (Manual) 1. Download this repository [here](https://github.com/JonnyBro/beatrun/archive/refs/heads/master.zip). 2. Delete the `beatrun` folder in *addons* if you have one! 3. Extract the `beatrun` folder to *your_game_folder/garrysmod/addons*. 4. Extract the `lua` folder to *your_game_folder/garrysmod*. * `lua` folder contains modules for Discord Rich Presense and Steam Presence. They are optional. You can find their source code in the [credits](https://github.com/JonnyBro/beatrun?tab=readme-ov-file#credits-3) section

-# Installation (Automatic | Windows only) -Run the command below in the Powershell. (Win + R --> powershell --> the command below) -```powershell -iex (iwr "beatrun.ru/install.ps1" -UseBasicParsing) -``` - ## Animations You can use "**BeatrunAnimInstaller**" (located in `beatrun` [here](https://github.com/JonnyBro/beatrun/tree/master/beatrun)) for custom animations. Currently there's: * Beatrun Reanimated @@ -31,20 +34,20 @@ Start the executable and press a key on your keyboard with the number of the ani Installer's source can be found [here](/BeatrunAnimInstaller). ## Changes and fixes done by me -* Created a [custom online courses database](https://courses.beatrun.ru), which is also free and [open source](https://github.com/relaxtakenotes/beatrun-courses-server/) 🤯! -* Added a new gamemode - *Deathmatch*, it's like Data Theft, but you collect kills not cubes! +* Jonny_Bro is hosting [custom online courses database](https://courses.beatrun.ru), which is also free and [open source](https://github.com/relaxtakenotes/beatrun-courses-server/) 🤯! +* Added a new gamemode - *Deathmatch*, it's like Data Theft, but you collect kills not cubes! (it's way more fun I promise) * Added an in-game config menu - You can find it in the tool menu, in the *Beatrun* Category!\ -All of the settings below can be changed in the configuration menu. -* Added the ability Getting off of ladders. -* Allowed jumping while slowwalking. +**All** of the Beatrun settings can be changed in the configuration menu. +* Added the ability to get off of ladders. +* Allowed jumping while slowwalking (🤷). * Done various tweaks to the Time Trials Menu (F4). * Added an arrow that shows the next checkpoint. -* Added a convar to allow Overdrive usage on the server - `Beatrun_AllowOverdriveInMultiplayer`. -* Added a convar to toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`. -* Added convars to change HUD's colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`. -* Added a convar to allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`. -* Added a convar to disable grapple ability - `Beatrun_DisableGrapple`. -* Implemented Discord Rich Presence using open source tools (See step 3). +* Added a ConVar to allow Overdrive usage on the server - `Beatrun_AllowOverdriveInMultiplayer`. +* Added a ConVar to toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`. +* Added some ConVars to change HUD colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`. +* Added a ConVar to allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`. +* Added a ConVar to disable grapple ability - `Beatrun_DisableGrapple`. +* 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. * SteamID in the right corner is no longer present. @@ -55,21 +58,22 @@ All of the settings below can be changed in the configuration menu. * Fixed grapple usage in courses and gamemodes. * Fixed a crash in DataTheft when touching data bank. * Fixed an error on course load. -* Fixed collisions issues. (you getting stuck in walls for no reason or player to player damage not going through in gamemodes other than datatheft) +* Fixed collisions issues. (PvP damage not going through in gamemodes other than DataTheft) * Added Proper Kick Glitch ([Like in original ME](https://www.youtube.com/watch?v=zK5y3NBUStc)). (cry about prediction errors l0l) * Tweaked safety roll, now you can roll under things. * Made it possible to dive to your death =). * Added some grapple related stuff. Now it moves with the entity it was attached to and other players can see the rope. ## TODO -- [ ] Gamemodes menu. +- [ ] Gamemodes menu. (idk how to properly implement this for know) # Related -* [beatrun-anims](https://github.com/JonnyBro/beatrun-anims) - Decompiled beatrun animations. +* [beatrun-anims](https://github.com/JonnyBro/beatrun-anims) - Decompiled and reworked Beatrun animations. # Credits <3 * All contributors. +* [EarthyKiller127](https://www.youtube.com/channel/UCiFqPwGo4x0J65xafIaECDQ) - He made that piece of shit. +* [relaxtakenotes](https://github.com/relaxtakenotes) - Made all of this possible. * [MTB](https://www.youtube.com/@MTB396) - Beatrun Reanimated project. * [Discord Rich Presence](https://github.com/fluffy-servers/gmod-discord-rpc) by Fluffy Servers. * [Steam Presence](https://github.com/YuRaNnNzZZ/gmcl_steamrichpresencer) by YuRaNnNzZZ. -* [earthykiller](https://www.youtube.com/channel/UCiFqPwGo4x0J65xafIaECDQ) - He made that piece of shit code. diff --git a/BeatrunAnimInstaller/BeatrunAnimInstaller.cs b/SOURCE CODE Beatrun Animations Installer/BeatrunAnimInstaller.cs similarity index 100% rename from BeatrunAnimInstaller/BeatrunAnimInstaller.cs rename to SOURCE CODE Beatrun Animations Installer/BeatrunAnimInstaller.cs diff --git a/BeatrunAnimInstaller/BeatrunAnimInstaller.csproj b/SOURCE CODE Beatrun Animations Installer/BeatrunAnimInstaller.csproj similarity index 100% rename from BeatrunAnimInstaller/BeatrunAnimInstaller.csproj rename to SOURCE CODE Beatrun Animations Installer/BeatrunAnimInstaller.csproj diff --git a/BeatrunAnimInstaller/BeatrunAnimInstaller.sln b/SOURCE CODE Beatrun Animations Installer/BeatrunAnimInstaller.sln similarity index 100% rename from BeatrunAnimInstaller/BeatrunAnimInstaller.sln rename to SOURCE CODE Beatrun Animations Installer/BeatrunAnimInstaller.sln diff --git a/BeatrunAnimInstaller/Properties/AssemblyInfo.cs b/SOURCE CODE Beatrun Animations Installer/Properties/AssemblyInfo.cs similarity index 100% rename from BeatrunAnimInstaller/Properties/AssemblyInfo.cs rename to SOURCE CODE Beatrun Animations Installer/Properties/AssemblyInfo.cs diff --git a/BeatrunAnimInstaller/app.config b/SOURCE CODE Beatrun Animations Installer/app.config similarity index 100% rename from BeatrunAnimInstaller/app.config rename to SOURCE CODE Beatrun Animations Installer/app.config diff --git a/beatrun/Beatrun Reanimated/climbanim.dx80.vtx b/beatrun/Beatrun Reanimated/climbanim.dx80.vtx index 9d5ff0e..f406b2e 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 616ee68..5d404a5 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 95290f6..9a89fde 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 f2aceb1..7a43a39 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 9137720..ad02c71 100644 Binary files a/beatrun/Beatrun Reanimated/climbanim.vvd and b/beatrun/Beatrun Reanimated/climbanim.vvd differ diff --git a/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx b/beatrun/gamemodes/beatrun/content/models/climbanim.dx80.vtx index 9d5ff0e..f406b2e 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 616ee68..5d404a5 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 95290f6..9a89fde 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 f2aceb1..7a43a39 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 9137720..ad02c71 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/JumpAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua index 6b01258..dea44b2 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua @@ -499,7 +499,7 @@ local customarmoffset = { meslidestart45 = Vector(2, 5, 5), meslideloop45 = Vector(2, 5, 5), meslideend = Vector(2, 5, 9.5), - meslideendprone = Vector(2, 5, 9.5), + meslideendprone = Vector(0, 0, 3), meleeslide = Vector(2, 5, 9.5), jumpturnfly = Vector(0, 2.5, 7.5), jumpturnflyidle = Vector(0, 2.5, 7.5), @@ -1631,7 +1631,7 @@ local function JumpThink() BodyAnim:SetSequence(transitionanims[BodyAnimString]) end - if ply:WaterLevel() >= 2 then + if ply:WaterLevel() >= 2 and not ply:Crouching() then BodyAnim:SetSequence(BodyAnim:LookupSequence("water_float")) if ply:KeyDown(IN_MOVELEFT) and vel_l > 5 then