From 25e9a4f4fc7e8730539294ed941fd674a10b0dd7 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 1 May 2023 05:22:56 +0100 Subject: [PATCH] Updated Dialogue UI for Style Consistency --- Concept Art/Modular_test.fbx | 3 --- Content/Blueprints/Items/BP_BuffJelly.uasset | 4 ++-- .../Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset | 4 ++-- Content/Dialogue/ButtonOutline.uasset | 3 +++ Content/Dialogue/DialogueTest.umap | 2 +- Content/Dialogue/MerchantSisterHeadCut.uasset | 3 +++ Content/Dialogue/NPCTest.uasset | 4 ++-- Content/Dialogue/SM_Merchant_Blueprint.uasset | 4 ++-- Content/Dialogue/TextPrompt.uasset | 4 ++-- Content/Fonts/Adistro-8MePB.uasset | 2 +- Content/Fonts/Adistro-8MePB_Font.uasset | 2 +- Content/Fonts/Adistro-Font.uasset | 2 +- Content/Fonts/Adistro_Font.uasset | 4 ++-- Content/Fonts/AnekaSatwa-gxyo6.uasset | 3 +++ Content/Fonts/AnekaSatwa-gxyo6_Font.uasset | 3 +++ Content/Fonts/ApeMount-WyPM9.uasset | 3 +++ Content/Fonts/ApeMount-WyPM9_Font.uasset | 3 +++ Content/Fonts/ChildrenOnceWhere.uasset | 2 +- Content/Fonts/ChildrenOnceWhere_Font.uasset | 2 +- Content/Fonts/Hachicro.uasset | 2 +- Content/Fonts/Hachicro_Font.uasset | 2 +- Content/Fonts/HeyAugust.uasset | 2 +- Content/Fonts/HeyAugust_Font.uasset | 2 +- Content/Fonts/JamesStroker-jEZMO.uasset | 3 +++ Content/Fonts/JamesStroker-jEZMO_Font.uasset | 3 +++ Content/Fonts/JupiteroidRegular-Rpj6V.uasset | 3 +++ Content/Fonts/JupiteroidRegular-Rpj6V_Font.uasset | 3 +++ Content/Fonts/RandomBoys-4BW7l.uasset | 3 +++ Content/Fonts/RandomBoys-4BW7l_Font.uasset | 3 +++ Content/Fonts/RonysiswadiArchitect5-1GErv.uasset | 3 +++ Content/Fonts/RonysiswadiArchitect5-1GErv_Font.uasset | 3 +++ Content/Fonts/Winkle-Regular.uasset | 2 +- Content/Fonts/Winkle-Regular_Font.uasset | 2 +- UI designs/ButtonOutline.png | 3 +++ UI designs/MerchantSisterHeadCut.png | 3 +++ 35 files changed, 72 insertions(+), 27 deletions(-) delete mode 100644 Concept Art/Modular_test.fbx create mode 100644 Content/Dialogue/ButtonOutline.uasset create mode 100644 Content/Dialogue/MerchantSisterHeadCut.uasset create mode 100644 Content/Fonts/AnekaSatwa-gxyo6.uasset create mode 100644 Content/Fonts/AnekaSatwa-gxyo6_Font.uasset create mode 100644 Content/Fonts/ApeMount-WyPM9.uasset create mode 100644 Content/Fonts/ApeMount-WyPM9_Font.uasset create mode 100644 Content/Fonts/JamesStroker-jEZMO.uasset create mode 100644 Content/Fonts/JamesStroker-jEZMO_Font.uasset create mode 100644 Content/Fonts/JupiteroidRegular-Rpj6V.uasset create mode 100644 Content/Fonts/JupiteroidRegular-Rpj6V_Font.uasset create mode 100644 Content/Fonts/RandomBoys-4BW7l.uasset create mode 100644 Content/Fonts/RandomBoys-4BW7l_Font.uasset create mode 100644 Content/Fonts/RonysiswadiArchitect5-1GErv.uasset create mode 100644 Content/Fonts/RonysiswadiArchitect5-1GErv_Font.uasset create mode 100644 UI designs/ButtonOutline.png create mode 100644 UI designs/MerchantSisterHeadCut.png diff --git a/Concept Art/Modular_test.fbx b/Concept Art/Modular_test.fbx deleted file mode 100644 index e747ff6..0000000 --- a/Concept Art/Modular_test.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a27b18aaea5148a888ee2f090bea0aadb3ce7402ed9039297cdd3ea685c93a09 -size 24272 diff --git a/Content/Blueprints/Items/BP_BuffJelly.uasset b/Content/Blueprints/Items/BP_BuffJelly.uasset index 63db595..404dafc 100644 --- a/Content/Blueprints/Items/BP_BuffJelly.uasset +++ b/Content/Blueprints/Items/BP_BuffJelly.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7f80fdb01a8d28fe48b9df04675549ec7d8b76bea8d9e7709f31387a2ddee38 -size 6872 +oid sha256:ab916bb46e6e12675894dd19e2456111230bed31f32ec50ffe18eb6af8db4213 +size 6967 diff --git a/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset b/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset index 588829f..ae5195e 100644 --- a/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset +++ b/Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1091781ac2bfd39e2fe229b0b944d91a92345f048d3333c09a52e1d35fa8a55c -size 31313 +oid sha256:526024e1dfb99012e700ccd94a1ffd7ea21c6706f15998842d456fc42544f829 +size 29642 diff --git a/Content/Dialogue/ButtonOutline.uasset b/Content/Dialogue/ButtonOutline.uasset new file mode 100644 index 0000000..196f478 --- /dev/null +++ b/Content/Dialogue/ButtonOutline.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86bed2cc8afe3a64aaae97e49dd6c5ee40cc8ee3f5850aefb9756ee1e60edf47 +size 72257 diff --git a/Content/Dialogue/DialogueTest.umap b/Content/Dialogue/DialogueTest.umap index f0c293a..ee4b034 100644 --- a/Content/Dialogue/DialogueTest.umap +++ b/Content/Dialogue/DialogueTest.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6a9356162034744222c61ef862852d040350f8930a389993c238e814a018ff3 +oid sha256:22a10f094ea53f5668611a6c4ffc655f56a89ba71664c617d2e9a63b824fa5ee size 40317 diff --git a/Content/Dialogue/MerchantSisterHeadCut.uasset b/Content/Dialogue/MerchantSisterHeadCut.uasset new file mode 100644 index 0000000..1a75bf1 --- /dev/null +++ b/Content/Dialogue/MerchantSisterHeadCut.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c193af4cc64f710b326bb8028c622b5b63bbca08184f93bbf6a1b19eb32afdca +size 58320 diff --git a/Content/Dialogue/NPCTest.uasset b/Content/Dialogue/NPCTest.uasset index e334156..2040b46 100644 --- a/Content/Dialogue/NPCTest.uasset +++ b/Content/Dialogue/NPCTest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e9c7e12ba35a17ee147602e8f916c869f659eeea4b503b5da874ebf1b66a4c7 -size 63914 +oid sha256:0724e4c98c048039262be39dc5c58afe937f30d62f5f163d1db5f8671ce51dbf +size 63284 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index 8f198af..7f33387 100644 --- a/Content/Dialogue/SM_Merchant_Blueprint.uasset +++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a141b956a9e6a98f73dbe024e31a0cdc62ab36a6229121e4ce2d9c485fd93ff -size 75276 +oid sha256:2fbcd0c1e5a6a9e3e6b82dc866e61c650eb77d1cd5b231f7cbee66d70f223344 +size 74580 diff --git a/Content/Dialogue/TextPrompt.uasset b/Content/Dialogue/TextPrompt.uasset index 01772b4..48a535a 100644 --- a/Content/Dialogue/TextPrompt.uasset +++ b/Content/Dialogue/TextPrompt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70a4ef6a110e5f181fcdfde4ba5397b911ce22f5f704fcad74f7883967c51580 -size 45981 +oid sha256:434d3632e2e1b5967439f277fd4a8ec58b609ffc4fe2ecf2921a38fdcb8cee45 +size 59861 diff --git a/Content/Fonts/Adistro-8MePB.uasset b/Content/Fonts/Adistro-8MePB.uasset index 8704a2e..f8e19ec 100644 --- a/Content/Fonts/Adistro-8MePB.uasset +++ b/Content/Fonts/Adistro-8MePB.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a72cd30d2943bf3a5a1a388f57154f809c998c7da6f8ec67130fcf1f434c3d82 +oid sha256:8dedf9dc98a2bdedb8e6142d45a3de5620b665273dfa4cc3f785eea459b4fa88 size 30019 diff --git a/Content/Fonts/Adistro-8MePB_Font.uasset b/Content/Fonts/Adistro-8MePB_Font.uasset index 9acce29..5cc5043 100644 --- a/Content/Fonts/Adistro-8MePB_Font.uasset +++ b/Content/Fonts/Adistro-8MePB_Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7066efe908d9e18c623c1e6302c31f7349fba5db93242ec03615586f0c57fba +oid sha256:0cd464ea788b807183f03a139ba4fce7a5ba039a9aedd56538a0aa298e6f07db size 6962 diff --git a/Content/Fonts/Adistro-Font.uasset b/Content/Fonts/Adistro-Font.uasset index 576aba8..096c051 100644 --- a/Content/Fonts/Adistro-Font.uasset +++ b/Content/Fonts/Adistro-Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac1435f735481d29673ae35fa157cddbe4b697a9d7e0c624f9fe7fe653edbf43 +oid sha256:5a80b8d05935dd7a5161c7befdb42a5b6ca2319a113a40f62e9d87bfc28e2b55 size 30020 diff --git a/Content/Fonts/Adistro_Font.uasset b/Content/Fonts/Adistro_Font.uasset index 76dfd03..a93a5a2 100644 --- a/Content/Fonts/Adistro_Font.uasset +++ b/Content/Fonts/Adistro_Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c526e63d570d48d7737fb38ebdbf08e83eddcd730e93a5e3733b9dcc3bf3a86a -size 4088 +oid sha256:85d0365a169ed42ebdbe1bea15ade38e0318d03ccb783c5e837a4dbd4581b1d9 +size 5832 diff --git a/Content/Fonts/AnekaSatwa-gxyo6.uasset b/Content/Fonts/AnekaSatwa-gxyo6.uasset new file mode 100644 index 0000000..e68f24f --- /dev/null +++ b/Content/Fonts/AnekaSatwa-gxyo6.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5590f8a044d00762adde2deeae1b1590c419404ae2d85abd36ee787988fad88b +size 78590 diff --git a/Content/Fonts/AnekaSatwa-gxyo6_Font.uasset b/Content/Fonts/AnekaSatwa-gxyo6_Font.uasset new file mode 100644 index 0000000..0ec78e7 --- /dev/null +++ b/Content/Fonts/AnekaSatwa-gxyo6_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4861757440a4ea871fefda240323dcd8b92d8c1a8adce09e7a45414bc039094 +size 6793 diff --git a/Content/Fonts/ApeMount-WyPM9.uasset b/Content/Fonts/ApeMount-WyPM9.uasset new file mode 100644 index 0000000..af2d7c8 --- /dev/null +++ b/Content/Fonts/ApeMount-WyPM9.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4d0579ed6bb9704113c33025f381bc17819220ab48b3c636c83611a5fcb888d +size 78396 diff --git a/Content/Fonts/ApeMount-WyPM9_Font.uasset b/Content/Fonts/ApeMount-WyPM9_Font.uasset new file mode 100644 index 0000000..fd85c48 --- /dev/null +++ b/Content/Fonts/ApeMount-WyPM9_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba436a864b266253dfc6046c369ea7d4cfaca1b187465d7bc2d338a2df8982c9 +size 6882 diff --git a/Content/Fonts/ChildrenOnceWhere.uasset b/Content/Fonts/ChildrenOnceWhere.uasset index 0cf6869..3be8230 100644 --- a/Content/Fonts/ChildrenOnceWhere.uasset +++ b/Content/Fonts/ChildrenOnceWhere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0eb9a70a6950b194ec0276062d86fcac54408f0f85213ffd6b5a66fcbd265660 +oid sha256:85477ab1069b42f4f9f8a910868c7bc00c634aa4f96e7f9f9700f1a6453e931a size 25467 diff --git a/Content/Fonts/ChildrenOnceWhere_Font.uasset b/Content/Fonts/ChildrenOnceWhere_Font.uasset index f57f4fd..0c5b147 100644 --- a/Content/Fonts/ChildrenOnceWhere_Font.uasset +++ b/Content/Fonts/ChildrenOnceWhere_Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b31ad99fa44c867c370ee370a26d00ad39c832b337baedee8e2a84ecffb67b2b +oid sha256:8ffb03bfbdd42b766787a09db2f6762da44ac497a2bdbe04e5640be46200e191 size 7089 diff --git a/Content/Fonts/Hachicro.uasset b/Content/Fonts/Hachicro.uasset index 7a50645..a2e6356 100644 --- a/Content/Fonts/Hachicro.uasset +++ b/Content/Fonts/Hachicro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44d6aec619f1778b296492f80dd71db30fb0d893b295dc4348ca610646f036c1 +oid sha256:ab53a780f3f4df29a65fe80c9bf27529f30a165a0917d56f6a61c86cb9ed91cd size 19410 diff --git a/Content/Fonts/Hachicro_Font.uasset b/Content/Fonts/Hachicro_Font.uasset index 2bfe71c..d4b0c9a 100644 --- a/Content/Fonts/Hachicro_Font.uasset +++ b/Content/Fonts/Hachicro_Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f30cae9bd42fd926ce19351cade127923947443bcd2e4652f535e6897cc23e9f +oid sha256:fc73ed2905b41404231540dc4a3e6c2e2a764338ba0bb267528346f06dc399f6 size 7227 diff --git a/Content/Fonts/HeyAugust.uasset b/Content/Fonts/HeyAugust.uasset index 9c7cb2f..9b8a1a1 100644 --- a/Content/Fonts/HeyAugust.uasset +++ b/Content/Fonts/HeyAugust.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d95a36d1e6583a847995f6ff0ac58a6dbf8e5b1569d5015e0dcb152d78b7e2c +oid sha256:58a1c234ceb398aa29a1b49acbb9048e018cbb000121e796e0fda23a22634fcf size 261205 diff --git a/Content/Fonts/HeyAugust_Font.uasset b/Content/Fonts/HeyAugust_Font.uasset index 4958404..d3ae154 100644 --- a/Content/Fonts/HeyAugust_Font.uasset +++ b/Content/Fonts/HeyAugust_Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3820063ddc2f53216698e5ddb81b679d0e32c8b4d414589f0ffb9e5ea8c4ebe +oid sha256:68acbd407391718f074545bb32fed724d0f0ae2e6a35b324296ac604dd2d11b3 size 6843 diff --git a/Content/Fonts/JamesStroker-jEZMO.uasset b/Content/Fonts/JamesStroker-jEZMO.uasset new file mode 100644 index 0000000..50fde99 --- /dev/null +++ b/Content/Fonts/JamesStroker-jEZMO.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9fc46c9e07d313bf77e205f122182a2ab6d3499a75714c7af8795f8810d76d2 +size 136944 diff --git a/Content/Fonts/JamesStroker-jEZMO_Font.uasset b/Content/Fonts/JamesStroker-jEZMO_Font.uasset new file mode 100644 index 0000000..c61059c --- /dev/null +++ b/Content/Fonts/JamesStroker-jEZMO_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdebd2b07a9b1145b8da9795ae9952a4b521c95815de3a38f209df65f6cb98aa +size 7400 diff --git a/Content/Fonts/JupiteroidRegular-Rpj6V.uasset b/Content/Fonts/JupiteroidRegular-Rpj6V.uasset new file mode 100644 index 0000000..c4d3bdd --- /dev/null +++ b/Content/Fonts/JupiteroidRegular-Rpj6V.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8c60b3f9b96fe7ea05254d51c0142fbf43ebbd7c1fdcd7617a269f522531c83 +size 81525 diff --git a/Content/Fonts/JupiteroidRegular-Rpj6V_Font.uasset b/Content/Fonts/JupiteroidRegular-Rpj6V_Font.uasset new file mode 100644 index 0000000..9126400 --- /dev/null +++ b/Content/Fonts/JupiteroidRegular-Rpj6V_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0672ed0b82ea9399decc8130c9ae97ac7625317ca79f95822b38e60d63563dd8 +size 6871 diff --git a/Content/Fonts/RandomBoys-4BW7l.uasset b/Content/Fonts/RandomBoys-4BW7l.uasset new file mode 100644 index 0000000..a87c6d0 --- /dev/null +++ b/Content/Fonts/RandomBoys-4BW7l.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d5bf0abb0f03f04829a086375d681e3f0e7e3159b63fb5ecdefaa8b8ca2805b +size 51462 diff --git a/Content/Fonts/RandomBoys-4BW7l_Font.uasset b/Content/Fonts/RandomBoys-4BW7l_Font.uasset new file mode 100644 index 0000000..2152b82 --- /dev/null +++ b/Content/Fonts/RandomBoys-4BW7l_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74acc2d0c9b2c9128dd5b1448ad1928a075616e654f63f80ae3a9d058d9eff2c +size 7097 diff --git a/Content/Fonts/RonysiswadiArchitect5-1GErv.uasset b/Content/Fonts/RonysiswadiArchitect5-1GErv.uasset new file mode 100644 index 0000000..8fbae53 --- /dev/null +++ b/Content/Fonts/RonysiswadiArchitect5-1GErv.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e8bc33814be1bba971028d7f463fad2b4e7b9946e2d17801923d2574de39cc8 +size 18061 diff --git a/Content/Fonts/RonysiswadiArchitect5-1GErv_Font.uasset b/Content/Fonts/RonysiswadiArchitect5-1GErv_Font.uasset new file mode 100644 index 0000000..4d62f41 --- /dev/null +++ b/Content/Fonts/RonysiswadiArchitect5-1GErv_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a6091aa27d8ece17107c659e303aab9ad45fc126b7dd7d7e5188bb81c61c25 +size 6893 diff --git a/Content/Fonts/Winkle-Regular.uasset b/Content/Fonts/Winkle-Regular.uasset index 5fd8b6b..c7b923b 100644 --- a/Content/Fonts/Winkle-Regular.uasset +++ b/Content/Fonts/Winkle-Regular.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4269cc9e3ebb04a4b588b186fc832e6f2fc44e47223627b2450eb7fb875731ee +oid sha256:d0c5ea5e6ff5032e28b62faa0268a60dbb231f37823a76ba06c8c2d02a94d502 size 48878 diff --git a/Content/Fonts/Winkle-Regular_Font.uasset b/Content/Fonts/Winkle-Regular_Font.uasset index 78ed591..1f75f68 100644 --- a/Content/Fonts/Winkle-Regular_Font.uasset +++ b/Content/Fonts/Winkle-Regular_Font.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9d030b0d93827183db717e9c4917e2c4b9928fe011c7b97584dcdd0e2c29ac5 +oid sha256:e0eee75a3dbcaf6f8e28f07ee91264f6600193c2670d2c53122f8c96da0075b5 size 6709 diff --git a/UI designs/ButtonOutline.png b/UI designs/ButtonOutline.png new file mode 100644 index 0000000..55df51e --- /dev/null +++ b/UI designs/ButtonOutline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2c5538949da5ecb3fc6eed8c8b980394ad4df598866da576bca01eb9c1f5c79 +size 60510 diff --git a/UI designs/MerchantSisterHeadCut.png b/UI designs/MerchantSisterHeadCut.png new file mode 100644 index 0000000..3d3b2c4 --- /dev/null +++ b/UI designs/MerchantSisterHeadCut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:025799528684f761274d6ef8c59c5cdceb03f48248b299e41358e2211ee1d4a6 +size 47231