Merge remote-tracking branch 'origin/alex' into darrel

.gitignore

@@ -4,6 +4,7 @@
 **/[Bb]uild/
 **/[Bb]uilds/
 **/Assets/AssetStoreTools*
+**/Assets/Plugins/*
 
 # Autogenerated VS/MD solution and project files
 **/.vs/

MoCha/Assets/Fonts.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: b4e3c483abcceef40b7ecaf5f6e6a97a
+folderAsset: yes
+timeCreated: 1523555905
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 16fa5742d5f3a4e4f888e6ee59fd53c8
+timeCreated: 1523556714
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: All Things Pink Skinny
+  fontNames:
+  - All Things Pink Skinny
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/All Things Pink.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d38f3d0f1045b2f4cb509995afa5c861
+timeCreated: 1523556709
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: All Things Pink
+  fontNames:
+  - All Things Pink
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 2400d4713aa74ce4ca7dc368886d7857
+timeCreated: 1523556729
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Chocolate Covered Raindrops Bol
+  fontNames:
+  - Chocolate Covered Raindrops Bol
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 678bbcb4b61bb804995ce113a087c7dd
+timeCreated: 1523556729
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Chocolate Covered Raindrops Hol
+  fontNames:
+  - Chocolate Covered Raindrops Hol
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 797901ead3866484b9fd79273ffe70b8
+timeCreated: 1523556724
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Chocolate Covered Raindrops
+  fontNames:
+  - Chocolate Covered Raindrops
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Fonts/SaucerBB.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 885e0ce5c093c1a4990f87656db90876
+timeCreated: 1523555966
+licenseType: Free
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Saucer BB
+  fontNames:
+  - Saucer BB
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Materials/Monster.mat.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 7f5b45f167ce0c74a94cde52fb5c09e7
+timeCreated: 1523987555
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Materials/Running Man.mat.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 2c8009114361c9045a3d3f8fb310c3ec
+timeCreated: 1523987549
+licenseType: Free
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Objects.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 3e0c77c4ccbbf0748a00791544349672
+folderAsset: yes
+timeCreated: 1523559432
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Objects/Tyranitar_lowpoly_pokemon_new_5.fbx.meta

@@ -0,0 +1,95 @@
+fileFormatVersion: 2
+guid: 7e89565ff9cf0374bb64026197d14561
+timeCreated: 1523559837
+licenseType: Free
+ModelImporter:
+  serializedVersion: 22
+  fileIDToRecycleName:
+    100000: node_id3
+    100002: //RootNode
+    400000: node_id3
+    400002: //RootNode
+    2100000: Material_53
+    2300000: node_id3
+    3300000: node_id3
+    4300000: node_id3
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 10
+    meshCompression: 0
+    addColliders: 0
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Objects/running_man.fbx.meta

@@ -0,0 +1,95 @@
+fileFormatVersion: 2
+guid: c60d37a70064cec47b89518256491de4
+timeCreated: 1523987201
+licenseType: Free
+ModelImporter:
+  serializedVersion: 22
+  fileIDToRecycleName:
+    100000: node_id3
+    100002: //RootNode
+    400000: node_id3
+    400002: //RootNode
+    2100000: Material_53
+    2300000: node_id3
+    3300000: node_id3
+    4300000: node_id3
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Plugins.meta

@@ -1,7 +1,13 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+guid: c0d1cd17861ddfa469b8a67ce9249897
+folderAsset: yes
+timeCreated: 1523557753
+=======
 guid: eba9d66c763b541cfbbd65c831b9bdd0
 folderAsset: yes
 timeCreated: 1523992298
+>>>>>>> darrel
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

MoCha/Assets/Prefabs/Base Canvas.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 43ffee412d195f7439561e503c0cb541
-timeCreated: 1523382322
+guid: 7d0f216d6d3858a479598e82060a4c1e
+timeCreated: 1523557265
 licenseType: Free
 NativeFormatImporter:
   externalObjects: {}

