diff --git a/Content/Bunker/Meshes/SM_ceiling.uasset b/Content/Bunker/Meshes/SM_ceiling.uasset index 57d15b2..8b87f5a 100644 Binary files a/Content/Bunker/Meshes/SM_ceiling.uasset and b/Content/Bunker/Meshes/SM_ceiling.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/ConditionalLight_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/ConditionalLight_BP.uasset new file mode 100644 index 0000000..36a9f75 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/ConditionalLight_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/ConditionalText_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/ConditionalText_BP.uasset new file mode 100644 index 0000000..5e2745b Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/ConditionalText_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/CubeWithText.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/CubeWithText.uasset new file mode 100644 index 0000000..2a8798c Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/CubeWithText.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset index de8d62d..776679c 100644 Binary files a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorButton_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorMultipleButton_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorMultipleButton_BP.uasset new file mode 100644 index 0000000..01727db Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/DoorMultipleButton_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset index 971c994..18aa33b 100644 Binary files a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/FirstPersonCharacter.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/LightSwitchLightsOutStart_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/LightSwitchLightsOutStart_BP.uasset new file mode 100644 index 0000000..3668faa Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/LightSwitchLightsOutStart_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/PhysicsObject_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/PhysicsObject_BP.uasset index d29e75d..41726cf 100644 Binary files a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/PhysicsObject_BP.uasset and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/PhysicsObject_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SelfDestructExactWeight_BP1.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SelfDestructExactWeight_BP1.uasset new file mode 100644 index 0000000..5130dec Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SelfDestructExactWeight_BP1.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SelfDestructMinWeight_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SelfDestructMinWeight_BP.uasset new file mode 100644 index 0000000..6b88011 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SelfDestructMinWeight_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SlideDoorButton_BP.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SlideDoorButton_BP.uasset new file mode 100644 index 0000000..65610a3 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Blueprints/SlideDoorButton_BP.uasset differ diff --git a/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/color-wheel.uasset b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/color-wheel.uasset new file mode 100644 index 0000000..eaec964 Binary files /dev/null and b/Content/EVERYTHINGPROGRAMMINGRELATED/Widgets/color-wheel.uasset differ diff --git a/Content/Levels/BuildingEscape.umap b/Content/Levels/BuildingEscape.umap index 2407c05..c3116df 100644 Binary files a/Content/Levels/BuildingEscape.umap and b/Content/Levels/BuildingEscape.umap differ diff --git a/Content/Levels/BuildingEscape_BuiltData.uasset b/Content/Levels/BuildingEscape_BuiltData.uasset index f104b99..57fdaec 100644 Binary files a/Content/Levels/BuildingEscape_BuiltData.uasset and b/Content/Levels/BuildingEscape_BuiltData.uasset differ diff --git a/Content/Levels/Raum4.umap b/Content/Levels/Raum4.umap index 3a3f3ea..226627d 100644 Binary files a/Content/Levels/Raum4.umap and b/Content/Levels/Raum4.umap differ diff --git a/Content/Levels/TestLevel.umap b/Content/Levels/TestLevel.umap deleted file mode 100644 index d598a37..0000000 Binary files a/Content/Levels/TestLevel.umap and /dev/null differ diff --git a/Content/Levels/TestLevelForMechanics.umap b/Content/Levels/TestLevelForMechanics.umap index 245e678..c522c1f 100644 Binary files a/Content/Levels/TestLevelForMechanics.umap and b/Content/Levels/TestLevelForMechanics.umap differ diff --git a/Content/Levels/TestLevelForMechanics_BuiltData.uasset b/Content/Levels/TestLevelForMechanics_BuiltData.uasset index 1b7797f..b53e9c4 100644 Binary files a/Content/Levels/TestLevelForMechanics_BuiltData.uasset and b/Content/Levels/TestLevelForMechanics_BuiltData.uasset differ diff --git a/Content/Levels/TestLevel_BuiltData.uasset b/Content/Levels/TestLevel_BuiltData.uasset deleted file mode 100644 index 200c224..0000000 Binary files a/Content/Levels/TestLevel_BuiltData.uasset and /dev/null differ diff --git a/Content/Levels/VillaDesign.umap b/Content/Levels/VillaDesign.umap new file mode 100644 index 0000000..fea2b13 Binary files /dev/null and b/Content/Levels/VillaDesign.umap differ diff --git a/Content/Levels/VillaDesign_BuiltData.uasset b/Content/Levels/VillaDesign_BuiltData.uasset new file mode 100644 index 0000000..01b35a5 Binary files /dev/null and b/Content/Levels/VillaDesign_BuiltData.uasset differ diff --git a/Content/Linear_Stair_Brush_StaticMesh.uasset b/Content/Linear_Stair_Brush_StaticMesh.uasset new file mode 100644 index 0000000..ca04282 Binary files /dev/null and b/Content/Linear_Stair_Brush_StaticMesh.uasset differ diff --git a/Content/Materials/MI_0406_01.uasset b/Content/Materials/MI_0406_01.uasset index 01d8448..d7c26ba 100644 Binary files a/Content/Materials/MI_0406_01.uasset and b/Content/Materials/MI_0406_01.uasset differ diff --git a/Content/Materials/M_TrainDecals01.uasset b/Content/Materials/M_TrainDecals01.uasset index f01a34e..bf9ed02 100644 Binary files a/Content/Materials/M_TrainDecals01.uasset and b/Content/Materials/M_TrainDecals01.uasset differ diff --git a/Content/Models/M_Yellow.uasset b/Content/Models/M_Yellow.uasset index d2a004f..78cbb42 100644 Binary files a/Content/Models/M_Yellow.uasset and b/Content/Models/M_Yellow.uasset differ diff --git a/Content/Textures/FactoryBrick.uasset b/Content/Textures/FactoryBrick.uasset index 5ab0f87..ab48eb4 100644 Binary files a/Content/Textures/FactoryBrick.uasset and b/Content/Textures/FactoryBrick.uasset differ diff --git a/Content/Textures/LargeRedBricks.uasset b/Content/Textures/LargeRedBricks.uasset index 7a7d80b..d1a5286 100644 Binary files a/Content/Textures/LargeRedBricks.uasset and b/Content/Textures/LargeRedBricks.uasset differ diff --git a/Source/BuildingEscape/Grabber.cpp b/Source/BuildingEscape/Grabber.cpp index 222a041..2971874 100644 --- 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