Changed canvas resolution reference to 1080p landscape. Fixed scaling/position issues that resulted. Progress bar in Goals now thoroughly broken.

2018-04-26 21:19:15 -05:00 · 2018-04-26 21:19:15 -05:00 · 98fbbedcae
commit 98fbbedcae
parent db06d56727
12 changed files with 0 additions and 4 deletions
--- a/MoCha/Assets/Prefabs/Navigation.prefab
+++ b/MoCha/Assets/Prefabs/Navigation.prefab
--- a/MoCha/Assets/Prefabs/Title.prefab
+++ b/MoCha/Assets/Prefabs/Title.prefab
--- a/MoCha/Assets/Scenes/Credits.unity
+++ b/MoCha/Assets/Scenes/Credits.unity
--- a/MoCha/Assets/Scenes/Goals.unity
+++ b/MoCha/Assets/Scenes/Goals.unity
--- a/MoCha/Assets/Scenes/Home.unity
+++ b/MoCha/Assets/Scenes/Home.unity
--- a/MoCha/Assets/Scenes/Leaderboard.unity
+++ b/MoCha/Assets/Scenes/Leaderboard.unity
--- a/MoCha/Assets/Scenes/Main.unity
+++ b/MoCha/Assets/Scenes/Main.unity
--- a/MoCha/Assets/Scenes/MonsterCreator.unity
+++ b/MoCha/Assets/Scenes/MonsterCreator.unity
--- a/MoCha/Assets/Scenes/Stats.unity
+++ b/MoCha/Assets/Scenes/Stats.unity
--- a/MoCha/ProjectSettings/EditorBuildSettings.asset
+++ b/MoCha/ProjectSettings/EditorBuildSettings.asset
--- a/MoCha/ProjectSettings/ProjectSettings.asset
+++ b/MoCha/ProjectSettings/ProjectSettings.asset
--- a/MoCha/ProjectSettings/ProjectVersion.txt
+++ b/MoCha/ProjectSettings/ProjectVersion.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
 m_EditorVersion: 2017.4.0f1
-=======
-m_EditorVersion: 2017.3.1f1
->>>>>>> alex