Compare commits

base: jers:main

Branches Tags

jers:feature/upgrades

jers:feature/abilities

jers:main

jers:feature/victory_gameover

jers:feature/melee

jers:feature/spawn-fix

jers:feature/pre-battle-menu

jers:feature/refactor_menus

..

compare: jers:feature/upgrades

Branches Tags

jers:feature/upgrades

jers:feature/abilities

jers:main

jers:feature/victory_gameover

jers:feature/melee

jers:feature/spawn-fix

jers:feature/pre-battle-menu

jers:feature/refactor_menus

10 Commits

main ... feature/up

Author	SHA1	Message	Date
Jers	4fbc9a5b57	Added flakcannon	9 months ago
Jers	23d61efcd3	Added flak cannon and HMG	9 months ago
Jers	f1543e141b	Added officer	9 months ago
Jers	832fa1fc92	Started to add upgrade buttons to prebattle	9 months ago
Jers	ff298ee6ec	Added portraits, added graphics for tiered unit selected.	9 months ago
Jers	056d24a908	Added light mech, drop troopers, ability cooldowns	9 months ago
Jers	041ebcadc1	Added Scout	10 months ago
Jers	1a7b62262b	Added some fluffy UI stuff	10 months ago
Jers	c5bafe2735	Added the interceptor, blood spray	10 months ago
Jers	c5d77baa69	refactored party members into uobjects	10 months ago

240 changed files with 1119 additions and 229 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats

BIN

Content/Blueprints/Abilities/BP_Ability.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Abilities/BP_StrafingRun.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Abilities/C_AbilitySystem.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Abilities/PDA_Ability.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/BP_GameState.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/BP_PlayerController.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/BP_PlayerPawn.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Editor/EW_PartyManager.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Editor/PartyManager/EW_PartyManager.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Loot/BP_UnitLoot.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Niagra/BloodSpray/BloodSpray.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Niagra/BulletImpact_Large/N_BulletImpactLarge.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Niagra/BulletImpact_Large/OmniMuzzle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Niagra/Footsteps/DustSmoke.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Niagra/Jetengine/N_JetBlast.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Niagra/shockwave_small/NS_ShockwaveSmall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/AbilityButtonBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/BattleUI/SC_CrossHairs.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/BattleUI/WBP_BattleUI.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/Common/UpgradeButtonStyle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/MainMenu/WBP_MainMenu.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/PreBattle/WBP_LockedCard.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/PreBattle/WBP_Prebattle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/PreBattle/WBP_UnitCard.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/PreBattle/WBP_UnitCardHolder.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/UI/UpgradeButtonBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/Common/AI/BTTask_MoveToClosestEnemy.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/Common/BP_Unit.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/Common/Projectiles/BP_Projectile_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/Common/WBP_DeathIcon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_CQB/BP_EM_CQB.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Flakcannon/ABP_Flakcannon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Flakcannon/BP_Flakcannon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Flakcannon/M_FlakCannonFire.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_HMG/ABP_HMG.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_HMG/ABP_HMGGunner.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_HMG/BP_HMG.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Interceptor/BP_Interceptor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_LightMech/ABP_LightMech.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_LightMech/BP_LightMech.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_LightMech/M_LightMechAttack.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_LightMech/N_Autocannon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_MortarTeam/ABP_Mortar.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_MortarTeam/BP_MortarShell.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_MortarTeam/BP_MortarTeam.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Officer/ABP_Officer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Officer/BP_Officer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Rifleman/BP_EM_Rifleman.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Scout/ABP_Scout.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Scout/BP_Scout.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/EM_Scout/M_Scout_Attack.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/M_Mite/BP_Mite.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Units/M_Wyrm/BP_Wyrm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Upgrades/PDA_Ranged_Damage.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/Abilities/DA_StrafingRun.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/EnemyUnits/DA_M_Mite.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/EnemyUnits/DA_Wyrm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_EM_CQB.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_EM_MortarTeam.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_EM_Rifleman.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_Flakcannon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_HMG.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_LightMech.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_Officer.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/PlayerUnits/DA_Scout.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/Upgrades/GlobalUpgrades/AU_CooldownReduction.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/Upgrades/GlobalUpgrades/U_Logistics.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/Upgrades/UnitUpgrades/DA_Ranged_Damage_Up.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/exomarine_cqb.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/exomarine_rifleman.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/interceptor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/interceptor_transparent.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/lightmech.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/mite.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/mortar.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/scout.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Data/portraits/wyrm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Levels/BattleMap.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Levels/MainMenu.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Levels/TestWorld.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/Common/M_MuzzleFlash.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/Common/N_MuzzleFlash.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/EnemyUnits/Mite/mite_PhysicsAsset.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/EnemyUnits/Wyrm/Bone.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/EnemyUnits/Wyrm/wyrm_PhysicsAsset.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/Flakcannon/Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/Flakcannon/flakcannon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/Flakcannon/flakcannon_Anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/Flakcannon/flakcannon_PhysicsAsset.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/Flakcannon/flakcannon_Skeleton.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/ArmorShell.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/Barrell.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/Boots.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/Exoinfantry_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/GunBase.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/GunnerIdle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/HMG.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/HMGIDLE.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/HMG_GunBase_BaseColor.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Models/PlayerUnits/HMG/HMG_GunBase_Normal.uasset (Stored with Git LFS)

View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save