diff --git a/BladeSmith.sln.DotSettings.user b/BladeSmith.sln.DotSettings.user new file mode 100644 index 0000000..a1c5cf0 --- /dev/null +++ b/BladeSmith.sln.DotSettings.user @@ -0,0 +1,2 @@ + + ForceIncluded \ No newline at end of file diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 516f8ad..d3301a6 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -7,16 +7,16 @@ DirectoriesToWatch=/BladeSmith/Shaders +EditProfiles=(Name="Trigger",CustomResponses=((Channel=Projectile, Response=ECR_Ignore))) [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap +EditorStartupMap=/Game/Maps/Demo.Demo LocalMapOptions= TransitionMap= bUseSplitscreen=True TwoPlayerSplitscreenLayout=Horizontal ThreePlayerSplitscreenLayout=FavorTop GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/FirstPerson/Maps/FirstPersonMap.FirstPersonMap +GameDefaultMap=/Game/Maps/Demo.Demo ServerDefaultMap=/Engine/Maps/Entry -GlobalDefaultGameMode=/Game/FirstPerson/Blueprints/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C +GlobalDefaultGameMode=/Game/BP/BP_FirstPersonGameMode.BP_FirstPersonGameMode_C GlobalDefaultServerGameMode=None [/Script/Engine.RendererSettings] diff --git a/Content/BP/BP_FirstPersonCharacter.uasset b/Content/BP/BP_FirstPersonCharacter.uasset index 1564072..fda81c6 100644 Binary files a/Content/BP/BP_FirstPersonCharacter.uasset and b/Content/BP/BP_FirstPersonCharacter.uasset differ diff --git a/Content/BP/BP_IronBlock.uasset b/Content/BP/BP_IronBlock.uasset index d6c88a8..7b86b39 100644 Binary files a/Content/BP/BP_IronBlock.uasset and b/Content/BP/BP_IronBlock.uasset differ diff --git a/Content/Maps/Demo.umap b/Content/Maps/Demo.umap new file mode 100644 index 0000000..5c1c948 Binary files /dev/null and b/Content/Maps/Demo.umap differ diff --git a/Content/StarterContent/Architecture/Floor_400x400.uasset b/Content/StarterContent/Architecture/Floor_400x400.uasset index 601ea14..51df99a 100644 Binary files a/Content/StarterContent/Architecture/Floor_400x400.uasset and b/Content/StarterContent/Architecture/Floor_400x400.uasset differ diff --git a/Source/BladeSmith/IronBlock.cpp b/Source/BladeSmith/IronBlock.cpp index e91bb35..3f95426 100644 --- a/Source/BladeSmith/IronBlock.cpp +++ b/Source/BladeSmith/IronBlock.cpp @@ -27,7 +27,7 @@ DynMaterial(nullptr), DynCalMaterial(nullptr) { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; - + RootComponent = CreateDefaultSubobject(TEXT("Root")); StaticMeshComp = CreateDefaultSubobject(TEXT("StaticMeshComponent")); StaticMeshComp->AttachToComponent(RootComponent,FAttachmentTransformRules::SnapToTargetIncludingScale); //RootComponent = StaticMeshComp;