Fixed dPlayerMovement & dWallrun references

2026-08-21 18:04:27 -05:00 · 2021-11-05 13:35:26 -05:00
parent 81abd7bfe8
commit 2fe2fa5764
6 changed files with 65 additions and 73 deletions
--- a/Assets/Scripts/PlayerScripts/PlayerMovement.cs
+++ b/Assets/Scripts/PlayerScripts/PlayerMovement.cs
@@ -101,10 +101,6 @@ public class PlayerMovement : NetworkBehaviour

        // Don't do movement unless this is the local player controlling it
        // Otherwise we let the server handle moving us
-<<<<<<< HEAD
-
-=======
->>>>>>> Particles
        //if (!IsLocalPlayer) { return; }

        // Don't lock the cursor multiple times if this isn't the local player