diff --git a/MoCha/Assets/Plugins.meta~Stashed changes b/MoCha/Assets/Fonts.meta similarity index 70% rename from MoCha/Assets/Plugins.meta~Stashed changes rename to MoCha/Assets/Fonts.meta index 12bb076..f2de13d 100644 --- a/MoCha/Assets/Plugins.meta~Stashed changes +++ b/MoCha/Assets/Fonts.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 36a268db14e08be4586c27503c77855b +guid: b4e3c483abcceef40b7ecaf5f6e6a97a folderAsset: yes -timeCreated: 1523388046 +timeCreated: 1523555905 licenseType: Free DefaultImporter: externalObjects: {} diff --git a/MoCha/Assets/Fonts/All Things Pink Skinny.ttf b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf new file mode 100644 index 0000000..54ffba4 Binary files /dev/null and b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf differ diff --git a/MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta b/MoCha/Assets/Fonts/All Things Pink Skinny.ttf.meta new file mode 100644 index 0000000..c6af790 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Fonts/All Things Pink.ttf b/MoCha/Assets/Fonts/All Things Pink.ttf new file mode 100644 index 0000000..c90899d Binary files /dev/null and b/MoCha/Assets/Fonts/All Things Pink.ttf differ diff --git a/MoCha/Assets/Fonts/All Things Pink.ttf.meta b/MoCha/Assets/Fonts/All Things Pink.ttf.meta new file mode 100644 index 0000000..7a93de0 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf new file mode 100644 index 0000000..a54ab5d Binary files /dev/null and b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf differ diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta b/MoCha/Assets/Fonts/Chocolate Covered Raindrops BOLD.ttf.meta new file mode 100644 index 0000000..71f8383 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf new file mode 100644 index 0000000..a2bb3f0 Binary files /dev/null and b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf differ diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta b/MoCha/Assets/Fonts/Chocolate Covered Raindrops Hollow.ttf.meta new file mode 100644 index 0000000..f7779dc --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf new file mode 100644 index 0000000..1591ac3 Binary files /dev/null and b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf differ diff --git a/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta b/MoCha/Assets/Fonts/Chocolate Covered Raindrops.ttf.meta new file mode 100644 index 0000000..84f2ed2 --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Fonts/SaucerBB.ttf b/MoCha/Assets/Fonts/SaucerBB.ttf new file mode 100644 index 0000000..cae9879 Binary files /dev/null and b/MoCha/Assets/Fonts/SaucerBB.ttf differ diff --git a/MoCha/Assets/Fonts/SaucerBB.ttf.meta b/MoCha/Assets/Fonts/SaucerBB.ttf.meta new file mode 100644 index 0000000..42b069e --- /dev/null +++ b/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: diff --git a/MoCha/Assets/Plugins.meta~Stashed changes.meta b/MoCha/Assets/Plugins.meta~Stashed changes.meta deleted file mode 100644 index e28d3ae..0000000 --- a/MoCha/Assets/Plugins.meta~Stashed changes.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a6833ac8a2686c841ac5a1b5b7b9be48 -timeCreated: 1523388413 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/MoCha/Assets/Prefabs/Canvas.prefab b/MoCha/Assets/Prefabs/Base Canvas.prefab similarity index 66% rename from MoCha/Assets/Prefabs/Canvas.prefab rename to MoCha/Assets/Prefabs/Base Canvas.prefab index e8b0feb..e9760d9 100644 Binary files a/MoCha/Assets/Prefabs/Canvas.prefab and b/MoCha/Assets/Prefabs/Base Canvas.prefab differ diff --git a/MoCha/Assets/Prefabs/Canvas.prefab.meta b/MoCha/Assets/Prefabs/Base Canvas.prefab.meta similarity index 72% rename from MoCha/Assets/Prefabs/Canvas.prefab.meta rename to MoCha/Assets/Prefabs/Base Canvas.prefab.meta index 5000506..192a4b1 100644 --- a/MoCha/Assets/Prefabs/Canvas.prefab.meta +++ b/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: {} diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 07fb2ac..13fe731 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scenes/MonsterCreator.unity b/MoCha/Assets/Scenes/MonsterCreator.unity index 6f007e6..d255559 100644 Binary files a/MoCha/Assets/Scenes/MonsterCreator.unity and b/MoCha/Assets/Scenes/MonsterCreator.unity differ diff --git a/MoCha/Assets/Scenes/Social.unity b/MoCha/Assets/Scenes/Social.unity index dfa6750..dba2543 100644 Binary files a/MoCha/Assets/Scenes/Social.unity and b/MoCha/Assets/Scenes/Social.unity differ diff --git a/MoCha/Assets/Scenes/Stats.unity b/MoCha/Assets/Scenes/Stats.unity index 92ae7cd..78547aa 100644 Binary files a/MoCha/Assets/Scenes/Stats.unity and b/MoCha/Assets/Scenes/Stats.unity differ diff --git a/MoCha/Assets/Scenes/StepCounter.unity b/MoCha/Assets/Scenes/StepCounter.unity index 28fa610..26fd05f 100644 Binary files a/MoCha/Assets/Scenes/StepCounter.unity and b/MoCha/Assets/Scenes/StepCounter.unity differ