diff --git a/.gitignore b/.gitignore index e334f10..3bcf1d6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ RoomEscape/Content/StarterContent/ # VS files *.VC.db +*.VC.opendb diff --git a/RoomEscape/Config/DefaultEngine.ini b/RoomEscape/Config/DefaultEngine.ini index 39578b8..d34d9dc 100644 --- a/RoomEscape/Config/DefaultEngine.ini +++ b/RoomEscape/Config/DefaultEngine.ini @@ -50,3 +50,5 @@ SyncSceneSmoothingFactor=0.000000 AsyncSceneSmoothingFactor=0.990000 InitialAverageFrameRate=0.016667 PhysXTreeRebuildRate=10 + + diff --git a/RoomEscape/Config/DefaultGame.ini b/RoomEscape/Config/DefaultGame.ini index d627a73..5ca008e 100644 --- a/RoomEscape/Config/DefaultGame.ini +++ b/RoomEscape/Config/DefaultGame.ini @@ -1,5 +1,8 @@ [/Script/EngineSettings.GeneralProjectSettings] ProjectID=687A287442ADC816860A6DBA745C3EBE +CompanyName=Tyrel Souza +CompanyDistinguishedName=Tyrelsouza.com +CopyrightNotice=Tyrel Souza 2018 [StartupActions] bAddPacks=True diff --git a/RoomEscape/Content/NewMap.umap b/RoomEscape/Content/NewMap.umap index 9e95fb6..4ec106e 100644 Binary files a/RoomEscape/Content/NewMap.umap and b/RoomEscape/Content/NewMap.umap differ diff --git a/RoomEscape/Content/NewMap_BuiltData.uasset b/RoomEscape/Content/NewMap_BuiltData.uasset index 6d7aab1..d8cd034 100644 Binary files a/RoomEscape/Content/NewMap_BuiltData.uasset and b/RoomEscape/Content/NewMap_BuiltData.uasset differ diff --git a/RoomEscape/RoomEscape.sln b/RoomEscape/RoomEscape.sln index 82fac93..e3d4ce1 100644 --- a/RoomEscape/RoomEscape.sln +++ b/RoomEscape/RoomEscape.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 14 for Windows Desktop -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 14 +VisualStudioVersion = 14.0.22310.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{F4BD4068-68D5-4675-885B-C2DA065084A7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{B94F83BB-A217-4E8A-9D8F-550B432C6F36}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{AED6B234-1A85-408C-8AC4-EE14989AA14E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{3303E7EA-1D97-464D-93BD-03B9F4D4D40F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UE4", "Intermediate\ProjectFiles\UE4.vcxproj", "{BCBDD694-9B24-4705-A00A-25B371DE9562}" EndProject @@ -35,46 +35,6 @@ Global Shipping|Win64 = Shipping|Win64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|IOS.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame Editor|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|IOS.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.DebugGame|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|IOS.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development Editor|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|IOS.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Development|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|HTML5.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|HTML5.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|IOS.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|IOS.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|Win32.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|Win32.Build.0 = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|Win64.ActiveCfg = BuiltWithUnrealBuildTool|Win32 - {BCBDD694-9B24-4705-A00A-25B371DE9562}.Shipping|Win64.Build.0 = BuiltWithUnrealBuildTool|Win32 {98C809B8-5AA6-41E8-A735-606F2371F502}.DebugGame Editor|HTML5.ActiveCfg = HTML5_DebugGame_Editor|Win32 {98C809B8-5AA6-41E8-A735-606F2371F502}.DebugGame Editor|IOS.ActiveCfg = IOS_DebugGame_Editor|Win32 {98C809B8-5AA6-41E8-A735-606F2371F502}.DebugGame Editor|Win32.ActiveCfg = DebugGame_Editor|Win32 @@ -114,7 +74,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {BCBDD694-9B24-4705-A00A-25B371DE9562} = {F4BD4068-68D5-4675-885B-C2DA065084A7} - {98C809B8-5AA6-41E8-A735-606F2371F502} = {AED6B234-1A85-408C-8AC4-EE14989AA14E} + {BCBDD694-9B24-4705-A00A-25B371DE9562} = {B94F83BB-A217-4E8A-9D8F-550B432C6F36} + {98C809B8-5AA6-41E8-A735-606F2371F502} = {3303E7EA-1D97-464D-93BD-03B9F4D4D40F} EndGlobalSection EndGlobal diff --git a/RoomEscape/RoomEscape.uproject b/RoomEscape/RoomEscape.uproject index 47299d8..d8adde7 100644 --- a/RoomEscape/RoomEscape.uproject +++ b/RoomEscape/RoomEscape.uproject @@ -7,7 +7,10 @@ { "Name": "RoomEscape", "Type": "Runtime", - "LoadingPhase": "Default" + "LoadingPhase": "Default", + "AdditionalDependencies": [ + "Engine" + ] } ] } \ No newline at end of file diff --git a/RoomEscape/Source/RoomEscape/PositionReport.cpp b/RoomEscape/Source/RoomEscape/PositionReport.cpp new file mode 100644 index 0000000..a3c6994 --- /dev/null +++ b/RoomEscape/Source/RoomEscape/PositionReport.cpp @@ -0,0 +1,34 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#include "PositionReport.h" + + +// Sets default values for this component's properties +UPositionReport::UPositionReport() +{ + // Set this component to be initialized when the game starts, and to be ticked every frame. You can turn these features + // off to improve performance if you don't need them. + PrimaryComponentTick.bCanEverTick = true; + + // ... +} + + +// Called when the game starts +void UPositionReport::BeginPlay() +{ + Super::BeginPlay(); + + // ... + +} + + +// Called every frame +void UPositionReport::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) +{ + Super::TickComponent(DeltaTime, TickType, ThisTickFunction); + + // ... +} + diff --git a/RoomEscape/Source/RoomEscape/PositionReport.h b/RoomEscape/Source/RoomEscape/PositionReport.h new file mode 100644 index 0000000..f2f40ca --- /dev/null +++ b/RoomEscape/Source/RoomEscape/PositionReport.h @@ -0,0 +1,24 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/ActorComponent.h" +#include "PositionReport.generated.h" // should always be last. + + +UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) +class ROOMESCAPE_API UPositionReport : public UActorComponent +{ + GENERATED_BODY() + +public: + // Sets default values for this component's properties + UPositionReport(); + // Called every frame + virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override; + +protected: + // Called when the game starts + virtual void BeginPlay() override; +};