Merge branch 'master' into tubeMaze

2020-11-27 16:41:41 +01:00 · 2020-11-27 16:41:41 +01:00 · 4a8daff722
commit 4a8daff722
parent df72085f27 5ab712659a
17 changed files with 1 additions and 1 deletions
--- a/Content/Bunker/Meshes/SM_ceiling.uasset
+++ b/Content/Bunker/Meshes/SM_ceiling.uasset
--- a/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/color-wheel.uasset
+++ b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/color-wheel.uasset
--- a/Content/Levels/BuildingEscape.umap
+++ b/Content/Levels/BuildingEscape.umap
--- a/Content/Levels/BuildingEscape_BuiltData.uasset
+++ b/Content/Levels/BuildingEscape_BuiltData.uasset
--- a/Content/Levels/Raum4.umap
+++ b/Content/Levels/Raum4.umap
--- a/Content/Levels/TestLevel.umap
+++ b/Content/Levels/TestLevel.umap
--- a/Content/Levels/TestLevel_BuiltData.uasset
+++ b/Content/Levels/TestLevel_BuiltData.uasset
--- a/Content/Levels/VillaDesign.umap
+++ b/Content/Levels/VillaDesign.umap
--- a/Content/Levels/VillaDesign_BuiltData.uasset
+++ b/Content/Levels/VillaDesign_BuiltData.uasset
--- a/Content/Linear_Stair_Brush_StaticMesh.uasset
+++ b/Content/Linear_Stair_Brush_StaticMesh.uasset
--- a/Content/Materials/MI_0406_01.uasset
+++ b/Content/Materials/MI_0406_01.uasset
--- a/Content/Materials/M_Black.uasset
+++ b/Content/Materials/M_Black.uasset
--- a/Content/Materials/M_TrainDecals01.uasset
+++ b/Content/Materials/M_TrainDecals01.uasset
--- a/Content/Models/M_Yellow.uasset
+++ b/Content/Models/M_Yellow.uasset
--- a/Content/Textures/FactoryBrick.uasset
+++ b/Content/Textures/FactoryBrick.uasset
--- a/Content/Textures/LargeRedBricks.uasset
+++ b/Content/Textures/LargeRedBricks.uasset
--- a/Source/BuildingEscape/Grabber.cpp
+++ b/Source/BuildingEscape/Grabber.cpp
@ -1,10 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.

+#include "Grabber.h"
 #include "DrawDebugHelpers.h"
 #include "Engine/World.h"
 #include "GameFramework/PlayerController.h"
 #include "PhysicsEngine/PhysicsHandleComponent.h"
-#include "Grabber.h"

 #define OUT //mark for outparameters (only for reading purposes)
 // Sets default values for this component's properties