From 94f45d99c3d04e0237f1b134b01a57f31f6f21aa Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Fri, 21 Apr 2023 02:57:18 +0100 Subject: [PATCH] Added Combat UI Asset for World Space --- .../WaterMaterial/Water_thingg.uasset | 4 ++-- .../TutorialAssets/Materials/M_Bones.uasset | 4 ++-- .../Materials/M_ClosedBook.uasset | 4 ++-- .../Materials/M_RibCage_Hand.uasset | 4 ++-- .../TutorialAssets/Materials/M_Skull.uasset | 4 ++-- .../Blueprints/Combat_UI/BookCombat_UI.uasset | 3 +++ .../Combat_UI/BookWorldWidget.uasset | 3 +++ .../Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Blueprints/Combat_UI/Combat_UI.uasset | 4 ++-- .../Combat_UI/Widget3DPassThrough.uasset | 3 +++ .../Combat_UI/Widget3DPassThrough_Inst.uasset | 3 +++ Content/Levels/Build.umap | 4 ++-- .../the_twilight_abyss/OpeningTextHandler.cpp | 5 ----- .../the_twilight_abyss/OpeningTextHandler.h | 20 ------------------- 14 files changed, 28 insertions(+), 41 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/BookCombat_UI.uasset create mode 100644 Content/Blueprints/Combat_UI/BookWorldWidget.uasset create mode 100644 Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset create mode 100644 Content/Blueprints/Combat_UI/Widget3DPassThrough_Inst.uasset delete mode 100644 Source/the_twilight_abyss/OpeningTextHandler.cpp delete mode 100644 Source/the_twilight_abyss/OpeningTextHandler.h diff --git a/Content/Assets/Objects/Updated_level_map/WaterMaterial/Water_thingg.uasset b/Content/Assets/Objects/Updated_level_map/WaterMaterial/Water_thingg.uasset index 148937d..c26ddf9 100644 --- a/Content/Assets/Objects/Updated_level_map/WaterMaterial/Water_thingg.uasset +++ b/Content/Assets/Objects/Updated_level_map/WaterMaterial/Water_thingg.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a00cfab65b3106e735c643272c25c9ca08132b383d757dfcf73016014a659cd2 -size 8839 +oid sha256:9e5ee202f5aec9ebfe3e778eabf40270755ebcd06ca71b5e4843c16fc002262d +size 8812 diff --git a/Content/Assets/TutorialAssets/Materials/M_Bones.uasset b/Content/Assets/TutorialAssets/Materials/M_Bones.uasset index b1eeb78..4c6ab26 100644 --- a/Content/Assets/TutorialAssets/Materials/M_Bones.uasset +++ b/Content/Assets/TutorialAssets/Materials/M_Bones.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69a0c3555e9edbf0251baf57f864bc7daf8e978c426053cef90f9ea2890e685a -size 11656 +oid sha256:fdd5b5f9e215909c55d486abbce20e89653f88e2c31fa29441ddb1b396e3f69a +size 11328 diff --git a/Content/Assets/TutorialAssets/Materials/M_ClosedBook.uasset b/Content/Assets/TutorialAssets/Materials/M_ClosedBook.uasset index d134908..0b8d8c7 100644 --- a/Content/Assets/TutorialAssets/Materials/M_ClosedBook.uasset +++ b/Content/Assets/TutorialAssets/Materials/M_ClosedBook.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbce314730c3be54a730df9a2d1ca1f9811bb1d59fac94544949af97b5b5fc5e -size 15277 +oid sha256:2703f009759767373b23c19034e642039703e481c6804f859bb3292fe03e31aa +size 12346 diff --git a/Content/Assets/TutorialAssets/Materials/M_RibCage_Hand.uasset b/Content/Assets/TutorialAssets/Materials/M_RibCage_Hand.uasset index 2400957..4b2d22c 100644 --- a/Content/Assets/TutorialAssets/Materials/M_RibCage_Hand.uasset +++ b/Content/Assets/TutorialAssets/Materials/M_RibCage_Hand.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5ca7332906dc45c6803f63b1a05ff76a763883187a449f90d506bd1df426deb -size 15502 +oid sha256:9bf003e3dee4a4794385df2b943124f44ee70bc336ba04e39d0923bf1fde745a +size 14002 diff --git a/Content/Assets/TutorialAssets/Materials/M_Skull.uasset b/Content/Assets/TutorialAssets/Materials/M_Skull.uasset index 1c57ae4..6dcab65 100644 --- a/Content/Assets/TutorialAssets/Materials/M_Skull.uasset +++ b/Content/Assets/TutorialAssets/Materials/M_Skull.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:134a8c6d1c4f61a1d8b52e4f12f830994b1d36928e3cf6ff0366c9b6f5bd23b0 -size 13433 +oid sha256:d0e3c77972f65e91948cf2e43424b7f35910710c01d377086a401c08e9e96661 +size 11708 diff --git a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset new file mode 100644 index 0000000..c624f15 --- /dev/null +++ b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d57607a898225569eabcc855beb990269ce5ba4779b26c62c7b6c31d07611645 +size 49372 diff --git a/Content/Blueprints/Combat_UI/BookWorldWidget.uasset b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset new file mode 100644 index 0000000..27542e5 --- /dev/null +++ b/Content/Blueprints/Combat_UI/BookWorldWidget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df5d8b3aeb9cd7bcbe0d78c90f2a7278f6133c89b58600fee8e8f7b63f7dcbda +size 23477 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 0e9b3ef..d1994e4 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36cb804c3e48dcc3fc7f12ec9696c58c03e22880be0b9fc1a1444bcb983be508 -size 127911 +oid sha256:7f5c422149980fd84aae6d5e3c93acb836034a66de360907cfedbc5b9384ce77 +size 129743 diff --git a/Content/Blueprints/Combat_UI/Combat_UI.uasset b/Content/Blueprints/Combat_UI/Combat_UI.uasset index 31b7af3..17f3528 100644 --- a/Content/Blueprints/Combat_UI/Combat_UI.uasset +++ b/Content/Blueprints/Combat_UI/Combat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31f21c1e4bc1c7554c74708b138c993d12ff7f2a811099eabc2120a3394e7b25 -size 83299 +oid sha256:9a424991fcd6608754b8ccbac1016d9f1bf344a311e0228ddcbcd3fad10018d9 +size 80703 diff --git a/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset b/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset new file mode 100644 index 0000000..890ae88 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Widget3DPassThrough.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80185348ae756e23935a315876652656c86e7f82c9d717db5d14bf86d9a10f30 +size 14949 diff --git a/Content/Blueprints/Combat_UI/Widget3DPassThrough_Inst.uasset b/Content/Blueprints/Combat_UI/Widget3DPassThrough_Inst.uasset new file mode 100644 index 0000000..c4a826c --- /dev/null +++ b/Content/Blueprints/Combat_UI/Widget3DPassThrough_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1d382cdcb6c3cee8d550dba3fcd57a817b5b8ae497c20d1e4043b552725c2f8 +size 9019 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index bc321ed..ac4fa4e 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:976be4d3e39bab2f37f5668eaa265dbb64eadf90d45fc523f2ce544652b52ed9 -size 3531946 +oid sha256:47ec4dbf25f1d938f5d58575db94b9cde2fcb448d212671bf2adb3b9429669c0 +size 3474962 diff --git a/Source/the_twilight_abyss/OpeningTextHandler.cpp b/Source/the_twilight_abyss/OpeningTextHandler.cpp deleted file mode 100644 index 06b1ce9..0000000 --- a/Source/the_twilight_abyss/OpeningTextHandler.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "OpeningTextHandler.h" - diff --git a/Source/the_twilight_abyss/OpeningTextHandler.h b/Source/the_twilight_abyss/OpeningTextHandler.h deleted file mode 100644 index 31976bc..0000000 --- a/Source/the_twilight_abyss/OpeningTextHandler.h +++ /dev/null @@ -1,20 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "Blueprint/UserWidget.h" -#include "OpeningTextHandler.generated.h" - -/** - * - */ -UCLASS() -class THE_TWILIGHT_ABYSS_API UOpeningTextHandler : public UUserWidget -{ - GENERATED_BODY() - -public: - // Sets default values for this actor's properties - UOpeningTextHandler(); -};