From fab7a72b84455fea451f2086bf4b0d14a4ec84f1 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Sun, 30 Apr 2023 15:14:59 +0100 Subject: [PATCH 01/13] Updated MainMenu Scene to have a background Added new assets to the mainmenu to make it look better behind the book --- Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset | 4 ++-- Content/Blueprints/MainMenu/BP_MainMenuBook.uasset | 4 ++-- Content/Levels/Testing/MainMenuLevel.umap | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset b/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset index 2e5ce8e..4c26a94 100644 --- a/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset +++ b/Content/Blueprints/Combat_UI/Gun/M_BookOpen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:690322bb8a873e6f8a3c3ee34bd40c4bb592ff7953512317bc3f1988aa3db592 -size 33624 +oid sha256:e0d1e888177d28043278945c03ab4d88baa554b5d7578c13ef1fd2ae3d21fc81 +size 33674 diff --git a/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset b/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset index 360d9a7..a6a01a5 100644 --- a/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset +++ b/Content/Blueprints/MainMenu/BP_MainMenuBook.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64b4fa7276600fa716b70bcaecf262436ca9aa2a7d7f7504f18a67c1137e6d7e -size 30519 +oid sha256:3723facc2c1ec1661abd5c84967c0e09a6a8b53b22fc607e48f54f9bd8c618f9 +size 27803 diff --git a/Content/Levels/Testing/MainMenuLevel.umap b/Content/Levels/Testing/MainMenuLevel.umap index 8d965f9..2e61d58 100644 --- a/Content/Levels/Testing/MainMenuLevel.umap +++ b/Content/Levels/Testing/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f104ad48364df3027e84b0b07b0b2b4e1a3f49fd2367854c0f56fb291fb2f2f4 -size 46616 +oid sha256:9187d6d1ae246d0bdcdd1f46a34c42daeb27d696e2df3a5dcd41e308be09fc60 +size 94995 From cc8f605bfa0e3a3c9f312ac2bdcbfa7542122d4f Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Sun, 30 Apr 2023 15:15:11 +0100 Subject: [PATCH 02/13] Material changes to mainmenu assets --- .../MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset | 4 ++-- .../M_MS_Imperfection_Material.uasset | 4 ++-- .../M_MS_Imperfection_Material_Var.uasset | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset b/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset index 5e047ec..639827f 100644 --- a/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset +++ b/Content/MSPresets/M_MS_Glass_Material/M_MS_Glass_Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:891fa66c3e8e901af662589756b9768e99ed239a360c65bb77d34ebae21810ec -size 23736 +oid sha256:24944ffbfb9b0f9a3ce0effdf8f0cecbd7a9c82072e430666e5d60cd13bd8e97 +size 25115 diff --git a/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset b/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset index 0ad440a..5128600 100644 --- a/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset +++ b/Content/MSPresets/M_MS_Imperfection_Material/M_MS_Imperfection_Material.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:250a38741dfcb64d000cbe79c814d308dea54adb07d8d79505a6bdb6a6b0dd18 -size 24732 +oid sha256:7a1abcd66444c05291a4ec88a86d0e6054540182633b3158139418a78ea1e628 +size 102359 diff --git a/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset b/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset index 690d7d4..c7bb5bf 100644 --- a/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset +++ b/Content/MSPresets/M_MS_Imperfection_Material_Var/M_MS_Imperfection_Material_Var.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fd08443268bfc87fb968d7cc1a897c3776eeb2162ab6dc2f50be9ad607b7455 -size 23265 +oid sha256:06159d8967807ba3d3fc703b5ed1fbfa7f944788b9e6e56c131f8292ce41eb4e +size 148356 From be4625da17ad44a2b1cbaa1a61fce897037fb1a2 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Sun, 30 Apr 2023 15:15:27 +0100 Subject: [PATCH 03/13] Imported megascans for textures and nature assets for mainmenu --- .../Beach_Cliff_wdqiedw/MI_Beach_Cliff_wdqiedw_1K.uasset | 3 +++ .../Beach_Cliff_wdqiedw/S_Beach_Cliff_wdqiedw_lod5_Var1.uasset | 3 +++ .../Beach_Cliff_wdqiedw/T_BeachCliff_wdqiedw_1K_DpR.uasset | 3 +++ .../Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_D.uasset | 3 +++ .../Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_N.uasset | 3 +++ .../MI_Mine_Rock_Wall_ueknfaclw_1K.uasset | 3 +++ .../MI_Mine_Rock_Wall_ueknfaclw_4K.uasset | 3 +++ .../T_MineRockWall_ueknfaclw_1K_ORDp.uasset | 3 +++ .../T_MineRockWall_ueknfaclw_4K_ORDp.uasset | 3 +++ .../T_Mine_Rock_Wall_ueknfaclw_1K_D.uasset | 3 +++ .../T_Mine_Rock_Wall_ueknfaclw_1K_N.uasset | 3 +++ .../T_Mine_Rock_Wall_ueknfaclw_4K_D.uasset | 3 +++ .../T_Mine_Rock_Wall_ueknfaclw_4K_N.uasset | 3 +++ 13 files changed, 39 insertions(+) create mode 100644 Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/MI_Beach_Cliff_wdqiedw_1K.uasset create mode 100644 Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/S_Beach_Cliff_wdqiedw_lod5_Var1.uasset create mode 100644 Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_BeachCliff_wdqiedw_1K_DpR.uasset create mode 100644 Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_D.uasset create mode 100644 Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_N.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_1K.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_4K.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_1K_ORDp.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_4K_ORDp.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_D.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_N.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_D.uasset create mode 100644 Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_N.uasset diff --git a/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/MI_Beach_Cliff_wdqiedw_1K.uasset b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/MI_Beach_Cliff_wdqiedw_1K.uasset new file mode 100644 index 0000000..f0ced08 --- /dev/null +++ b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/MI_Beach_Cliff_wdqiedw_1K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c98ca0c28f8b280179a27cce20f5a4a23270fa62179b44e825e686a6b43a77 +size 3848 diff --git a/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/S_Beach_Cliff_wdqiedw_lod5_Var1.uasset b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/S_Beach_Cliff_wdqiedw_lod5_Var1.uasset new file mode 100644 index 0000000..6910569 --- /dev/null +++ b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/S_Beach_Cliff_wdqiedw_lod5_Var1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c287baf7ebe96f3c4e5339dbf54eb822bc6bff0873fcf1b91fbe34ee50b4ffb +size 44871 diff --git a/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_BeachCliff_wdqiedw_1K_DpR.uasset b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_BeachCliff_wdqiedw_1K_DpR.uasset new file mode 100644 index 0000000..1993e91 --- /dev/null +++ b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_BeachCliff_wdqiedw_1K_DpR.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f40fbc5fe8d56eeae1bf030f06ed36a819889d239a65eabb66b1f6855cdc0156 +size 2596595 diff --git a/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_D.uasset b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_D.uasset new file mode 100644 index 0000000..d8347d8 --- /dev/null +++ b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1adb1ffe78780b942e643a36f04c8990e9f5f127496dda540f77246b23a8ebd +size 5495948 diff --git a/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_N.uasset b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_N.uasset new file mode 100644 index 0000000..af814ba --- /dev/null +++ b/Content/Megascans/3D_Assets/Beach_Cliff_wdqiedw/T_Beach_Cliff_wdqiedw_1K_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e6159605ebc7d9aa2d26bbc4155ce8df7619fb8ae91d91c86ae48196b2c5936 +size 5503914 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_1K.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_1K.uasset new file mode 100644 index 0000000..db99281 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_1K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de54d0d5fb8dc28c02878ce8bf70914fd73f7ea50a9523f0339bd9c5eddd54fe +size 14636 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_4K.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_4K.uasset new file mode 100644 index 0000000..afbb255 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/MI_Mine_Rock_Wall_ueknfaclw_4K.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b77eb6091c9455e5eec4157c5a9704bd4a609d3493f7331100a1d08dffd63e7 +size 3910 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_1K_ORDp.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_1K_ORDp.uasset new file mode 100644 index 0000000..792ff94 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_1K_ORDp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e36394e39e04c8371cab70e7b80c204af628a78322d9b5aa9866163a0bc7de03 +size 4712808 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_4K_ORDp.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_4K_ORDp.uasset new file mode 100644 index 0000000..c8e3a46 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_MineRockWall_ueknfaclw_4K_ORDp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a7c02be39f8678d4c0091886e7c898939c0a4af5ef9ba345ce148ff7a0ce720 +size 74249049 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_D.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_D.uasset new file mode 100644 index 0000000..188bbb7 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da846e1917d09709476bb5ff2bd461df6f71f4cfc651adc9496ca9b193cc950e +size 5650964 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_N.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_N.uasset new file mode 100644 index 0000000..5d40d1f --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_1K_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a842dcb77557e90521bf10cc271f7807d36d97396c45cd98c27201bb2e247ba1 +size 5474296 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_D.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_D.uasset new file mode 100644 index 0000000..d1c27f2 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_D.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce016d1adf55b0fadbae6fc583939f4933961beb4ac4a028df4b18bdab24b718 +size 91567241 diff --git a/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_N.uasset b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_N.uasset new file mode 100644 index 0000000..5aa1645 --- /dev/null +++ b/Content/Megascans/Surfaces/Mine_Rock_Wall_ueknfaclw/T_Mine_Rock_Wall_ueknfaclw_4K_N.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d39e865407a64b3cb5732486798fa6bf873ba4d3adc22ba89351f6fe83de2ac +size 87035625 From 172686eebd36409e1208ca60dbc2a4bbd178f9c5 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Sun, 30 Apr 2023 15:15:39 +0100 Subject: [PATCH 04/13] Updated CrystalMaterial for mainmenu crystals --- Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset | 4 ++-- Content/Assets/Objects/Crystal/CrystalMat_GlowMainMenu.uasset | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 Content/Assets/Objects/Crystal/CrystalMat_GlowMainMenu.uasset diff --git a/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset b/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset index 2f407fd..0ff61d3 100644 --- a/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset +++ b/Content/Assets/Objects/Crystal/CrystalMatGlow_Instance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7c5f1c5497541bff4ac3063565d8b35b6542af3127feda642e61e535d03956e -size 8942 +oid sha256:06d2a69a664df8133240e6c9989b4da6bc687006a10123eac279ca42dcda94a2 +size 8752 diff --git a/Content/Assets/Objects/Crystal/CrystalMat_GlowMainMenu.uasset b/Content/Assets/Objects/Crystal/CrystalMat_GlowMainMenu.uasset new file mode 100644 index 0000000..6e79a2a --- /dev/null +++ b/Content/Assets/Objects/Crystal/CrystalMat_GlowMainMenu.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:026dfada3b2827f50c20f18c86d62ae28f38d838a43e35a2b786e3456d25b975 +size 9317 From c5990be70cbbbac315d4fbb6626f1573bb4f6d45 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Sun, 30 Apr 2023 15:18:58 +0100 Subject: [PATCH 05/13] Updated MainMenu buttons to be more spaced out Built lighting and updated mainmenu to be more spaced out --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- Content/Levels/Testing/MainMenuLevel.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 28b45c0..04b8924 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7488f4b0c0d0d84b3ef2b1c5646c729a43998a0090e39f381b90b0ac0108a5f6 -size 32960 +oid sha256:10d7bc95b084dc64c678bd62ad083dcf64d9c2be11d78045b07f6dd70162f806 +size 33017 diff --git a/Content/Levels/Testing/MainMenuLevel.umap b/Content/Levels/Testing/MainMenuLevel.umap index 2e61d58..6dccf3a 100644 --- a/Content/Levels/Testing/MainMenuLevel.umap +++ b/Content/Levels/Testing/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9187d6d1ae246d0bdcdd1f46a34c42daeb27d696e2df3a5dcd41e308be09fc60 -size 94995 +oid sha256:f02dfd09aea90bf5f2e984532b4190a57b9220ef2d3d90cf14de4786ec280928 +size 96243 From 164c9f6b030fc7de5c6ba51f1a87616220651aff Mon Sep 17 00:00:00 2001 From: cs260086 Date: Sun, 30 Apr 2023 16:34:28 +0100 Subject: [PATCH 06/13] Created folder for settings UI + UI Icons Added Icons for Play, Settings and Quit --- UI designs/Settings_UI/play_icon.png | 3 +++ UI designs/Settings_UI/quit_button.png | 3 +++ UI designs/Settings_UI/settings_button.png | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 UI designs/Settings_UI/play_icon.png create mode 100644 UI designs/Settings_UI/quit_button.png create mode 100644 UI designs/Settings_UI/settings_button.png diff --git a/UI designs/Settings_UI/play_icon.png b/UI designs/Settings_UI/play_icon.png new file mode 100644 index 0000000..c5ddd4d --- /dev/null +++ b/UI designs/Settings_UI/play_icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d17a2224d43291d0b03d8ed246b17b22059d81eb3cfc5f14dfe6a084b53b28fb +size 111260 diff --git a/UI designs/Settings_UI/quit_button.png b/UI designs/Settings_UI/quit_button.png new file mode 100644 index 0000000..fc3292a --- /dev/null +++ b/UI designs/Settings_UI/quit_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:703b601e3605b844d8f9beb7df038330a5bbe22efca07e46b648dc9a7f09ace6 +size 97881 diff --git a/UI designs/Settings_UI/settings_button.png b/UI designs/Settings_UI/settings_button.png new file mode 100644 index 0000000..ff897d0 --- /dev/null +++ b/UI designs/Settings_UI/settings_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db72674b1f8def835d9701b6fc4c88c5fccc30bc2c0da8f0344ed9aae721baa0 +size 143894 From 9295fa2fbca6774b1ed0c1448a02c6855f3a6885 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Mon, 1 May 2023 23:22:26 +0100 Subject: [PATCH 07/13] Imported Play,Quit,Settings icon and applied to mainmenu --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- Content/Images/play_icon.uasset | 3 +++ Content/Images/quit_button.uasset | 3 +++ Content/Images/settings_button.uasset | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 Content/Images/play_icon.uasset create mode 100644 Content/Images/quit_button.uasset create mode 100644 Content/Images/settings_button.uasset diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 04b8924..d78a218 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10d7bc95b084dc64c678bd62ad083dcf64d9c2be11d78045b07f6dd70162f806 -size 33017 +oid sha256:d56dff79ef8247250712af80d89e4eb339dcfec2fd8b1321e050d81de73ab8ce +size 34055 diff --git a/Content/Images/play_icon.uasset b/Content/Images/play_icon.uasset new file mode 100644 index 0000000..41696c9 --- /dev/null +++ b/Content/Images/play_icon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325bd4f9e614317c0cee9ab3a800771a0889b6dcc3502067e46ab9c27caf62b5 +size 125232 diff --git a/Content/Images/quit_button.uasset b/Content/Images/quit_button.uasset new file mode 100644 index 0000000..d296385 --- /dev/null +++ b/Content/Images/quit_button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:154c3b603fbf1da2117bbf513eb22ba942d1a6e7ec05dfffbd9016c0e46268f1 +size 114794 diff --git a/Content/Images/settings_button.uasset b/Content/Images/settings_button.uasset new file mode 100644 index 0000000..cb50f49 --- /dev/null +++ b/Content/Images/settings_button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8880d57ae439fdfe589b291e072c7e40de3d2bfa5eba2880874fbf210aa40a12 +size 161538 From a5c410063a7651da157ba307771f7d0b6ae5cd4a Mon Sep 17 00:00:00 2001 From: cs260086 Date: Wed, 3 May 2023 15:07:45 +0100 Subject: [PATCH 08/13] Added Icon borders Borders have been added without text for animation purposes --- UI designs/Settings_UI/playborder_icon.png | 3 +++ UI designs/Settings_UI/quitborder_button.png | 3 +++ UI designs/Settings_UI/settingsborder_button.png | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 UI designs/Settings_UI/playborder_icon.png create mode 100644 UI designs/Settings_UI/quitborder_button.png create mode 100644 UI designs/Settings_UI/settingsborder_button.png diff --git a/UI designs/Settings_UI/playborder_icon.png b/UI designs/Settings_UI/playborder_icon.png new file mode 100644 index 0000000..fc0a77d --- /dev/null +++ b/UI designs/Settings_UI/playborder_icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27cdaff31f0112086527c150c5d5492ae7456c3c22244f73fd0ff6b42d2add3c +size 46650 diff --git a/UI designs/Settings_UI/quitborder_button.png b/UI designs/Settings_UI/quitborder_button.png new file mode 100644 index 0000000..7f2207f --- /dev/null +++ b/UI designs/Settings_UI/quitborder_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75e28880d3b40769332a9a25ccbe19a711010e539bf882dcec164179433e3c39 +size 53141 diff --git a/UI designs/Settings_UI/settingsborder_button.png b/UI designs/Settings_UI/settingsborder_button.png new file mode 100644 index 0000000..637c19f --- /dev/null +++ b/UI designs/Settings_UI/settingsborder_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:481d18fd7b62b7691a1057deb38ab0e04a1ce2e0ee8bf5a3afc7108b82505259 +size 54651 From a82d277a263275c091d6693f9e9926cd4edae4ca Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Thu, 4 May 2023 13:41:18 +0100 Subject: [PATCH 09/13] Updated GunEffect to fix sparks not feeling realistic --- Content/Blueprints/Combat_UI/NS_GunEffect.uasset | 4 ++-- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset index 82e3abb..00b6397 100644 --- a/Content/Blueprints/Combat_UI/NS_GunEffect.uasset +++ b/Content/Blueprints/Combat_UI/NS_GunEffect.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21158f44f6eedeecd7c3f9db22e05c306e135722cb29e93cdee77a9c7ecc67d1 -size 2326094 +oid sha256:a631f6dd676e468d7609da00d26ed3719bf0c3263c96b49b33f5bec884aceb47 +size 2295050 diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index d78a218..4e763db 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d56dff79ef8247250712af80d89e4eb339dcfec2fd8b1321e050d81de73ab8ce -size 34055 +oid sha256:691aa14e06e3787f43f901fcf80f81bae32832939f2abbff9bbbdce819a1f3c4 +size 49711 From 098aa0bb74e40326e4c007532aa71e9a3a532d00 Mon Sep 17 00:00:00 2001 From: MarcelHara Date: Thu, 4 May 2023 13:56:42 +0100 Subject: [PATCH 10/13] Gave buttons functionality Play and quit works and gave settings placeholders --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- Content/Levels/Testing/MainMenuLevel.umap | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 4e763db..034df9a 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:691aa14e06e3787f43f901fcf80f81bae32832939f2abbff9bbbdce819a1f3c4 -size 49711 +oid sha256:2c4c3fd70090fcc0cf4e08f54399c320ea47375f7b0506c82e7b525ffdbeae30 +size 89545 diff --git a/Content/Levels/Testing/MainMenuLevel.umap b/Content/Levels/Testing/MainMenuLevel.umap index 6dccf3a..4b25c80 100644 --- a/Content/Levels/Testing/MainMenuLevel.umap +++ b/Content/Levels/Testing/MainMenuLevel.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f02dfd09aea90bf5f2e984532b4190a57b9220ef2d3d90cf14de4786ec280928 -size 96243 +oid sha256:c01bf96f26f232d8b410d4a3aea6cff3a025ac13a1032471410c563944ffb589 +size 95467 From 49496861a0e268b412e691e76077b8b302c6e581 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 4 May 2023 16:29:14 +0100 Subject: [PATCH 11/13] Updated Buttons to be dropdown buttons --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index 034df9a..b17089a 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c4c3fd70090fcc0cf4e08f54399c320ea47375f7b0506c82e7b525ffdbeae30 -size 89545 +oid sha256:453126df3b6770f80d94624edbd47c5da3b61d2f116850d50ce8c910850f746e +size 88663 From d69809a64e9ec7c61a32943f77dd56265eb680f8 Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 4 May 2023 17:22:01 +0100 Subject: [PATCH 12/13] Added Resolution settings functionality --- Config/DefaultEngine.ini | 2 ++ Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b374b7a..314170d 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -15,6 +15,7 @@ ManualIPAddress= [/Script/Engine.Engine] +ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +UseStaticMeshMinLODPerQualityLevels=False [/Script/EngineSettings.GameMapsSettings] EditorStartupMap=/Game/Levels/Build.Build @@ -147,4 +148,5 @@ r.DynamicGlobalIlluminationMethod=1 r.Lumen.TraceMeshSDFs=0 r.SkinCache.CompileShaders=True r.RayTracing=True +r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=True diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index b17089a..a0898cc 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:453126df3b6770f80d94624edbd47c5da3b61d2f116850d50ce8c910850f746e -size 88663 +oid sha256:53f5d096f8fc946e27cd0b5882329262d2867882bfc8c01f48c738baa071f9ad +size 193409 From b2c81bf9eb7e82ac358447f8c75335d9ea6cdc2e Mon Sep 17 00:00:00 2001 From: MARCEL HARA Date: Thu, 4 May 2023 17:57:25 +0100 Subject: [PATCH 13/13] Added Shadow settings and QOL Fixes --- Content/Blueprints/MainMenu/WBP_MainMenu.uasset | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset index a0898cc..7c4d424 100644 --- a/Content/Blueprints/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:53f5d096f8fc946e27cd0b5882329262d2867882bfc8c01f48c738baa071f9ad -size 193409 +oid sha256:0d926519e1b79d8470764b43f81d084d4f5b617d0f799f4b6acaa329a53028ff +size 236244