MoCha/Assets/Scenes/Testing.unity.meta

@@ -1,7 +1,5 @@
 fileFormatVersion: 2
-guid: c72a4e8de072a4731bd9f9b8429ff914
-timeCreated: 1523990860
-licenseType: Free
+guid: f9d68b692a268dd4ba72bf2d814a1204
 DefaultImporter:
   externalObjects: {}
   userData: 

MoCha/Assets/Scripts/GetData.cs

@@ -1,19 +1,30 @@
 using UnityEngine;
 using UnityEngine.Networking;
 using System.Collections;
+using UnityEngine.UI;
 
-public class MyBehaviour : MonoBehaviour
+public class GetData : MonoBehaviour
 {
+	//string displayText = "";
+	Text objectText;
+
     void Start()
     {
-        StartCoroutine(GetText());
+		objectText = GetComponentInParent<Text> ();
     }
 
-    IEnumerator GetText()
+	public void DisplayStuff()
+	{
+		StartCoroutine (MakeRequest ());
+		//Debug.Log (displayText);
+		//objectText.text = displayText;
+	}
+
+	IEnumerator MakeRequest()
     {
-        using (UnityWebRequest www = UnityWebRequest.Get("https://corder.tech/mocha"))
+        using (UnityWebRequest www = UnityWebRequest.Get("https://corder.tech/mocha/users/1"))
         {
-            yield return www.Send();
+			yield return www.SendWebRequest();
 
             if (www.isNetworkError || www.isHttpError)
             {
@@ -22,7 +33,8 @@ public class MyBehaviour : MonoBehaviour
             else
             {
                 // Show results as text
-                Debug.Log(www.downloadHandler.text);
+				//Debug.Log(www.downloadHandler.text);
+				objectText.text = www.downloadHandler.text;
 
                 // Or retrieve results as binary data
                 byte[] results = www.downloadHandler.data;

MoCha/Assets/Scripts/RunningMan.cs.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: a60f552af79ad464ea5ece09289bec43
+timeCreated: 1523991007
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

MoCha/Assets/Scripts/SceneLoader.cs

@@ -1,11 +1,34 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using System.Collections;
+using UnityEngine.UI;
 
 public class SceneLoader : MonoBehaviour {
 
-	public void LoadScene(int scene)
+	Text buttontext;
+
+	public void Start()
+	{
+		buttontext = GetComponentInChildren<Text> ();
+	}
+
+	public void LoadScene()
 	{ 
-		SceneManager.LoadScene(scene);
+		string scenetext = buttontext.text;
+
+		switch (scenetext) {
+		case "Home":
+			if (!(SceneManager.GetActiveScene ().name == "Main"))
+				SceneManager.LoadScene ("Main");
+			break;
+		case "Run":
+			if (!(SceneManager.GetActiveScene ().name == "StepCounter"))
+				SceneManager.LoadScene ("StepCounter");
+			break;
+		default:
+			if (!(SceneManager.GetActiveScene ().name == scenetext))
+				SceneManager.LoadScene (scenetext);
+			break;
+		}
 	}
 }

MoCha/Assets/Scripts/SpinningCube.cs

@@ -2,9 +2,10 @@
 using System.Collections;
 
 public class SpinningCube : MonoBehaviour {
-	public float m_Speed = 20f;
+	public float m_Speed = 100f;
+	public float faster = 1f;
 
-	private Vector3 m_RotationDirection = Vector3.up;
+	private Vector3 m_RotationDirection = Vector3.right;
 
 	public void ToggleRotationDirection()
 	{
@@ -22,6 +23,7 @@ public class SpinningCube : MonoBehaviour {
 
 	void Update() 
 	{
-		transform.Rotate(m_RotationDirection * Time.deltaTime * m_Speed);
+		Time.timeScale = 5;
+		transform.Rotate(m_RotationDirection * (Mathf.Sin(Time.time) / 20f) * m_Speed);
 	}
 }