Merge branch 'main' into Nuno_Branch
|
---|
Config/DefaultEngine.ini |
---|
Config/DefaultInput.ini |
---|
Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/MagneticShield/Shield.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/MagneticShield/Shield_mat.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/Overcharge/skull/skull.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/Overcharge/skull/skull_gloss.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/Overcharge/skull/skull_norm.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/RepairKit/fbx/HealthKit.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/NewTargetSystem/BP_target_marker.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/NewTargetSystem/P_Target_new.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/NewTargetSystem/TargetWidget.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/NewTargetSystem/TargetableComponent.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/NewTargetSystem/right-arrow.uasset 0 → 100644 |
---|
Not supported
|
Content/Assets/NormieAsset/Test_anim.uasset |
---|
Not supported
|
Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset |
---|
Not supported
|
Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset |
---|
Not supported
|
Content/Levels/Sergio_Level.umap |
---|
Not supported
|
Content/Levels/StartMap.umap 0 → 100644 |
---|
Not supported
|
Content/Levels/test_idk.umap |
---|
Not supported
|
Content/Matchmaking_Widget.uasset |
---|
Not supported
|
Content/NewGameMode_BP.uasset |
---|
Not supported
|
Content/PlaneTest/Missile.uasset |
---|
Not supported
|
Content/PlaneTest/Projectile_BP.uasset |
---|
Not supported
|
Content/PlaneTest/Targets_BP.uasset |
---|
Not supported
|
Content/PlaneTest/ThirdPersonFlying.uasset |
---|
Not supported
|
Source/SkyFrontier/Private/MyButton.cpp |
---|
Source/SkyFrontier/Private/MyButtonHost.cpp 0 → 100644 |
---|
Source/SkyFrontier/Private/TCPClient.cpp |
---|
Source/SkyFrontier/Public/MyButtonHost.h 0 → 100644 |
---|