From 24cb2510c1771ea063e46180e567b41121a185d7 Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Thu, 10 Oct 2019 11:02:16 +1100 Subject: [PATCH] fixed some merge errors --- Assets/Scenes/Menus/Lobby.unity | 4 ++-- Assets/Scripts/Character.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/Scenes/Menus/Lobby.unity b/Assets/Scenes/Menus/Lobby.unity index 282cad3..2d2f674 100644 --- a/Assets/Scenes/Menus/Lobby.unity +++ b/Assets/Scenes/Menus/Lobby.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d80697018f7e0cb57334c5778dee14be78ec04e3bfa231fbe8042f9073677988 -size 46425 +oid sha256:522af36cedf7538607021871c5d833031446e7f40e07626f5e059e0d323ceb9e +size 46401 diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 3b18284..ac7f777 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -22,6 +22,7 @@ public class Character : MonoBehaviour public bool underRock = false; public bool stuck = false; //Am I still stuck? public bool justMoved = false; //Was the logic block I just executed a move command? + public bool inPit = false; Vector3 death = new Vector3(-50, 0, 0); #region Inspector Fields