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 'Particles'

Browse Source
This commit is contained in:
Vincent Wheat
2021-11-05 13:25:57 -05:00
parent 758f06f775 84a8d5134c
commit 81abd7bfe8
12 changed files with 15380 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scripts/PlayerScripts/DebugPlayer.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Scripts/PlayerScripts/DebugPlayer.meta
guid: 236528fef9e9ed54fa77a41f6facd741
folderAsset: yes
DefaultImporter:
=======
guid: 8cc08287d1ef0b94db826a6319e8bd6d
NativeFormatImporter:
>>>>>>> Particles:Assets/Materials/LightningBolt.mat.meta
externalObjects: {}
userData:
assetBundleName:

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

@@ -101,7 +101,10 @@ 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
@@ -152,12 +155,16 @@ public class PlayerMovement : NetworkBehaviour
//Debug.LogWarning("MoveController is either Disabled or wasn't retrieved correctly");
}
//TEMP FOR TESTING RAGDOLL
//Right Click to ragdoll the player
if (Input.GetMouseButton(1) && heldDown == false){
getHit(new Vector3(vel.x, 0, vel.z), 30);
heldDown = true;
}
//TESTING RAGDOLL STUFF NEEDS SOME WORK
//Checks if player should respawn
//Respawn();
//if (Input.GetMouseButton(1) && heldDown == false){
// getHit(new Vector3(vel.x, 0, vel.z), 30);
// heldDown = true;
//}
if(!Input.GetMouseButton(1)){
heldDown = false;
}