Resolved many merge conflicts

This commit is contained in:
Evan Nydahl
2021-12-03 13:55:32 -06:00
parent e0cfb655f8
commit 36da5ec848
11 changed files with 28 additions and 255 deletions

View File

@@ -409,7 +409,7 @@ public class dPlayerMovement : NetworkBehaviour
}
//Ragdoll Functions
private void GetHit(Vector3 dir, float force){
public void GetHit(Vector3 dir, float force){
if(firstHit == false){
EnableRagdoll();
dir.Normalize();