Browse code Merge branch 'main' into Joao_Branch master
commit cdf2e27c8a27b987bae9a3001cddd3a25f25a59c 2 parents 9f349d8 + 0b95168 Hoomanbeans authored on 15 Jan 2023

Showing 85 changed files

• Config/DefaultEditor.ini
• Config/DefaultEngine.ini
• Config/DefaultGame.ini
• Config/DefaultGameplayTags.ini
• Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset
• Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset
• Content/Assets/Items/MagneticShield_BP.uasset
• Content/Assets/Items/OverCharge_BP.uasset
• Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset
• Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset
• Content/Assets/Items/RepairKit_BP.uasset
• Content/Assets/NewTargetSystem/BP_target_marker.uasset
• Content/Assets/NewTargetSystem/Missile_NT.uasset
• Content/Assets/NewTargetSystem/P_Target_new.uasset
• Content/Assets/NewTargetSystem/Targets_BP.uasset
• Content/Assets/NormieAsset/MainPlane_BP.uasset
• Content/Assets/NormieAsset/Test_anim.uasset
• Content/Assets/Projectiles/BulletsMaterial.uasset
• Content/Assets/Projectiles/BulletsMaterial_MachineGun.uasset
• Content/Assets/Projectiles/HomingProjectile_BP.uasset
• Content/Assets/Projectiles/Missile.uasset
• Content/Assets/Projectiles/Projectile.uasset
• Content/Assets/Projectiles/Projectile_BP.uasset
• Content/Levels/MainMenu_Level.umap
• Content/Levels/Main_Level.umap
• Content/Levels/Sergio_Level.umap
• Content/Levels/StartMap.umap
• Content/Levels/StartMaptEST.umap
• Content/Levels/test_idk.umap
• Content/Matchmaking_Widget.uasset
• Content/NewGameMode_BP.uasset
• Content/NunoContent/Megascans/3D_Assets/Huge_Nordic_Coastal_Cliff_venrdcgga_00/Huge_Nordic_Coastal_Cliff_LOD0_venrdcgga.uasset
• Content/NunoContent/Menus/Widgets/MainMenu_Widget.uasset
• Content/NunoContent/UI/InGame.uasset
• Content/PlaneTest/AirPlaneTestMovement.umap
• Content/PlaneTest/BiPlane/BiPlanePawn_BP.uasset
• Content/PlaneTest/BiPlane/Biplane.uasset
• Content/PlaneTest/BiPlane/BiplaneWing.uasset
• Content/PlaneTest/BiPlane/Biplane_Diffuse.uasset
• Content/PlaneTest/BiPlane/Biplane_Normal.uasset
• Content/PlaneTest/BiPlane/Biplane_Wing_Diffuse.uasset
• Content/PlaneTest/BiPlane/Biplane_Wing_Normal.uasset
• Content/PlaneTest/BiPlane/Biplane_rigged.uasset
• Content/PlaneTest/BiPlane/Biplane_rigged_PhysicsAsset.uasset
• Content/PlaneTest/BiPlane/Biplane_rigged_Skeleton.uasset
• Content/PlaneTest/BiPlane/Biplane_rigged_Skeleton1.uasset
• Content/PlaneTest/BiPlane/Fbx_Default_Material_1.uasset
• Content/PlaneTest/BiPlane/M_UE4Man_Body1.uasset
• Content/PlaneTest/BiPlane/MannequinPosed_mesh.uasset
• Content/PlaneTest/BiPlane/MannequinPosed_mesh_PhysicsAsset.uasset
• Content/PlaneTest/BiPlane/MannequinPosed_mesh_Skeleton.uasset
• Content/PlaneTest/BiPlane/MannequinPosed_mesh_Skeleton1.uasset
• Content/PlaneTest/BiPlane/NewPawn.uasset
• Content/PlaneTest/BiPlane/biplane_staticmesh.uasset
• Content/PlaneTest/BulletsMaterial.uasset
• Content/PlaneTest/BulletsMaterial_MachineGun.uasset
• Content/PlaneTest/HomingProjectile_BP.uasset
• Content/PlaneTest/Missile.uasset
• Content/PlaneTest/Projectile_BP.uasset
• Content/PlaneTest/Targets_BP.uasset
• Content/PlaneTest/ThirdPersonFlying.uasset
• Content/Projectile.uasset
• Content/ScoreGameMode_BP.uasset
• SkyFrontier.uproject
• Source/SkyFrontier/Private/DamageSystem.cpp
• Source/SkyFrontier/Private/HealthSystem.cpp
• Source/SkyFrontier/Private/MatchmakingJob.cpp
• Source/SkyFrontier/Private/MatchmakingSubsystem.cpp
• Source/SkyFrontier/Private/MyButton.cpp
• Source/SkyFrontier/Private/MyButtonHost.cpp
• Source/SkyFrontier/Private/MyPlayerState.cpp
• Source/SkyFrontier/Private/PointsComponent.cpp
• Source/SkyFrontier/Private/ScoreAttackGameMode.cpp
• Source/SkyFrontier/Private/TCPClient.cpp
• Source/SkyFrontier/Public/DamageSystem.h
• Source/SkyFrontier/Public/HealthSystem.h
• Source/SkyFrontier/Public/MatchmakingJob.h
• Source/SkyFrontier/Public/MatchmakingSubsystem.h
• Source/SkyFrontier/Public/MyButton.h
• Source/SkyFrontier/Public/MyButtonHost.h
• Source/SkyFrontier/Public/MyPlayerState.h
• Source/SkyFrontier/Public/PointsComponent.h
• Source/SkyFrontier/Public/ScoreAttackGameMode.h
• Source/SkyFrontier/Public/TCPClient.h
• Source/SkyFrontierServer.Target.cs

