From 875dd76b647342dcb3dd88f04a6ee7b81ece3089 Mon Sep 17 00:00:00 2001 From: Jers Date: Wed, 13 Dec 2023 23:06:39 -0600 Subject: [PATCH] Added the initial menu refactor and fixed up some spawn spacing. Next up is fixing up the new loot menus. --- Content/Blueprints/BP_GameState.uasset | 4 ++-- Content/Blueprints/BP_PlayerController.uasset | 4 ++-- .../Blueprints/Generals/DA_TheAdmiral.uasset | 4 ++-- .../Blueprints/Generals/DA_TheVeteran.uasset | 4 ++-- Content/Blueprints/Generals/PDA_General.uasset | 4 ++-- .../Blueprints/Levels/DA_Counterattack.uasset | 4 ++-- .../Blueprints/Levels/DA_Extermination.uasset | 4 ++-- Content/Blueprints/Levels/DA_Invasion.uasset | 4 ++-- Content/Blueprints/Levels/PDA_Level.uasset | 4 ++-- Content/Blueprints/Loot/BP_GoldLoot.uasset | 4 ++-- Content/Blueprints/Loot/BP_Loot.uasset | 4 ++-- Content/Blueprints/Loot/BP_UnitLoot.uasset | 4 ++-- Content/Blueprints/UI/BP_Grid.uasset | 3 --- Content/Blueprints/UI/BorderStyle.uasset | 3 --- Content/Blueprints/UI/BorderTextArea.uasset | 3 --- Content/Blueprints/UI/ButtonStyle.uasset | 3 --- Content/Blueprints/UI/ColumnBorderStyle.uasset | 3 --- .../UI/ColumnBorderStyleActive.uasset | 3 --- .../UI/ColumnSelect/BI_ColumnData.uasset | 3 +++ .../UI/ColumnSelect/WBP_ColumnSelect_v2.uasset | 3 +++ .../ColumnSelect/WBP_SelectableColumn.uasset | 3 +++ .../Blueprints/UI/Common/BorderTextArea.uasset | 3 +++ .../Blueprints/UI/Common/ButtonStyle.uasset | 3 +++ .../UI/Common/ColumnTitleText.uasset | 3 +++ .../Blueprints/UI/Common/CommonBodyText.uasset | 3 +++ .../Blueprints/UI/Common/DT_CommonUI.uasset | 3 +++ .../UI/Common/HeaderTextStyle.uasset | 3 +++ Content/Blueprints/UI/Common/InputData.uasset | 3 +++ .../UI/Components/WBP_MenuButton.uasset | 3 +++ .../Blueprints/UI/Components/WBP_Window.uasset | 3 +++ Content/Blueprints/UI/DT_CommonUI.uasset | 3 --- .../UI/Fonts/Sublima-ExtraBold.uasset | 3 +++ .../UI/Fonts/Sublima-ExtraBold_Font.uasset | 3 +++ .../UI/Fonts/Sublima-ExtraLight.uasset | 3 +++ .../UI/Fonts/Sublima-ExtraLight_Font.uasset | 3 +++ Content/Blueprints/UI/HUD/WBP_HUD.uasset | 3 --- Content/Blueprints/UI/HeaderTextStyle.uasset | 3 --- Content/Blueprints/UI/InputData.uasset | 4 ++-- .../UI/MainMenu/BI_ColumnData.uasset | 3 --- .../UI/MainMenu/WBP_BattleMapMenu.uasset | 3 --- .../UI/MainMenu/WBP_ColumnSelect.uasset | 3 --- .../UI/MainMenu/WBP_ColumnSelectWidget.uasset | 3 --- .../UI/MainMenu/WBP_GeneralSelect.uasset | 3 --- .../UI/MainMenu/WBP_LootSelect.uasset | 3 --- .../Blueprints/UI/MainMenu/WBP_MainMenu.uasset | 4 ++-- .../UI/MainMenu/WBP_MainMenuWidget.uasset | 4 ++-- .../UI/MainMenu/WBP_StageSelect.uasset | 3 --- .../UI/Prebattle/WBP_Prebattle.uasset | 3 --- .../UI/Prebattle/WBP_UnitCard.uasset | 3 --- Content/Blueprints/UI/RegularTextStyle.uasset | 3 --- Content/Blueprints/UI/TextStyle.uasset | 4 ++-- Content/Blueprints/UI/WBP_Grid.uasset | 3 --- Content/Blueprints/UI/WBP_MenuButton.uasset | 3 --- Content/Levels/MainMenu.umap | 2 +- Content/UI/Column_Header.uasset | 3 +++ Content/UI/Images/EarthPlaceholder.uasset | 3 +++ Content/UI/Images/InvasionPlaceholder.uasset | 3 +++ Content/UI/Images/TheAdmiralplaceholder.uasset | 3 +++ Content/UI/Images/TheVeteranPlaceholder.uasset | 3 +++ .../UI/Images/exterminationplaceholder.uasset | 3 +++ Content/UI/Impact.uasset | 3 +++ Content/UI/Impact_Font.uasset | 3 +++ Content/UI/V2/Button.uasset | 3 +++ Content/UI/V2/ColumnBody.uasset | 3 +++ Content/UI/V2/ColumnHeader.uasset | 3 +++ Content/UI/V2/ColumnTextBody.uasset | 3 +++ Content/UI/arial_narrow_7.uasset | 3 +++ Content/UI/arial_narrow_7_Font.uasset | 3 +++ Source/SpaceBattler/Private/PartySubsystem.cpp | 2 +- .../Private/SBPlayerController.cpp | 4 ---- Source/SpaceBattler/Public/PartySubsystem.h | 18 +++++++++--------- .../SpaceBattler/Public/SBPlayerController.h | 16 ---------------- Source/SpaceBattler/Public/WaveSubsystem.h | 3 +++ 73 files changed, 136 insertions(+), 126 deletions(-) delete mode 100644 Content/Blueprints/UI/BP_Grid.uasset delete mode 100644 Content/Blueprints/UI/BorderStyle.uasset delete mode 100644 Content/Blueprints/UI/BorderTextArea.uasset delete mode 100644 Content/Blueprints/UI/ButtonStyle.uasset delete mode 100644 Content/Blueprints/UI/ColumnBorderStyle.uasset delete mode 100644 Content/Blueprints/UI/ColumnBorderStyleActive.uasset create mode 100644 Content/Blueprints/UI/ColumnSelect/BI_ColumnData.uasset create mode 100644 Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset create mode 100644 Content/Blueprints/UI/ColumnSelect/WBP_SelectableColumn.uasset create mode 100644 Content/Blueprints/UI/Common/BorderTextArea.uasset create mode 100644 Content/Blueprints/UI/Common/ButtonStyle.uasset create mode 100644 Content/Blueprints/UI/Common/ColumnTitleText.uasset create mode 100644 Content/Blueprints/UI/Common/CommonBodyText.uasset create mode 100644 Content/Blueprints/UI/Common/DT_CommonUI.uasset create mode 100644 Content/Blueprints/UI/Common/HeaderTextStyle.uasset create mode 100644 Content/Blueprints/UI/Common/InputData.uasset create mode 100644 Content/Blueprints/UI/Components/WBP_MenuButton.uasset create mode 100644 Content/Blueprints/UI/Components/WBP_Window.uasset delete mode 100644 Content/Blueprints/UI/DT_CommonUI.uasset create mode 100644 Content/Blueprints/UI/Fonts/Sublima-ExtraBold.uasset create mode 100644 Content/Blueprints/UI/Fonts/Sublima-ExtraBold_Font.uasset create mode 100644 Content/Blueprints/UI/Fonts/Sublima-ExtraLight.uasset create mode 100644 Content/Blueprints/UI/Fonts/Sublima-ExtraLight_Font.uasset delete mode 100644 Content/Blueprints/UI/HUD/WBP_HUD.uasset delete mode 100644 Content/Blueprints/UI/HeaderTextStyle.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/BI_ColumnData.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/WBP_BattleMapMenu.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/WBP_ColumnSelect.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/WBP_ColumnSelectWidget.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/WBP_GeneralSelect.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/WBP_LootSelect.uasset delete mode 100644 Content/Blueprints/UI/MainMenu/WBP_StageSelect.uasset delete mode 100644 Content/Blueprints/UI/Prebattle/WBP_Prebattle.uasset delete mode 100644 Content/Blueprints/UI/Prebattle/WBP_UnitCard.uasset delete mode 100644 Content/Blueprints/UI/RegularTextStyle.uasset delete mode 100644 Content/Blueprints/UI/WBP_Grid.uasset delete mode 100644 Content/Blueprints/UI/WBP_MenuButton.uasset create mode 100644 Content/UI/Column_Header.uasset create mode 100644 Content/UI/Images/EarthPlaceholder.uasset create mode 100644 Content/UI/Images/InvasionPlaceholder.uasset create mode 100644 Content/UI/Images/TheAdmiralplaceholder.uasset create mode 100644 Content/UI/Images/TheVeteranPlaceholder.uasset create mode 100644 Content/UI/Images/exterminationplaceholder.uasset create mode 100644 Content/UI/Impact.uasset create mode 100644 Content/UI/Impact_Font.uasset create mode 100644 Content/UI/V2/Button.uasset create mode 100644 Content/UI/V2/ColumnBody.uasset create mode 100644 Content/UI/V2/ColumnHeader.uasset create mode 100644 Content/UI/V2/ColumnTextBody.uasset create mode 100644 Content/UI/arial_narrow_7.uasset create mode 100644 Content/UI/arial_narrow_7_Font.uasset delete mode 100644 Source/SpaceBattler/Private/SBPlayerController.cpp delete mode 100644 Source/SpaceBattler/Public/SBPlayerController.h diff --git a/Content/Blueprints/BP_GameState.uasset b/Content/Blueprints/BP_GameState.uasset index e46f37a..e7fc42c 100644 --- a/Content/Blueprints/BP_GameState.uasset +++ b/Content/Blueprints/BP_GameState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f25b353bb71dfb576fd9ff15b24444e90115fd18f237767dacb739563a6cfda7 -size 371035 +oid sha256:1c94d253e864c937ac9c8bf5b0ae85126f4633fd1a84cba6bba20bbcc85173d4 +size 306654 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index 4e4da33..fc6e071 100644 --- a/Content/Blueprints/BP_PlayerController.uasset +++ b/Content/Blueprints/BP_PlayerController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13dedbcf0f435c4dcfcfc179ae073e150d1112c2fbe26d3e112e5b29ead10043 -size 68916 +oid sha256:cc7b4cae079dd80126d489e7cd3f42f290c73c18c7b5913fa14df47d8b155f5b +size 74298 diff --git a/Content/Blueprints/Generals/DA_TheAdmiral.uasset b/Content/Blueprints/Generals/DA_TheAdmiral.uasset index 1754bfd..2f027e7 100644 --- a/Content/Blueprints/Generals/DA_TheAdmiral.uasset +++ b/Content/Blueprints/Generals/DA_TheAdmiral.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:335e8445849101d36845d25ed616ca335c216cfa53c80027f1d8b1c9d845fae7 -size 2855 +oid sha256:ae644e328939b47070bae2acf41138d167a114a01a53a255b68de37478386510 +size 3088 diff --git a/Content/Blueprints/Generals/DA_TheVeteran.uasset b/Content/Blueprints/Generals/DA_TheVeteran.uasset index c1d9dda..8b873d8 100644 --- a/Content/Blueprints/Generals/DA_TheVeteran.uasset +++ b/Content/Blueprints/Generals/DA_TheVeteran.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd87015c053ded5ba1cb6d6016dc66333b89b8f9f6c20ce9483dd05a79c189c9 -size 2915 +oid sha256:dc1429ddf00bde378b3b67d9bc3b2bb54380bc89e22ea324b7f2cb7545b14c20 +size 3148 diff --git a/Content/Blueprints/Generals/PDA_General.uasset b/Content/Blueprints/Generals/PDA_General.uasset index 1a60438..ec9f226 100644 --- a/Content/Blueprints/Generals/PDA_General.uasset +++ b/Content/Blueprints/Generals/PDA_General.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e397f944a25dc8191a2496addae75b936aed865c496e3c23c4b08bc45109dba -size 29112 +oid sha256:6ecead741232ae93508f2a90e7b2644a36a8069eed8435d5145757e2f08fe353 +size 29941 diff --git a/Content/Blueprints/Levels/DA_Counterattack.uasset b/Content/Blueprints/Levels/DA_Counterattack.uasset index 76e8927..1885cd9 100644 --- a/Content/Blueprints/Levels/DA_Counterattack.uasset +++ b/Content/Blueprints/Levels/DA_Counterattack.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b695ef6b0781a34ba5ab3532faa41ab7e9bddd74c4130292d57a2d920ec7e14e -size 2815 +oid sha256:5bc592ed2a131938813d802343203f9d109d00ac5f94cf929e7c7c48bd771549 +size 3038 diff --git a/Content/Blueprints/Levels/DA_Extermination.uasset b/Content/Blueprints/Levels/DA_Extermination.uasset index 78044ee..50d8ed2 100644 --- a/Content/Blueprints/Levels/DA_Extermination.uasset +++ b/Content/Blueprints/Levels/DA_Extermination.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cd6f07a6e3497903d29a48384da87f88ec116a36afa7abba73a76a97aa81952a -size 2819 +oid sha256:458786455acd4b1b01f53bc3efc4334ef9e7a001808c42d9f2dc15889d79e046 +size 3058 diff --git a/Content/Blueprints/Levels/DA_Invasion.uasset b/Content/Blueprints/Levels/DA_Invasion.uasset index 5308305..fb9e657 100644 --- a/Content/Blueprints/Levels/DA_Invasion.uasset +++ b/Content/Blueprints/Levels/DA_Invasion.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41cbe66f9b8d77ea331498ad7544ad20183bc5cedb931d3da4a253abf82cf55d -size 2831 +oid sha256:360e6f8da995bcb2e67675b7e61e4cabdc17e1ab5e1d495ff48dae468f5d59b9 +size 3060 diff --git a/Content/Blueprints/Levels/PDA_Level.uasset b/Content/Blueprints/Levels/PDA_Level.uasset index a5d8ef6..246aff1 100644 --- a/Content/Blueprints/Levels/PDA_Level.uasset +++ b/Content/Blueprints/Levels/PDA_Level.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e048186a33435a0519451152a57e8eb9c62c5a387e995e61e64443d3aa1da661 -size 29086 +oid sha256:afc2c9388312888c024f7d5dca692a5e4be6f13969d560894176fc54b2c2a3e8 +size 29206 diff --git a/Content/Blueprints/Loot/BP_GoldLoot.uasset b/Content/Blueprints/Loot/BP_GoldLoot.uasset index 06524c0..85c6ec7 100644 --- a/Content/Blueprints/Loot/BP_GoldLoot.uasset +++ b/Content/Blueprints/Loot/BP_GoldLoot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49514491bf455d38608d4f11f292eeed7abe1b69d1fedd048d0dbd410d04857e -size 65282 +oid sha256:64e372e0bd93a8470b0d660631a018085d2b88246d1777aa14553fbaf916be0e +size 65191 diff --git a/Content/Blueprints/Loot/BP_Loot.uasset b/Content/Blueprints/Loot/BP_Loot.uasset index 3b67a31..38e7976 100644 --- a/Content/Blueprints/Loot/BP_Loot.uasset +++ b/Content/Blueprints/Loot/BP_Loot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3b2312b4c59be4cab11026d3ef9d31c099572a018404b0be397ff7c6b0fd78a -size 26173 +oid sha256:db6f0a3f8504f59b2ba0c0b5b203535d8491e0bc8a9e524e1e0173eb909dc5cf +size 26455 diff --git a/Content/Blueprints/Loot/BP_UnitLoot.uasset b/Content/Blueprints/Loot/BP_UnitLoot.uasset index 27f48bb..2b3e256 100644 --- a/Content/Blueprints/Loot/BP_UnitLoot.uasset +++ b/Content/Blueprints/Loot/BP_UnitLoot.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:522c9f9d49f5d0da7db9991eaaa25af74e21120f350ef185aa2fcb5ee20ef09d -size 42130 +oid sha256:331e8e19e21ded007ef9b3561b91bbaf7f1cbd2dd5ae18e6696f2a170993dead +size 42814 diff --git a/Content/Blueprints/UI/BP_Grid.uasset b/Content/Blueprints/UI/BP_Grid.uasset deleted file mode 100644 index aa5c78e..0000000 --- a/Content/Blueprints/UI/BP_Grid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34b500fb34b90b49d8d5c8d1e9b9474b58fd41c3f43e09cdc57b60785c98907c -size 23178 diff --git a/Content/Blueprints/UI/BorderStyle.uasset b/Content/Blueprints/UI/BorderStyle.uasset deleted file mode 100644 index 8faae43..0000000 --- a/Content/Blueprints/UI/BorderStyle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f97e63b79cc6d6da127f844ed3127e4bae60c19ff734c71108a456e47376162 -size 5672 diff --git a/Content/Blueprints/UI/BorderTextArea.uasset b/Content/Blueprints/UI/BorderTextArea.uasset deleted file mode 100644 index 86098ec..0000000 --- a/Content/Blueprints/UI/BorderTextArea.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8f4f6e403e229cbbb396044fedf9d17c58234cb67602248a8121ee34eb0c7a0 -size 6487 diff --git a/Content/Blueprints/UI/ButtonStyle.uasset b/Content/Blueprints/UI/ButtonStyle.uasset deleted file mode 100644 index fb0a4ab..0000000 --- a/Content/Blueprints/UI/ButtonStyle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bfd5518bbd1d971056d08867464d13a9303a07c5a706319c4ad87cdbeb9c504 -size 9095 diff --git a/Content/Blueprints/UI/ColumnBorderStyle.uasset b/Content/Blueprints/UI/ColumnBorderStyle.uasset deleted file mode 100644 index 3c852cc..0000000 --- a/Content/Blueprints/UI/ColumnBorderStyle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08f4b83a9bb9bf665883f4ce696e9f34206127cbd1b2724478b9cfec4d622945 -size 6140 diff --git a/Content/Blueprints/UI/ColumnBorderStyleActive.uasset b/Content/Blueprints/UI/ColumnBorderStyleActive.uasset deleted file mode 100644 index 7a43cde..0000000 --- a/Content/Blueprints/UI/ColumnBorderStyleActive.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f03c9d670718ce4ab4621ff1d3564248915c8009254f3638ebc3eb0415ca5a8d -size 5946 diff --git a/Content/Blueprints/UI/ColumnSelect/BI_ColumnData.uasset b/Content/Blueprints/UI/ColumnSelect/BI_ColumnData.uasset new file mode 100644 index 0000000..68d14ed --- /dev/null +++ b/Content/Blueprints/UI/ColumnSelect/BI_ColumnData.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cebd708d377fb966239af8d598f65b747ad9a652ad86e1d7c66cd975249e7e49 +size 13073 diff --git a/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset b/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset new file mode 100644 index 0000000..d6e3381 --- /dev/null +++ b/Content/Blueprints/UI/ColumnSelect/WBP_ColumnSelect_v2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28ac53392266eeb3bb73bbb5aa0bc0ed563f40fc74f1b9af296907c2cc6e6537 +size 188066 diff --git a/Content/Blueprints/UI/ColumnSelect/WBP_SelectableColumn.uasset b/Content/Blueprints/UI/ColumnSelect/WBP_SelectableColumn.uasset new file mode 100644 index 0000000..3928f76 --- /dev/null +++ b/Content/Blueprints/UI/ColumnSelect/WBP_SelectableColumn.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1f748b255b5a10f6f6a420ef0a0f3423fa4e049e1108d58be5b9362ba42182a +size 121172 diff --git a/Content/Blueprints/UI/Common/BorderTextArea.uasset b/Content/Blueprints/UI/Common/BorderTextArea.uasset new file mode 100644 index 0000000..b2c7b04 --- /dev/null +++ b/Content/Blueprints/UI/Common/BorderTextArea.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35cf1a0ae55740361264d99edd621bfe4942ee296929c4055c22b8b7afe50465 +size 6521 diff --git a/Content/Blueprints/UI/Common/ButtonStyle.uasset b/Content/Blueprints/UI/Common/ButtonStyle.uasset new file mode 100644 index 0000000..009af1f --- /dev/null +++ b/Content/Blueprints/UI/Common/ButtonStyle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e9861a2f59b1955e762ebb949a50fa74b30c9b79fe85fa02c57020446bbafe2 +size 9277 diff --git a/Content/Blueprints/UI/Common/ColumnTitleText.uasset b/Content/Blueprints/UI/Common/ColumnTitleText.uasset new file mode 100644 index 0000000..f2c1a88 --- /dev/null +++ b/Content/Blueprints/UI/Common/ColumnTitleText.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:741113750a36f1a8f08cab025ee2b76f5bb6080c034ac90ab8cf5d4b73a1cfd6 +size 6278 diff --git a/Content/Blueprints/UI/Common/CommonBodyText.uasset b/Content/Blueprints/UI/Common/CommonBodyText.uasset new file mode 100644 index 0000000..b900c57 --- /dev/null +++ b/Content/Blueprints/UI/Common/CommonBodyText.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5da64ad9c5b3fa22979f1097dc3ecec47da85e839b23bb0b500332486ae0779b +size 6555 diff --git a/Content/Blueprints/UI/Common/DT_CommonUI.uasset b/Content/Blueprints/UI/Common/DT_CommonUI.uasset new file mode 100644 index 0000000..6b356ae --- /dev/null +++ b/Content/Blueprints/UI/Common/DT_CommonUI.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e86348ad311c5c0874ac0971864be9da43ae11fccbfb622b99dc73ffcf92e9dc +size 13211 diff --git a/Content/Blueprints/UI/Common/HeaderTextStyle.uasset b/Content/Blueprints/UI/Common/HeaderTextStyle.uasset new file mode 100644 index 0000000..cfe33be --- /dev/null +++ b/Content/Blueprints/UI/Common/HeaderTextStyle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8408f7907f5b3ad235b3a20992768e6e91c5e79ca7f7b708d7ef39f77d690a4e +size 6719 diff --git a/Content/Blueprints/UI/Common/InputData.uasset b/Content/Blueprints/UI/Common/InputData.uasset new file mode 100644 index 0000000..6e13254 --- /dev/null +++ b/Content/Blueprints/UI/Common/InputData.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16106e808c63c2803c8ab695d0a8cd83f9d3f5e769182e1f89ead667da787616 +size 6271 diff --git a/Content/Blueprints/UI/Components/WBP_MenuButton.uasset b/Content/Blueprints/UI/Components/WBP_MenuButton.uasset new file mode 100644 index 0000000..f365c69 --- /dev/null +++ b/Content/Blueprints/UI/Components/WBP_MenuButton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fb2c7208e5d1471c03d2f4e3f86839c508f6716ccbcefdf8c4487e77e38a11d +size 34503 diff --git a/Content/Blueprints/UI/Components/WBP_Window.uasset b/Content/Blueprints/UI/Components/WBP_Window.uasset new file mode 100644 index 0000000..430607d --- /dev/null +++ b/Content/Blueprints/UI/Components/WBP_Window.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fc2537e3ecda6e48ea4b8bb83328a6f175d05b98252834e2d43aa880f571452 +size 55075 diff --git a/Content/Blueprints/UI/DT_CommonUI.uasset b/Content/Blueprints/UI/DT_CommonUI.uasset deleted file mode 100644 index 1eb7e3e..0000000 --- a/Content/Blueprints/UI/DT_CommonUI.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5563eac06b5a7e40a124320189653372b070af2950e6304e1a7ccaa66c2ddb36 -size 13183 diff --git a/Content/Blueprints/UI/Fonts/Sublima-ExtraBold.uasset b/Content/Blueprints/UI/Fonts/Sublima-ExtraBold.uasset new file mode 100644 index 0000000..e9d553b --- /dev/null +++ b/Content/Blueprints/UI/Fonts/Sublima-ExtraBold.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c4aa14db5c7a3166ba6a43f73865c54c4a81a53d6acfc7505f0523f17a1574d +size 81385 diff --git a/Content/Blueprints/UI/Fonts/Sublima-ExtraBold_Font.uasset b/Content/Blueprints/UI/Fonts/Sublima-ExtraBold_Font.uasset new file mode 100644 index 0000000..f073e04 --- /dev/null +++ b/Content/Blueprints/UI/Fonts/Sublima-ExtraBold_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ee3a7e2724a3f6d9e8a622be75aa13ca058591304d855ceb8ffd9ff2cff92a0 +size 6799 diff --git a/Content/Blueprints/UI/Fonts/Sublima-ExtraLight.uasset b/Content/Blueprints/UI/Fonts/Sublima-ExtraLight.uasset new file mode 100644 index 0000000..ec21c11 --- /dev/null +++ b/Content/Blueprints/UI/Fonts/Sublima-ExtraLight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38da7559b08bf9335462a9f556a6751056146bded7325315504749394bc932da +size 76240 diff --git a/Content/Blueprints/UI/Fonts/Sublima-ExtraLight_Font.uasset b/Content/Blueprints/UI/Fonts/Sublima-ExtraLight_Font.uasset new file mode 100644 index 0000000..d8a5229 --- /dev/null +++ b/Content/Blueprints/UI/Fonts/Sublima-ExtraLight_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19fd8884f397333db66ea94d9954a394869d14b123708e4b23c0edfb40e8c73d +size 6495 diff --git a/Content/Blueprints/UI/HUD/WBP_HUD.uasset b/Content/Blueprints/UI/HUD/WBP_HUD.uasset deleted file mode 100644 index 5cbe585..0000000 --- a/Content/Blueprints/UI/HUD/WBP_HUD.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c63d04665be3158dce36a0c8ff731cc25bb16da02a4c3ae28b0849b761ff1e01 -size 62495 diff --git a/Content/Blueprints/UI/HeaderTextStyle.uasset b/Content/Blueprints/UI/HeaderTextStyle.uasset deleted file mode 100644 index 4a8cba9..0000000 --- a/Content/Blueprints/UI/HeaderTextStyle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60e876035022652e94262d8c73ed33ebffba0c918234cd30695d2ba4f1ff73e8 -size 6227 diff --git a/Content/Blueprints/UI/InputData.uasset b/Content/Blueprints/UI/InputData.uasset index 71a3aec..742b74f 100644 --- a/Content/Blueprints/UI/InputData.uasset +++ b/Content/Blueprints/UI/InputData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d215e9454fb49ddd24712d7231b4ee6145f74fc15a21ec9162ae185e4a29b41 -size 6243 +oid sha256:0b0d68313c275c06da05b2d669f6ba8d919cdcf1f9387a0fb27793e6ae94c90d +size 2333 diff --git a/Content/Blueprints/UI/MainMenu/BI_ColumnData.uasset b/Content/Blueprints/UI/MainMenu/BI_ColumnData.uasset deleted file mode 100644 index 8f72f41..0000000 --- a/Content/Blueprints/UI/MainMenu/BI_ColumnData.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa16e4e46cd9d094ec9c2620550d4cd43b60b79da08e94403611e9a16efb652a -size 13089 diff --git a/Content/Blueprints/UI/MainMenu/WBP_BattleMapMenu.uasset b/Content/Blueprints/UI/MainMenu/WBP_BattleMapMenu.uasset deleted file mode 100644 index 4ab3d40..0000000 --- a/Content/Blueprints/UI/MainMenu/WBP_BattleMapMenu.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93806c1506f44d21336b0e7fcc7c6dc429c7d29b27de012ced0b007840a38c7a -size 22678 diff --git a/Content/Blueprints/UI/MainMenu/WBP_ColumnSelect.uasset b/Content/Blueprints/UI/MainMenu/WBP_ColumnSelect.uasset deleted file mode 100644 index 121cb65..0000000 --- a/Content/Blueprints/UI/MainMenu/WBP_ColumnSelect.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e21b48ae31b4705a4e6f9cf34ebf963026dd171cf22b0e51668d5abfa9250faa -size 127239 diff --git a/Content/Blueprints/UI/MainMenu/WBP_ColumnSelectWidget.uasset b/Content/Blueprints/UI/MainMenu/WBP_ColumnSelectWidget.uasset deleted file mode 100644 index 4be2285..0000000 --- a/Content/Blueprints/UI/MainMenu/WBP_ColumnSelectWidget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:364a44aaf50073f58cf7107925e68c65495645ff726564f9ab644744bf5ff2a7 -size 89633 diff --git a/Content/Blueprints/UI/MainMenu/WBP_GeneralSelect.uasset b/Content/Blueprints/UI/MainMenu/WBP_GeneralSelect.uasset deleted file mode 100644 index c97f1d5..0000000 --- a/Content/Blueprints/UI/MainMenu/WBP_GeneralSelect.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84986f03dd0fdc9c7adc944d5e5eb471cd153c41027688ce25f4f87a60542db5 -size 50490 diff --git a/Content/Blueprints/UI/MainMenu/WBP_LootSelect.uasset b/Content/Blueprints/UI/MainMenu/WBP_LootSelect.uasset deleted file mode 100644 index ee7ae09..0000000 --- a/Content/Blueprints/UI/MainMenu/WBP_LootSelect.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7e0d3f92ce0c9b3f91e245bbfe0d4607415a33178e35d531b4cdf1bbbc2ce5a -size 56783 diff --git a/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset b/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset index 54b6d22..d9c6e27 100644 --- a/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset +++ b/Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:915721d596a8bed3828bb2c88cc35b873b1339134641f0b5e45032878d804418 -size 35479 +oid sha256:73588acecbdbd3696c468b23363600cb5fbe7876542a6e4faca9f33d6ee6f4d8 +size 275750 diff --git a/Content/Blueprints/UI/MainMenu/WBP_MainMenuWidget.uasset b/Content/Blueprints/UI/MainMenu/WBP_MainMenuWidget.uasset index 0d43e64..41ef64d 100644 --- a/Content/Blueprints/UI/MainMenu/WBP_MainMenuWidget.uasset +++ b/Content/Blueprints/UI/MainMenu/WBP_MainMenuWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db5b37f988ec6acba9bc45f5601fc23bbd3a9d42325a175cd83e926c13b8af3f -size 29653 +oid sha256:e495d2582c633bba43b1b8b1b4c9050e724e002f31744d05a0097863902af78c +size 29849 diff --git a/Content/Blueprints/UI/MainMenu/WBP_StageSelect.uasset b/Content/Blueprints/UI/MainMenu/WBP_StageSelect.uasset deleted file mode 100644 index a0219b6..0000000 --- a/Content/Blueprints/UI/MainMenu/WBP_StageSelect.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0727dabb8f7a44f769b239c9d534375881006e019b78971962fce530afb20ef4 -size 56525 diff --git a/Content/Blueprints/UI/Prebattle/WBP_Prebattle.uasset b/Content/Blueprints/UI/Prebattle/WBP_Prebattle.uasset deleted file mode 100644 index 23feceb..0000000 --- a/Content/Blueprints/UI/Prebattle/WBP_Prebattle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfd3b516942bb519ccabf8db6fa68da1008aa3534dd11d00b6900e683883feb0 -size 51331 diff --git a/Content/Blueprints/UI/Prebattle/WBP_UnitCard.uasset b/Content/Blueprints/UI/Prebattle/WBP_UnitCard.uasset deleted file mode 100644 index 35d58f9..0000000 --- a/Content/Blueprints/UI/Prebattle/WBP_UnitCard.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:875dfed0e7b0221bd2a9a31bb28e79d8b89d86aa1ed019df864f2ee7e27f1481 -size 89287 diff --git a/Content/Blueprints/UI/RegularTextStyle.uasset b/Content/Blueprints/UI/RegularTextStyle.uasset deleted file mode 100644 index 2dc7bbd..0000000 --- a/Content/Blueprints/UI/RegularTextStyle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03f1b6f9201adcd634c827c6041ba7d0a228e7e8f3294d164d298c623d09eae8 -size 6198 diff --git a/Content/Blueprints/UI/TextStyle.uasset b/Content/Blueprints/UI/TextStyle.uasset index a7e1c26..4955c15 100644 --- a/Content/Blueprints/UI/TextStyle.uasset +++ b/Content/Blueprints/UI/TextStyle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5cc1c25600bff86722a881f0b0c4d62af9553c787b33030709bb53b85d230dc -size 2437 +oid sha256:c70cf91be4bd5b06c0e726df11e2d7e04a73ce17ea19e82e1039903b243b1b30 +size 2472 diff --git a/Content/Blueprints/UI/WBP_Grid.uasset b/Content/Blueprints/UI/WBP_Grid.uasset deleted file mode 100644 index e5a6087..0000000 --- a/Content/Blueprints/UI/WBP_Grid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80c71801ab4261784cbd8e38e715f220a7482a9da3c56a60bbffbb45254b525c -size 21932 diff --git a/Content/Blueprints/UI/WBP_MenuButton.uasset b/Content/Blueprints/UI/WBP_MenuButton.uasset deleted file mode 100644 index b64f07c..0000000 --- a/Content/Blueprints/UI/WBP_MenuButton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ebff42cdbab3f28ae8b78d95a43441b4369aca5eea0d49d4fd520a1b1e08eef -size 33587 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index 6362a30..874d3bb 100644 --- a/Content/Levels/MainMenu.umap +++ b/Content/Levels/MainMenu.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e2231285163474553f6690b72e007c13991699bf3b08ea6625d9620d7c576181 +oid sha256:63a26f2e75c3cb79eee917c80770fc63f404607e6d002b1fbd355a1a26718b92 size 41472 diff --git a/Content/UI/Column_Header.uasset b/Content/UI/Column_Header.uasset new file mode 100644 index 0000000..2be0623 --- /dev/null +++ b/Content/UI/Column_Header.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81e778321c236361d798b745b451a6592c029ac989a858113cb25a0cd63161e9 +size 59199 diff --git a/Content/UI/Images/EarthPlaceholder.uasset b/Content/UI/Images/EarthPlaceholder.uasset new file mode 100644 index 0000000..acd1037 --- /dev/null +++ b/Content/UI/Images/EarthPlaceholder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:459981c4e5ebff0433c34b00239e5131b7b8711014fb980b44095ebd38e646b0 +size 362268 diff --git a/Content/UI/Images/InvasionPlaceholder.uasset b/Content/UI/Images/InvasionPlaceholder.uasset new file mode 100644 index 0000000..97d95d9 --- /dev/null +++ b/Content/UI/Images/InvasionPlaceholder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fec758472f727a435a11908743a9dea65ffa8b29b9e6c5382cd87ee2bd2f87dd +size 418898 diff --git a/Content/UI/Images/TheAdmiralplaceholder.uasset b/Content/UI/Images/TheAdmiralplaceholder.uasset new file mode 100644 index 0000000..bf7f48f --- /dev/null +++ b/Content/UI/Images/TheAdmiralplaceholder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e9507bf2d57eed1177d3dc887155ba8eafce86d95f47a7e6f0f5d243c44fe4f +size 1931013 diff --git a/Content/UI/Images/TheVeteranPlaceholder.uasset b/Content/UI/Images/TheVeteranPlaceholder.uasset new file mode 100644 index 0000000..433bff9 --- /dev/null +++ b/Content/UI/Images/TheVeteranPlaceholder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c71a862e9f25019fe76d6395406f31ce7f74e7182f3de9a310ecfed21a264069 +size 1792614 diff --git a/Content/UI/Images/exterminationplaceholder.uasset b/Content/UI/Images/exterminationplaceholder.uasset new file mode 100644 index 0000000..17c0ea8 --- /dev/null +++ b/Content/UI/Images/exterminationplaceholder.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc577a060675786b9a33c696fb964bd2d0e1ca8334461436559dd21851555d90 +size 532611 diff --git a/Content/UI/Impact.uasset b/Content/UI/Impact.uasset new file mode 100644 index 0000000..f61b169 --- /dev/null +++ b/Content/UI/Impact.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad8f6970a5f4d5756c06f16d5a9ede47774f86be85a658596f52f644b8ea205b +size 46866 diff --git a/Content/UI/Impact_Font.uasset b/Content/UI/Impact_Font.uasset new file mode 100644 index 0000000..95cf04f --- /dev/null +++ b/Content/UI/Impact_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:637ab037018c93f5ae256bcda9fcaa33d1a35195be86ad3c10d31ae490b962c9 +size 6624 diff --git a/Content/UI/V2/Button.uasset b/Content/UI/V2/Button.uasset new file mode 100644 index 0000000..5f61ac9 --- /dev/null +++ b/Content/UI/V2/Button.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7a0e3d3861703e1920dd059abb1059d0d1ba56dc7ab26c86f7cdcff466d9814 +size 10852 diff --git a/Content/UI/V2/ColumnBody.uasset b/Content/UI/V2/ColumnBody.uasset new file mode 100644 index 0000000..00aeca5 --- /dev/null +++ b/Content/UI/V2/ColumnBody.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa679747972cd6f6f3b2abc09bcf08fb68f7167941dd326ac9c3b4f2c7f47df2 +size 32599 diff --git a/Content/UI/V2/ColumnHeader.uasset b/Content/UI/V2/ColumnHeader.uasset new file mode 100644 index 0000000..068f41b --- /dev/null +++ b/Content/UI/V2/ColumnHeader.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78a05beef35401dc3ee177b2510012037370dd02462986da2f6f976726a6b0b1 +size 23960 diff --git a/Content/UI/V2/ColumnTextBody.uasset b/Content/UI/V2/ColumnTextBody.uasset new file mode 100644 index 0000000..764e5a9 --- /dev/null +++ b/Content/UI/V2/ColumnTextBody.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a48ac3529caffc81afcdb02f49ef32e5439b9db36e54554f9a4b90fa7c9b3c87 +size 69360 diff --git a/Content/UI/arial_narrow_7.uasset b/Content/UI/arial_narrow_7.uasset new file mode 100644 index 0000000..e3babf8 --- /dev/null +++ b/Content/UI/arial_narrow_7.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f31d60849c58ad06ba73029b110e6b41552d01c94400eeac46f8ef662d85f9ec +size 75558 diff --git a/Content/UI/arial_narrow_7_Font.uasset b/Content/UI/arial_narrow_7_Font.uasset new file mode 100644 index 0000000..a7b5eeb --- /dev/null +++ b/Content/UI/arial_narrow_7_Font.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a40a10e0ef4db097dcfb185ca84ee4df3413d08caafcbbfaebb693560f09157 +size 6613 diff --git a/Source/SpaceBattler/Private/PartySubsystem.cpp b/Source/SpaceBattler/Private/PartySubsystem.cpp index b5851d3..aa7de1d 100644 --- a/Source/SpaceBattler/Private/PartySubsystem.cpp +++ b/Source/SpaceBattler/Private/PartySubsystem.cpp @@ -67,7 +67,7 @@ void UPartySubsystem::SpawnUnits() FActorSpawnParameters SpawnActorParameters = {}; SpawnActorParameters.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn; - FVector Location = FVector( VerticalSpacing * i - VerticalSpacing, -HorizontalOffset, 0); + FVector Location = FVector( VerticalSpacing * i - VerticalSpacing, -HorizontalOffset * CurrentColumn, 0); GetWorld()->SpawnActor(SpawnQueue[i + LastSpawnIndex], &Location, nullptr, SpawnActorParameters); } diff --git a/Source/SpaceBattler/Private/SBPlayerController.cpp b/Source/SpaceBattler/Private/SBPlayerController.cpp deleted file mode 100644 index 20ffbba..0000000 --- a/Source/SpaceBattler/Private/SBPlayerController.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "SBPlayerController.h" diff --git a/Source/SpaceBattler/Public/PartySubsystem.h b/Source/SpaceBattler/Public/PartySubsystem.h index eda2845..ba94322 100644 --- a/Source/SpaceBattler/Public/PartySubsystem.h +++ b/Source/SpaceBattler/Public/PartySubsystem.h @@ -32,31 +32,31 @@ public: void SetCredits(int32 Amount); UFUNCTION(BlueprintCallable) - void SetMemberUnitInfo(FPartyMember& Member, UUnitInfo* UnitInfo); + void SetMemberUnitInfo(UPARAM(ref) FPartyMember& Member, UUnitInfo* UnitInfo); UFUNCTION(BlueprintCallable) - bool AllocateMember(FPartyMember& Member); + bool AllocateMember(UPARAM(ref) FPartyMember& Member); UFUNCTION(BlueprintCallable) - bool DeallocateMember(FPartyMember& Member); + bool DeallocateMember(UPARAM(ref) FPartyMember& Member); UFUNCTION(BlueprintCallable) - void SetMemberMax(FPartyMember& Member); + void SetMemberMax(UPARAM(ref) FPartyMember& Member); UFUNCTION(BlueprintCallable) - void ClearMember(FPartyMember& Member); + void ClearMember(UPARAM(ref) FPartyMember& Member); UFUNCTION(BlueprintCallable) - void SetMemberAvailable(FPartyMember& Member,int32 const Amount); + void SetMemberAvailable(UPARAM(ref) FPartyMember& Member,int32 const Amount); UFUNCTION(BlueprintCallable) - int32 GetMemberAvailable(FPartyMember& Member) const; + int32 GetMemberAvailable(UPARAM(ref) FPartyMember& Member) const; UFUNCTION(BlueprintCallable) - int32 GetMemberAllocated(FPartyMember& Member) const; + int32 GetMemberAllocated(UPARAM(ref) FPartyMember& Member) const; UFUNCTION(BlueprintCallable) - UUnitInfo* GetMemberUnitInfo(FPartyMember& Member) const; + UUnitInfo* GetMemberUnitInfo(UPARAM(ref) FPartyMember& Member) const; protected: void SpawnUnits(); diff --git a/Source/SpaceBattler/Public/SBPlayerController.h b/Source/SpaceBattler/Public/SBPlayerController.h deleted file mode 100644 index 986fdcc..0000000 --- a/Source/SpaceBattler/Public/SBPlayerController.h +++ /dev/null @@ -1,16 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/PlayerController.h" -#include "SBPlayerController.generated.h" - -/** - * - */ -UCLASS() -class SPACEBATTLER_API ASBPlayerController : public APlayerController -{ - GENERATED_BODY() -}; diff --git a/Source/SpaceBattler/Public/WaveSubsystem.h b/Source/SpaceBattler/Public/WaveSubsystem.h index b2c56ef..9f74aea 100644 --- a/Source/SpaceBattler/Public/WaveSubsystem.h +++ b/Source/SpaceBattler/Public/WaveSubsystem.h @@ -32,6 +32,9 @@ protected: UPROPERTY() TArray SpawnQueue; + + UPROPERTY(BlueprintReadWrite) + UPrimaryDataAsset* SelectedStage; FTimerHandle SpawnTimerHandle; int32 NumRows;