diff --git a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset index 218e2d7..757d9fd 100644 --- a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset +++ b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6aea2b49abbfdd1ac0da1147e3419e5f6410fa4e940075c7e56262d90c703fb2 -size 23653 +oid sha256:38d13fd9a0a0a9c0af31988193b77e896f955dbe157f27653ad3e71b1d0c7307 +size 23737 diff --git a/Content/Blueprints/Game_UI/WBP_IntroText.uasset b/Content/Blueprints/Game_UI/WBP_IntroText.uasset index a87fa21..b6b8bcb 100644 --- a/Content/Blueprints/Game_UI/WBP_IntroText.uasset +++ b/Content/Blueprints/Game_UI/WBP_IntroText.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ca740590a87dd60ef7d9cc53cfa1aa0b0c13bae1c5b79c0b88ef44b830c428c -size 51485 +oid sha256:7b64b40d6029e1eec678723c595583809765c4e87103ad5a6a28b78b180e4a75 +size 52656 diff --git a/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset b/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset new file mode 100644 index 0000000..360d9a7 --- /dev/null +++ b/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64b4fa7276600fa716b70bcaecf262436ca9aa2a7d7f7504f18a67c1137e6d7e +size 30519 diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset new file mode 100644 index 0000000..28b45c0 --- /dev/null +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7488f4b0c0d0d84b3ef2b1c5646c729a43998a0090e39f381b90b0ac0108a5f6 +size 32960 diff --git a/Content/Levels/Build1.umap b/Content/Levels/Build1.umap new file mode 100644 index 0000000..f0cc717 --- /dev/null +++ b/Content/Levels/Build1.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f3b2c5a2b47ee8d2c90591de82524910ff28f2c2ccb0119676d1d4f0aa133ec +size 3469312 diff --git a/Content/Levels/Testing/MainMenuLevel.umap b/Content/Levels/Testing/MainMenuLevel.umap new file mode 100644 index 0000000..8d965f9 --- /dev/null +++ b/Content/Levels/Testing/MainMenuLevel.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f104ad48364df3027e84b0b07b0b2b4e1a3f49fd2367854c0f56fb291fb2f2f4 +size 46616 diff --git a/Content/Levels/Testing/SneakMechanicTesting.umap b/Content/Levels/Testing/SneakMechanicTesting.umap index d03d5bc..2aa3f0f 100644 --- a/Content/Levels/Testing/SneakMechanicTesting.umap +++ b/Content/Levels/Testing/SneakMechanicTesting.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28cf4d02ed1f503e4a0eea83f56ca42cd8a2c0406d2eb8cb756f77e1834db6e1 -size 38205 +oid sha256:b8970c52070cfb3ac10d10081543f720c12b73b6a89b9e2554e4a6f13c8b48aa +size 46908 diff --git a/Content/MainMenu/GM_MainMenu.uasset b/Content/MainMenu/GM_MainMenu.uasset index 44fe9e2..620ce82 100644 --- a/Content/MainMenu/GM_MainMenu.uasset +++ b/Content/MainMenu/GM_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cf2f5360fb0a3e331064edf993da7e191e74c0d81ab438854946de85141fa11 -size 40074 +oid sha256:ce4b8d801d550a156377fbb74e7a85202d40bb14d457fd319fdf993ed0835b63 +size 40055 diff --git a/Content/Particles/Break.uasset b/Content/Particles/Break.uasset index 5994e34..91232ee 100644 --- a/Content/Particles/Break.uasset +++ b/Content/Particles/Break.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:656992a724aabc3ae0f6e79a7797ca5075b13b8583509fb89106d6400e61e89d -size 4064184 +oid sha256:09fd7221bd7e040d6aef0b51db01170cbfcb7a02791c3be24b4de116aa39f08d +size 4051601 diff --git a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp index 7d152ac..a3ee695 100644 --- a/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp +++ b/Source/the_twilight_abyss/MerchantInteraction/Interaction.cpp @@ -25,8 +25,8 @@ void AInteraction::BeginPlay() Super::BeginPlay(); //Character & Camera refs - TempCharacterRef = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()); - MainCamera = Cast(TempCharacterRef->FindComponentByClass()); + if (TempCharacterRef != nullptr) TempCharacterRef = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()); + if (MainCamera != nullptr) MainCamera = Cast(TempCharacterRef->FindComponentByClass()); //Item refs TargetHealingLocation = HealingItem->GetActorLocation();