Ignore Space Show notes View Config/DefaultEditor.ini

Ignore Space Show notes View Config/DefaultEngine.ini

Ignore Space Show notes View Config/DefaultGame.ini

Ignore Space Show notes View Config/DefaultGameplayTags.ini 0 → 100644

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

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

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

Ignore Space Show notes View Content/Assets/Items/OverCharge_BP.uasset
Not supported

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

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

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

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

Ignore Space Show notes View Content/Assets/NewTargetSystem/Missile_NT.uasset
Not supported

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

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

Ignore Space Show notes View Content/Assets/NormieAsset/MainPlane_BP.uasset 0 → 100644
Not supported

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

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

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

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

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

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

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

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

Show notes View Content/Levels/Main_Level.umap 100644 → 0
Not supported

Show notes View Content/Levels/Sergio_Level.umap 100644 → 0
Not supported

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

Show notes View Content/Levels/StartMaptEST.umap 100644 → 0
Not supported

Show notes View Content/Levels/test_idk.umap 100644 → 0
Not supported

Show notes View Content/Matchmaking_Widget.uasset 100644 → 0
Not supported

Show notes View Content/NewGameMode_BP.uasset 100644 → 0
Not supported

Ignore Space Show notes View Content/NunoContent/Megascans/3D_Assets/Huge_Nordic_Coastal_Cliff_venrdcgga_00/Huge_Nordic_Coastal_Cliff_LOD0_venrdcgga.uasset
Not supported

Ignore Space Show notes View Content/NunoContent/Menus/Widgets/MainMenu_Widget.uasset
Not supported

Ignore Space Show notes View Content/NunoContent/UI/InGame.uasset
Not supported

Show notes View Content/PlaneTest/AirPlaneTestMovement.umap 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/BiPlanePawn_BP.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/BiplaneWing.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_Diffuse.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_Normal.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_Wing_Diffuse.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_Wing_Normal.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_rigged.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_rigged_PhysicsAsset.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_rigged_Skeleton.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Biplane_rigged_Skeleton1.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/Fbx_Default_Material_1.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/M_UE4Man_Body1.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/MannequinPosed_mesh.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/MannequinPosed_mesh_PhysicsAsset.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/MannequinPosed_mesh_Skeleton.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/MannequinPosed_mesh_Skeleton1.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/NewPawn.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/BiPlane/biplane_staticmesh.uasset 100644 → 0
Not supported

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

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

Show notes View Content/PlaneTest/HomingProjectile_BP.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/Missile.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/Projectile_BP.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/Targets_BP.uasset 100644 → 0
Not supported

Show notes View Content/PlaneTest/ThirdPersonFlying.uasset 100644 → 0
Not supported

Show notes View Content/Projectile.uasset 100644 → 0
Not supported

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

Ignore Space Show notes View SkyFrontier.uproject

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

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

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

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

Show notes View Source/SkyFrontier/Private/MyButton.cpp 100644 → 0

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

Show notes View Source/SkyFrontier/Private/MyPlayerState.cpp 100644 → 0

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

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

Show notes View Source/SkyFrontier/Private/TCPClient.cpp 100644 → 0

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

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

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

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

Show notes View Source/SkyFrontier/Public/MyButton.h 100644 → 0

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

Show notes View Source/SkyFrontier/Public/MyPlayerState.h 100644 → 0

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

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

Show notes View Source/SkyFrontier/Public/TCPClient.h 100644 → 0

Ignore Space Show notes View Source/SkyFrontierServer.Target.cs 0 → 100644

Show line notes below