diff --git a/README.md b/README.md index 572a17a..2da8bfc 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ All of the settings below can be changed in the configuration menu * Toggle between old and new (like in ME) Kick-Glitch - `Beatrun_OldKickGlitch`. * Change HUD's colors - `Beatrun_HUDTextColor`, `Beatrun_HUDCornerColor`, `Beatrun_HUDFloatingXPColor`. * Allow players to spawn props without admin rights - `Beatrun_AllowPropSpawn`. +* `Beatrun_DisableGrapple` - Disables grapple ability. * Discord Rich Presence (extract `lua` folder to `garrysmod`, along side with `addons` folder). * Small camera punch when diving. * Ability to remove ziplines that created with *Zipline Gun* - RMB. @@ -27,8 +28,7 @@ All of the settings below can be changed in the configuration menu - [ ] Gamemodes menu ## Fixes and changes from previous version -* Removed unused anims and merged some together. -* Added a module for Steam Presence. +* `Beatrun_DisableGrapple` - Disables grapple ability. # All changes and fixes * Course saving works with compression and without. @@ -45,6 +45,7 @@ All of the settings below can be changed in the configuration menu * Allowed punching while crouching. * Grapple fixes. Now it moves with entity it attached to and other players can see it. * More reliable grappling. +* Merged some anims into 1 file. # Credits * modeltexturesbones - Changed anims a bit. diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua b/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua index 88db137..c574324 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/DiscordPresence.lua @@ -1,4 +1,4 @@ -if not system.IsWindows() or not file.Exists("lua/bin/gmcl_gdiscord_*.dll", "GAME") then return end +if file.Find("lua/bin/gmcl_gdiscord_*.dll", "GAME") == nil then return end require("gdiscord") diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua b/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua index 527d485..1c27bfc 100644 --- a/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua +++ b/beatrun/gamemodes/beatrun/gamemode/cl/SteamPresence.lua @@ -1,13 +1,11 @@ -if not system.IsWindows() or not file.Exists("lua/bin/gmcl_steamfriends_win64.dll", "GAME") then return end +if file.Find("lua/bin/gmcl_steamfriends_*.dll", "GAME") == nil then return end + local richtext = "" local nextupdate = 0 local function UpdateRichPresence() if CurTime() < nextupdate then return end - local rp = steamworks.SetRichPresence - if not rp then return end - local ply = LocalPlayer() if not ply.GetLevel then return end @@ -26,7 +24,7 @@ local function UpdateRichPresence() if richtext ~= updatedtext then richtext = updatedtext - rp("generic", richtext) + steamworks.SetRichPresence("generic", richtext) print("Updating presence") end @@ -34,7 +32,7 @@ local function UpdateRichPresence() end local function LoadRichPresenceDLL() - require("steamfriends") + require("steamrichpresencer") end hook.Add("OnGamemodeLoaded", "LoadDLL", function() diff --git a/lua/bin/gmcl_steamfriends_win32.dll b/lua/bin/gmcl_steamrichpresencer_win32.dll similarity index 99% rename from lua/bin/gmcl_steamfriends_win32.dll rename to lua/bin/gmcl_steamrichpresencer_win32.dll index 7297c72..b790fdd 100644 Binary files a/lua/bin/gmcl_steamfriends_win32.dll and b/lua/bin/gmcl_steamrichpresencer_win32.dll differ diff --git a/lua/bin/gmcl_steamfriends_win64.dll b/lua/bin/gmcl_steamrichpresencer_win64.dll similarity index 99% rename from lua/bin/gmcl_steamfriends_win64.dll rename to lua/bin/gmcl_steamrichpresencer_win64.dll index ec728c3..b1141ca 100644 Binary files a/lua/bin/gmcl_steamfriends_win64.dll and b/lua/bin/gmcl_steamrichpresencer_win64.dll differ