Merge pull request #4 from shadow8t4/alex
Update master with Android build fix.
This commit is contained in:
commit
4cb7845f6e
2 changed files with 17 additions and 3 deletions
|
@ -1,4 +1,5 @@
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
#if UNITY_EDITOR
|
||||||
using UnityEditor;
|
using UnityEditor;
|
||||||
[CustomEditor(typeof(Inventory))]
|
[CustomEditor(typeof(Inventory))]
|
||||||
public class InventoryEditor : Editor
|
public class InventoryEditor : Editor
|
||||||
|
@ -37,3 +38,4 @@ public class InventoryEditor : Editor
|
||||||
EditorGUILayout.EndVertical ();
|
EditorGUILayout.EndVertical ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
16
README.md
16
README.md
|
@ -1,2 +1,14 @@
|
||||||
# MoChaApp
|
# Monster Chase
|
||||||
A unity project version of a monster chasing fitness app for CSCE 482
|
|
||||||
|
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
|
||||||
|
|
Reference in a new issue