Browse code Revert "Revert "Merge branch 'main' into Nuno_Branch"" This reverts commit 148afe3. master
1 parent 148afe3 commit 9e53708d08fd666d98760dafa12efec423334ef4 Rackday authored on 7 Dec 2022

Showing 36 changed files

• Config/DefaultEngine.ini
• Config/DefaultInput.ini
• Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset
• Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset
• Content/Assets/Items/MagneticShield/Shield.uasset
• Content/Assets/Items/MagneticShield/Shield_mat.uasset
• Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset
• Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset
• Content/Assets/Items/Overcharge/skull/skull.uasset
• Content/Assets/Items/Overcharge/skull/skull_gloss.uasset
• Content/Assets/Items/Overcharge/skull/skull_norm.uasset
• Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset
• Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset
• Content/Assets/Items/RepairKit/fbx/HealthKit.uasset
• Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset
• Content/Assets/NewTargetSystem/BP_target_marker.uasset
• Content/Assets/NewTargetSystem/P_Target_new.uasset
• Content/Assets/NewTargetSystem/TargetWidget.uasset
• Content/Assets/NewTargetSystem/TargetableComponent.uasset
• Content/Assets/NewTargetSystem/right-arrow.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/Levels/Sergio_Level.umap
• Content/Levels/StartMap.umap
• Content/Levels/test_idk.umap
• Content/Matchmaking_Widget.uasset
• Content/NewGameMode_BP.uasset
• Content/PlaneTest/Missile.uasset
• Content/PlaneTest/Projectile_BP.uasset
• Content/PlaneTest/Targets_BP.uasset
• Content/PlaneTest/ThirdPersonFlying.uasset
• Source/SkyFrontier/Private/MyButton.cpp
• Source/SkyFrontier/Private/MyButtonHost.cpp
• Source/SkyFrontier/Private/TCPClient.cpp
• Source/SkyFrontier/Public/MyButtonHost.h

Ignore Space Show notes View Config/DefaultEngine.ini

Ignore Space Show notes View Config/DefaultInput.ini

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View Content/Assets/NewTargetSystem/BP_target_marker.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NewTargetSystem/P_Target_new.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NewTargetSystem/TargetWidget.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NewTargetSystem/TargetableComponent.uasset 0 → 100644
Not supported

Ignore Space Show notes View Content/Assets/NewTargetSystem/right-arrow.uasset 0 → 100644
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/Levels/Sergio_Level.umap
Not supported

Ignore Space Show notes View Content/Levels/StartMap.umap 0 → 100644
Not supported

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

Ignore Space Show notes View Content/Matchmaking_Widget.uasset
Not supported

Ignore Space Show notes View Content/NewGameMode_BP.uasset
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 Content/PlaneTest/ThirdPersonFlying.uasset
Not supported

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

Ignore Space Show notes View Source/SkyFrontier/Private/MyButtonHost.cpp 0 → 100644

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

Ignore Space Show notes View Source/SkyFrontier/Public/MyButtonHost.h 0 → 100644

Show line notes below