Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-24 03:14:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'grayboxPlains' into main

Browse Source
This commit is contained in:
Evan Nydahl
2021-11-17 12:30:48 -06:00
parent 63a678e6eb 377c36de9e
commit e233d41b40
34 changed files with 47996 additions and 7265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Scripts/PlayerScripts/ItemScripts/Resources/ItemObjects/Blink.asset
View File

@@ -33,4 +33,3 @@ MonoBehaviour:
hasNitroM: 0
hasDashM: 0
cooldownM: 5
scriptM: {fileID: 11500000, guid: 5162a84172831f4449df60b9ad0ce22f, type: 3}

4
Assets/Scripts/PlayerScripts/PlayerMovement.cs
View File

@@ -101,7 +101,7 @@ public class PlayerMovement : NetworkBehaviour
// Don't do movement unless this is the local player controlling it
// Otherwise we let the server handle moving us
if (!IsLocalPlayer) { return; }
//if (!IsLocalPlayer) { return; }
// Don't lock the cursor multiple times if this isn't the local player
// Also don't want to lock the cursor for the king
@@ -114,7 +114,7 @@ public class PlayerMovement : NetworkBehaviour
{
// Don't do movement unless this is the local player controlling it
// Otherwise we let the server handle moving us
if (!IsLocalPlayer) { return; }
//if (!IsLocalPlayer) { return; }
//Controls for camera