Login and Main Menu built and ready for merging

07465656 · Evan Blake · 07f46d2d · 07465656 · 07465656 · 07465656
Commit 07465656 authored Feb 26, 2021 by Evan Blake
23 changed files
--- a/src/Config/DefaultEditor.ini
+++ b/src/Config/DefaultEditor.ini
@@ -3,3 +3,4 @@ bAllowClassAndBlueprintPinMatching=true
 bReplaceBlueprintWithClass= true
 bDontLoadBlueprintOutsideEditor= true
 bBlueprintIsNotBlueprintType= true
+
--- a/src/Content/Campus/Maps/Login.umap
+++ b/src/Content/Campus/Maps/Login.umap
--- a/src/Content/Campus/Maps/Login_BuiltData.uasset
+++ b/src/Content/Campus/Maps/Login_BuiltData.uasset
--- a/src/Content/Campus/Maps/MainMenuEvan.umap
+++ b/src/Content/Campus/Maps/MainMenuEvan.umap
--- a/src/Content/Campus/Maps/TestyMainMap.umap
+++ b/src/Content/Campus/Maps/TestyMainMap.umap
--- a/src/Content/Campus/Maps/TestyMainMap_BuiltData.uasset
+++ b/src/Content/Campus/Maps/TestyMainMap_BuiltData.uasset
--- a/src/Content/Campus/UMG/ClassInfo_Widget.uasset
+++ b/src/Content/Campus/UMG/ClassInfo_Widget.uasset
--- a/src/Content/Campus/UMG/Classinfo_test.uasset
+++ b/src/Content/Campus/UMG/Classinfo_test.uasset
--- a/src/Content/Campus/UMG/LoginMenu.uasset
+++ b/src/Content/Campus/UMG/LoginMenu.uasset
--- a/src/Content/Campus/UMG/MainMenu_Widget.uasset
+++ b/src/Content/Campus/UMG/MainMenu_Widget.uasset
--- a/src/Content/Models/Blackboard.uasset
+++ b/src/Content/Models/Blackboard.uasset
--- a/src/Content/Models/Material.uasset
+++ b/src/Content/Models/Material.uasset
--- a/src/Content/Models/Material_001.uasset
+++ b/src/Content/Models/Material_001.uasset
--- a/src/Content/Models/Material_002.uasset
+++ b/src/Content/Models/Material_002.uasset
--- a/src/Content/Models/Material_003.uasset
+++ b/src/Content/Models/Material_003.uasset
--- a/src/Content/Models/Material_004.uasset
+++ b/src/Content/Models/Material_004.uasset
--- a/src/Content/Models/blackboard_sample.uasset
+++ b/src/Content/Models/blackboard_sample.uasset
--- a/src/Content/Models/blackboard_sample_Cube.uasset
+++ b/src/Content/Models/blackboard_sample_Cube.uasset
--- a/src/Content/Models/blackboard_sample_Cylinder.uasset
+++ b/src/Content/Models/blackboard_sample_Cylinder.uasset
--- a/src/Content/Models/blackboard_sample_Cylinder_001.uasset
+++ b/src/Content/Models/blackboard_sample_Cylinder_001.uasset
--- a/src/Content/Models/blackboard_sample_Cylinder_002.uasset
+++ b/src/Content/Models/blackboard_sample_Cylinder_002.uasset
--- a/src/Content/Models/blackboard_sample_Cylinder_003.uasset
+++ b/src/Content/Models/blackboard_sample_Cylinder_003.uasset
--- a/src/VRClassroom.uproject
+++ b/src/VRClassroom.uproject
@@ -45,7 +45,7 @@
 		}
 	],
 	"TargetPlatforms": [
-		"WindowsNoEditor",
-		"Android"
+		"Android",
+		"WindowsNoEditor"
 	]
 }
\ No newline at end of file