diff --git a/Content/Blueprints/Abilities/BP_Ability.uasset b/Content/Blueprints/Abilities/BP_Ability.uasset index 356ebeb..2bcde27 100644 --- a/Content/Blueprints/Abilities/BP_Ability.uasset +++ b/Content/Blueprints/Abilities/BP_Ability.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21859429a0fbc6b0b26fffd7d24c6844cf004be3689459194eacf36894c19675 -size 35636 +oid sha256:f71682f4f9ea08985b4bec3fced675897eb38003f519fe28087608555af6e37a +size 51435 diff --git a/Content/Blueprints/Abilities/BP_StrafingRun.uasset b/Content/Blueprints/Abilities/BP_StrafingRun.uasset index 45c6a45..59064f3 100644 --- a/Content/Blueprints/Abilities/BP_StrafingRun.uasset +++ b/Content/Blueprints/Abilities/BP_StrafingRun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:772892f2bde6a630a46187f3855dc824c26e09ba4dde38b1a9930b464b47c698 -size 80005 +oid sha256:658d4f2693497e1b7b6cd0d47191d9307b0d1f9ac8724b0686dbcb938392929e +size 84992 diff --git a/Content/Blueprints/Abilities/C_AbilitySystem.uasset b/Content/Blueprints/Abilities/C_AbilitySystem.uasset index 26924b2..94290bf 100644 --- a/Content/Blueprints/Abilities/C_AbilitySystem.uasset +++ b/Content/Blueprints/Abilities/C_AbilitySystem.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1b284dd4afa924d59a32956ae6d7b86b93310d835eb88e6fee5067bebd2fce8 -size 101542 +oid sha256:6f3ce98dd20cf56a370811dbadf3d38c363d1dfe64ff3d7bcda892782a568aaf +size 108205 diff --git a/Content/Blueprints/Abilities/PDA_Ability.uasset b/Content/Blueprints/Abilities/PDA_Ability.uasset index b4f4fac..d9667b0 100644 --- a/Content/Blueprints/Abilities/PDA_Ability.uasset +++ b/Content/Blueprints/Abilities/PDA_Ability.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1a28a68249faacdb53b69c6336293d85339a5297d16516b311197dfc1dc2c6a -size 14543 +oid sha256:1c98e43ae1146fecccadf5140b6e1120617c7f4c4bc1cd93e9fa8c5293cdcc4e +size 16452 diff --git a/Content/Blueprints/BP_PlayerController.uasset b/Content/Blueprints/BP_PlayerController.uasset index 0859fe6..6409b1a 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:d64b5621b6bfa316b4c5405f54f7f8a5424e5222f1fbb2adc6f5ccde4a8c74a6 -size 505827 +oid sha256:0de3f101d0b207a0328b03c8d87d4998fe2b7b6d37fd593c253164dee87a1855 +size 508776 diff --git a/Content/Blueprints/BP_PlayerPawn.uasset b/Content/Blueprints/BP_PlayerPawn.uasset index e181f0d..ef0b7c8 100644 --- a/Content/Blueprints/BP_PlayerPawn.uasset +++ b/Content/Blueprints/BP_PlayerPawn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14bc1642019eec3d0aba7f3d930fb1e6ba31d4af32de4930f63ea14feb89732e -size 33883 +oid sha256:f07483d45200334a302704d969362b318305ceb350beb270458a405ab4decd79 +size 63301 diff --git a/Content/Blueprints/Niagra/Jetengine/N_JetBlast.uasset b/Content/Blueprints/Niagra/Jetengine/N_JetBlast.uasset new file mode 100644 index 0000000..cde8927 --- /dev/null +++ b/Content/Blueprints/Niagra/Jetengine/N_JetBlast.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d79c44f11eb4c67bc2158d34ec2d922a19c22f9f090be40243a6a760f4997985 +size 516248 diff --git a/Content/Blueprints/UI/AbilityButtonBase.uasset b/Content/Blueprints/UI/AbilityButtonBase.uasset index 33602b5..2be1402 100644 --- a/Content/Blueprints/UI/AbilityButtonBase.uasset +++ b/Content/Blueprints/UI/AbilityButtonBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1790d0ae464958c90b65452ef89684959eade393c20024df6375ee363c5afcb -size 26871 +oid sha256:58d669bf0deed2822f77f0c6e720f2f27c6ca42cc4becd260ec8bbe0f538f4e1 +size 101207 diff --git a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset index 9e76bdc..17325c6 100644 --- a/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset +++ b/Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70605d242e0bcdc3f4cef1f50fb121f1e7540bd81c38f8fd36731ad47e6d47f5 -size 316634 +oid sha256:de30cf23ed9ecdbd8878385b721c76b5b9f28c030b71bef164660cd06d9a5380 +size 339505 diff --git a/Content/Blueprints/Units/Common/BP_Unit.uasset b/Content/Blueprints/Units/Common/BP_Unit.uasset index 3cd5eac..908b5f1 100644 --- a/Content/Blueprints/Units/Common/BP_Unit.uasset +++ b/Content/Blueprints/Units/Common/BP_Unit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:364ba4c0ae2cc903a59b66251684b5a83702c217629a202be8f33c92b763abe8 -size 595395 +oid sha256:ad754169eae945bc63b5e42723e5646eae911e32250d4ea097c83211c6e8fb02 +size 604578 diff --git a/Content/Blueprints/Units/EM_LightMech/ABP_LightMech.uasset b/Content/Blueprints/Units/EM_LightMech/ABP_LightMech.uasset new file mode 100644 index 0000000..9c13ce0 --- /dev/null +++ b/Content/Blueprints/Units/EM_LightMech/ABP_LightMech.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81ac1bcd1ad6942cab9d3795af485768a054951749312360b3db77e89b27247f +size 132906 diff --git a/Content/Blueprints/Units/EM_LightMech/BP_LightMech.uasset b/Content/Blueprints/Units/EM_LightMech/BP_LightMech.uasset new file mode 100644 index 0000000..33ded25 --- /dev/null +++ b/Content/Blueprints/Units/EM_LightMech/BP_LightMech.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c11212fd6a7a0d293f9a1615e941ff0705769b6d9e24d331c65e0eb8d351abe +size 43789 diff --git a/Content/Blueprints/Units/EM_LightMech/M_LightMechAttack.uasset b/Content/Blueprints/Units/EM_LightMech/M_LightMechAttack.uasset new file mode 100644 index 0000000..f0ad18e --- /dev/null +++ b/Content/Blueprints/Units/EM_LightMech/M_LightMechAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cafc9543b5f32da481452e68c9cf6fd14c63ac64c258268651c6321838605bc +size 18928 diff --git a/Content/Blueprints/Units/EM_LightMech/N_Autocannon.uasset b/Content/Blueprints/Units/EM_LightMech/N_Autocannon.uasset new file mode 100644 index 0000000..5a99c08 --- /dev/null +++ b/Content/Blueprints/Units/EM_LightMech/N_Autocannon.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dfa850b57396c3616e770b33cdc9ba34bf119955b87bf1fd9468f23509995fd +size 806441 diff --git a/Content/Blueprints/Units/EM_Scout/BP_Scout.uasset b/Content/Blueprints/Units/EM_Scout/BP_Scout.uasset index 81e003d..f489ebd 100644 --- a/Content/Blueprints/Units/EM_Scout/BP_Scout.uasset +++ b/Content/Blueprints/Units/EM_Scout/BP_Scout.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a63659922a224cac7e1fbabeb19fb440ca96cdf74a5a0fa6e83239075d49ecf6 -size 45163 +oid sha256:e5bb8002c05eb6a86067bc4ff96a842662ba8d55399096eff53007d10d76e77d +size 147136 diff --git a/Content/Data/Abilities/DA_StrafingRun.uasset b/Content/Data/Abilities/DA_StrafingRun.uasset index 04a573e..7c1e403 100644 --- a/Content/Data/Abilities/DA_StrafingRun.uasset +++ b/Content/Data/Abilities/DA_StrafingRun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a6d4d0e558358f07b5b9dcd3d4af2d2f5afaf89ce756610405fcd7e67390d75 -size 3047 +oid sha256:27115e09d5e303d79faf4b9fd5b089e605d5b9eb278a5e2bc567292d8f76c4a9 +size 3103 diff --git a/Content/Data/PlayerUnits/DA_LightMech.uasset b/Content/Data/PlayerUnits/DA_LightMech.uasset new file mode 100644 index 0000000..032a64a --- /dev/null +++ b/Content/Data/PlayerUnits/DA_LightMech.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d6f37a0c10f19cfc314813d622288613c818ec9248fc0c709c116ae8522e400 +size 4004 diff --git a/Content/Data/PlayerUnits/DA_Scout.uasset b/Content/Data/PlayerUnits/DA_Scout.uasset index bc24cb9..6f548a0 100644 --- a/Content/Data/PlayerUnits/DA_Scout.uasset +++ b/Content/Data/PlayerUnits/DA_Scout.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:945f5fa8d55c1a9000056d56f3551fad6622c32eddf82930e44b9a2cf6c044ee -size 3805 +oid sha256:b0b08a3400959698c226ad0de57cdb2c4c05546468b180cc2ad0d85f0627122d +size 3819 diff --git a/Content/Levels/BattleMap.umap b/Content/Levels/BattleMap.umap index 5602de0..15a54c0 100644 --- a/Content/Levels/BattleMap.umap +++ b/Content/Levels/BattleMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a24b3f418aecdf8386eddda601a4f344b77f084ceaf93dd2931047639c8558ce +oid sha256:e3cc14910302446bae0b03a3468c8423f36fe17c1414ae4e544f2c348bdad2a7 size 267766 diff --git a/Content/Levels/MainMenu.umap b/Content/Levels/MainMenu.umap index b33ae9c..a46c876 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:99e71990ad495b7468708e3d53a06d2db8986f66e5eaf8c8fdb87667aecc4c23 +oid sha256:66da3681e1ca9639e033bceb8b1f5602de722b028ce1e5a41a0fc331c478edc8 size 41706 diff --git a/Content/Models/PlayerUnits/LightMech/Base.uasset b/Content/Models/PlayerUnits/LightMech/Base.uasset new file mode 100644 index 0000000..59d3719 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/Base.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f142ea01353430a5b76fce2e9be84f383169ed46b8b0442e76b33a02e78fb489 +size 15589 diff --git a/Content/Models/PlayerUnits/LightMech/Glass.uasset b/Content/Models/PlayerUnits/LightMech/Glass.uasset new file mode 100644 index 0000000..545ecf2 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/Glass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3a8acd9108ff1f277ee83841125e115c56863ebb0fe5524f404ccde135f124f +size 12579 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech.uasset b/Content/Models/PlayerUnits/LightMech/lightmech.uasset new file mode 100644 index 0000000..14537dd --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e1df6da1c0821bb97efe2d698bd61f485020d75de2ac9aaa83a42fe748e7b05 +size 2839925 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Idle.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Idle.uasset new file mode 100644 index 0000000..5ae5773 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:064ccf74e05738c1ad3cee58cc84c3a01b850ceebb5ec077f6fc9dfa8e51314a +size 55737 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Run.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Run.uasset new file mode 100644 index 0000000..1f80e64 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Anim_Run.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47b707374b29496530b8741c96e70e253f1f36429e2f12ae3fed39183a38a86e +size 107898 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Base_BaseColor.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Base_BaseColor.uasset new file mode 100644 index 0000000..a1c40dd --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Base_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d336ccaef365f2df2e99272ab027fef1e5a225e055fe3f405f65f6e359ecd6ee +size 4213250 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Base_Normal.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Base_Normal.uasset new file mode 100644 index 0000000..572abc5 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Base_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cae3daa49fa111c9cfc261025f17c26c1b43c738cb68f434bb307439cff9c80c +size 4203324 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Base_OcclusionRoughnessMetallic.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Base_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..47d523a --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Base_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f554eb4fc9aee1cd29013cf555ea752c1da2e2c8e7414237f64eb6694609433 +size 4210042 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Glass_BaseColor.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_BaseColor.uasset new file mode 100644 index 0000000..41ca293 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_BaseColor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6dab026d53baef9b02563136478fc5529317021f2c834a7eba736d44bb0bc72 +size 4204230 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Glass_Normal.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_Normal.uasset new file mode 100644 index 0000000..2b0f753 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df6816beedeea8d2bf4cb9065ce16fb61f036ceccd9717038e95ea77ea56d71e +size 4203258 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Glass_OcclusionRoughnessMetallic.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..e23a25f --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Glass_OcclusionRoughnessMetallic.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7ffc5675c62d6c44e88b65195305f99c1c3ea563616da6f80ff816f5eb93134 +size 4205550 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_PhysicsAsset.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_PhysicsAsset.uasset new file mode 100644 index 0000000..1fb1cc5 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44639bab9296c7ef41dac5f46ab16204c7d8419a36ed665ec6c26134f2b8e2aa +size 10958 diff --git a/Content/Models/PlayerUnits/LightMech/lightmech_Skeleton.uasset b/Content/Models/PlayerUnits/LightMech/lightmech_Skeleton.uasset new file mode 100644 index 0000000..54c3c50 --- /dev/null +++ b/Content/Models/PlayerUnits/LightMech/lightmech_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d19ec3b5d88af4048327c70121656423663b1f29605247dd710f60f6107c68a +size 10702 diff --git a/Content/Textures/ExplosionMedium/ExplosionMedium.uasset b/Content/Textures/ExplosionMedium/ExplosionMedium.uasset new file mode 100644 index 0000000..6b02ea7 --- /dev/null +++ b/Content/Textures/ExplosionMedium/ExplosionMedium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45d65793f782e39ed747c94b25c7a17a6e55a69d98e8afa919a755bdc5eac324 +size 11718 diff --git a/Content/Textures/ExplosionMedium/N_ExplosionMedium.uasset b/Content/Textures/ExplosionMedium/N_ExplosionMedium.uasset new file mode 100644 index 0000000..468fcc4 --- /dev/null +++ b/Content/Textures/ExplosionMedium/N_ExplosionMedium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d7ab3a7fb830bf573ffd82d1a65bb5360c70db8e4450fdac7557fd3eb47dba1 +size 980553 diff --git a/Content/Textures/ExplosionMedium/Untitled_render_all.uasset b/Content/Textures/ExplosionMedium/Untitled_render_all.uasset new file mode 100644 index 0000000..d9e1c53 --- /dev/null +++ b/Content/Textures/ExplosionMedium/Untitled_render_all.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dfc982ed91bc3071680483702fd1923ab77af081fc4f7bfdeb6859931b4e78a +size 16791371 diff --git a/Content/Textures/FireSmall/FireSmall.uasset b/Content/Textures/FireSmall/FireSmall.uasset new file mode 100644 index 0000000..ce3f49c --- /dev/null +++ b/Content/Textures/FireSmall/FireSmall.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72dd1fd6c030d6b4b124cadb89c6ce545c4247ea03c60c246f92bb4610c5c99c +size 13810 diff --git a/Content/Textures/FireSmall/Fire_render_all.uasset b/Content/Textures/FireSmall/Fire_render_all.uasset new file mode 100644 index 0000000..e651060 --- /dev/null +++ b/Content/Textures/FireSmall/Fire_render_all.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d72a40a5e49cc9cd62f83735fe0a66c2efa05dfc5e4e8dd2d7d0315d1dd8634 +size 4205193 diff --git a/Source/SpaceBattler/Public/UpgradeSubsystem.h b/Source/SpaceBattler/Public/UpgradeSubsystem.h index 3cc7b4a..7d83c68 100644 --- a/Source/SpaceBattler/Public/UpgradeSubsystem.h +++ b/Source/SpaceBattler/Public/UpgradeSubsystem.h @@ -32,4 +32,7 @@ protected: UPROPERTY(BlueprintReadWrite) TArray SelectedUpgrades; + + UPROPERTY(BlueprintReadWrite) + int32 MaxUnits; };