helar
/
Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

staging2 #26

Merged
helar merged 35 commits from staging2 into master 2022-04-11 16:26:06 +00:00
Conversation 0 Commits 35 Files Changed 759 +5 -1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 029c6cf7ba - Show all commits

4
Assets/Project Files/Scripts/JonasB/ActionGestureInteraction.cs
View File

@ -23,12 +23,16 @@ public class ActionGestureInteraction : MonoBehaviour
{
Debug.LogWarning(action);
/* todo: playerinfo doesnt have these methods?
if (player.GetComponent<PlayerInfo>().GetRightHand() != null)
{
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
}
else holdingWand = false;
*/
switch (action)
{

2
Assets/Project Files/Scripts/JoonasP/EssenceNodeController.cs
View File

@ -25,7 +25,7 @@ public class EssenceNodeController : MonoBehaviour
private void Awake()
{
nodeMaterial = GetComponent<Renderer>().material;
playerInfo = PlayerInfo.Instance;
//playerInfo = PlayerInfo.Instance;
playerInventory = GameObject.Find("Inventory").GetComponent<Inventory>();
}