Merge branch 'new_classrooms' into 'master'

Created large classroom map See merge request !10

Merge branch 'new_classrooms' into 'master'
Created large classroom map See merge request !10
1adaebb4 · Danny Pires · 19793ef5 · 8e16aaa5 · 1adaebb4 · 1adaebb4
Commit 1adaebb4 authored 3 years ago by Danny Pires
15 changed files
--- a/src/Content/Campus/Blueprints/Staircase_Floor.uasset
+++ b/src/Content/Campus/Blueprints/Staircase_Floor.uasset
--- a/src/Content/Campus/Maps/LargeClassroom.umap
+++ b/src/Content/Campus/Maps/LargeClassroom.umap
--- a/src/Content/Campus/Maps/LargeClassroom_BuiltData.uasset
+++ b/src/Content/Campus/Maps/LargeClassroom_BuiltData.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/TestClassroom.umap
+++ b/src/Content/Campus/Maps/TestClassroom.umap
--- a/src/Content/Campus/Maps/TestClassroom_BuiltData.uasset
+++ b/src/Content/Campus/Maps/TestClassroom_BuiltData.uasset
--- a/src/Content/Campus/Materials/classroomFloor.uasset
+++ b/src/Content/Campus/Materials/classroomFloor.uasset
--- a/src/Content/Campus/Materials/classroomWallBottom.uasset
+++ b/src/Content/Campus/Materials/classroomWallBottom.uasset
--- a/src/Content/Campus/UMG/BPW_LoginMenu.uasset
+++ b/src/Content/Campus/UMG/BPW_LoginMenu.uasset
--- a/src/Content/_GENERATED/Box2.uasset
+++ b/src/Content/_GENERATED/Box2.uasset
--- a/src/Content/_GENERATED/Box3.uasset
+++ b/src/Content/_GENERATED/Box3.uasset
--- a/src/Content/_GENERATED/Cylinder.uasset
+++ b/src/Content/_GENERATED/Cylinder.uasset
--- a/src/Content/_GENERATED/Extrude.uasset
+++ b/src/Content/_GENERATED/Extrude.uasset
--- a/src/VRClassroom.uproject
+++ b/src/VRClassroom.uproject
 {
 	"FileVersion": 3,
-	"EngineAssociation": "{0506F437-410D-A1AD-0DE5-36A1D1C0C5F7}",
+	"EngineAssociation": "{BEBB101A-4F07-73A2-8E7E-16AE3FB13F7D}",
 	"Category": "",
 	"Description": "",
 	"Modules": [
@@ -41,6 +41,10 @@
 		{
 			"Name": "WebBrowserWidget",
 			"Enabled": true
+		},
+		{
+			"Name": "ModelingToolsEditorMode",
+			"Enabled": true
 		}
 	],
 	"TargetPlatforms": [