From 43d85e782c656caefdef7c3b93d5a65d7924d2fb Mon Sep 17 00:00:00 2001 From: Alex Huddleston Date: Thu, 19 Apr 2018 10:13:26 -0500 Subject: [PATCH 1/2] Updating readme to have some better info. In the future we might wanna put some more descriptions or pictures or whatever on what the app actually does. --- README.md | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0bac09c..56e30f7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,14 @@ -# MoChaApp -A unity project version of a monster chasing fitness app for CSCE 482 +# Monster Chase + +Unity front end client of a gamified fitness app for CSCE 482. + +Create a monster and run! + +## Development Details + +This client unity app will mostly just be pulling data +from a connected fitbit device and the server backend +of our fitness game. + +Its server backend companion github can be found here: +https://github.tamu.edu/rhetorical575/mocha-server From afeebf294a609e303e7ec9eae4a928fbac0eea33 Mon Sep 17 00:00:00 2001 From: shadow8t4 Date: Thu, 19 Apr 2018 10:52:28 -0500 Subject: [PATCH 2/2] Added #if to fix build on my computer. --- MoCha/Assets/Scripts/InventoryEditor.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MoCha/Assets/Scripts/InventoryEditor.cs b/MoCha/Assets/Scripts/InventoryEditor.cs index 46a379e..4370fa0 100644 --- a/MoCha/Assets/Scripts/InventoryEditor.cs +++ b/MoCha/Assets/Scripts/InventoryEditor.cs @@ -1,4 +1,5 @@ using UnityEngine; +#if UNITY_EDITOR using UnityEditor; [CustomEditor(typeof(Inventory))] public class InventoryEditor : Editor @@ -36,4 +37,5 @@ public class InventoryEditor : Editor EditorGUI.indentLevel--; EditorGUILayout.EndVertical (); } -} \ No newline at end of file +} +#endif \ No newline at end of file