Browse code Merge branch 'main' into Nuno_Branch master
commit 8ec379b56bcd79416b4231c254c6b754b31817b8 2 parents 221fa1a + 22aed9c Rackday authored on 2 Dec 2022

Showing 25 changed files

• Config/DefaultInput.ini
• Content/Assets/Items/MagneticShield_BP.uasset
• Content/Assets/Items/RepairKit_BP.uasset
• Content/Assets/NormieAsset/NormiePawn_BP.uasset
• Content/Assets/NormieAsset/NormieTestStaticMesh.uasset
• Content/Assets/NormieAsset/Test_anim.uasset
• Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset
• Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset
• Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/SK_West_Fighter_Typhoon.uasset
• Content/Assets/Projectiles/Explosion/Material/MissileExplosion.uasset
• Content/Assets/Projectiles/Explosion/Material/ParticleMissile.uasset
• Content/Assets/Projectiles/Explosion/Material/T_Smoke.uasset
• Content/Assets/Projectiles/Explosion/Material/T_SmokeNoise.uasset
• Content/Assets/Projectiles/Missile/VigilanteContent/Projectiles/East_Missile_P270/BP_East_Missile_P270.uasset
• Content/Assets/Projectiles/Missile/VigilanteContent/Projectiles/East_Missile_P270/FX/MOdified.uasset
• Content/Assets/Projectiles/Missile/VigilanteContent/Projectiles/East_Missile_P270/FX/NS_P-720_jet.uasset
• Content/Levels/Sergio_Level.umap
• Content/Levels/test_idk.umap
• Content/PlaneTest/BulletsMaterial.uasset
• Content/PlaneTest/BulletsMaterial_MachineGun.uasset
• Content/PlaneTest/Missile.uasset
• Content/PlaneTest/Projectile_BP.uasset
• Content/PlaneTest/Targets_BP.uasset
• Source/SkyFrontier/Private/HealthSystem.cpp
• Source/SkyFrontier/Public/HealthSystem.h

Ignore Space Show notes View Config/DefaultInput.ini

Ignore Space Show notes View Content/Assets/Items/MagneticShield_BP.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/Items/RepairKit_BP.uasset 0 → 100644
Not supported

Show notes View Content/Assets/NormieAsset/NormiePawn_BP.uasset 100644 → 0
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/NormieTestStaticMesh.uasset
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/Test_anim.uasset
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset
Not supported

Ignore Space Show notes View Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/SK_West_Fighter_Typhoon.uasset
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Explosion/Material/MissileExplosion.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Explosion/Material/ParticleMissile.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Explosion/Material/T_Smoke.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Explosion/Material/T_SmokeNoise.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Missile/VigilanteContent/Projectiles/East_Missile_P270/BP_East_Missile_P270.uasset
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Missile/VigilanteContent/Projectiles/East_Missile_P270/FX/MOdified.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/Projectiles/Missile/VigilanteContent/Projectiles/East_Missile_P270/FX/NS_P-720_jet.uasset
Not supported

Ignore Space Show notes View Content/Levels/Sergio_Level.umap
Not supported

Ignore Space Show notes View Content/Levels/test_idk.umap
Not supported

Ignore Space Show notes View Content/PlaneTest/BulletsMaterial.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/PlaneTest/BulletsMaterial_MachineGun.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/PlaneTest/Missile.uasset
Not supported

Ignore Space Show notes View Content/PlaneTest/Projectile_BP.uasset
Not supported

Ignore Space Show notes View Content/PlaneTest/Targets_BP.uasset
Not supported

Ignore Space Show notes View Source/SkyFrontier/Private/HealthSystem.cpp

Ignore Space Show notes View Source/SkyFrontier/Public/HealthSystem.h

Show line notes below