Merge remote-tracking branch 'origin/evan_main_menu'

a8f36935 · Geovanny Vera · 7d776f21 · 07465656 · a8f36935 · a8f36935
Commit a8f36935 authored Feb 26, 2021 by Geovanny Vera
35 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/Blueprints/BPW_MenuMain.uasset
+++ b/src/Content/Campus/Blueprints/BPW_MenuMain.uasset
--- 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/MainMenu.umap
+++ b/src/Content/Campus/Maps/MainMenu.umap
--- a/src/Content/Campus/Maps/MainMenuEvan.umap
+++ b/src/Content/Campus/Maps/MainMenuEvan.umap
--- a/src/Content/Campus/Maps/MainMenu_BuiltData.uasset
+++ b/src/Content/Campus/Maps/MainMenu_BuiltData.uasset
--- 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/Materials/blackboard.uasset
+++ b/src/Content/Campus/Materials/blackboard.uasset
--- a/src/Content/Campus/UMG/BPW_MenuMain.uasset
+++ b/src/Content/Campus/UMG/BPW_MenuMain.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/CourseListItem_Widget.uasset
+++ b/src/Content/Campus/UMG/CourseListItem_Widget.uasset
--- a/src/Content/Campus/UMG/CoursesListing_Widget.uasset
+++ b/src/Content/Campus/UMG/CoursesListing_Widget.uasset
--- a/src/Content/Campus/UMG/LoginMenu.uasset
+++ b/src/Content/Campus/UMG/LoginMenu.uasset
--- a/src/Content/Campus/UMG/MainMenu.uasset
+++ b/src/Content/Campus/UMG/MainMenu.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.blend
+++ b/src/Content/Models/blackboard_sample.blend
--- a/src/Content/Models/blackboard_sample.blend1
+++ b/src/Content/Models/blackboard_sample.blend1
--- a/src/Content/Models/blackboard_sample.fbx
+++ b/src/Content/Models/blackboard_sample.fbx
--- 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/Content/Whiteboard/Materials/M_WhiteBoardClearMaterial.uasset
+++ b/src/Content/Whiteboard/Materials/M_WhiteBoardClearMaterial.uasset
--- a/src/VRClassroom.uproject
+++ b/src/VRClassroom.uproject
 {
 	"FileVersion": 3,
-	"EngineAssociation": "{33C11E74-419A-46C9-65FA-D293D1CF3677}",
+	"EngineAssociation": "{7E4506D0-4E9A-9CE5-C703-1FAFBE0E6174}",
 	"Category": "",
 	"Description": "",
 	"Modules": [
@@ -45,7 +45,7 @@
 		}
 	],
 	"TargetPlatforms": [
-		"WindowsNoEditor",
-		"Android"
+		"Android",
+		"WindowsNoEditor"
 	]
 }
\ No newline at end of file