diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 30edfa4..b4740c8 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -15,19 +15,6 @@ +ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/SkyFrontier") +ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="SkyFrontierGameModeBase") -[/Script/Engine.Player] -ConfiguredInternetSpeed=500000 -ConfiguredLanSpeed=500000 - -[/Script/Engine.GameNetworkManager] -TotalNetBandwidth=500000 -MaxDynamicBandwidth=80000 -MinDynamicBandwidth=20000 - -[/Script/OnlineSubsystemUtils.IpNetDriver] -MaxClientRate=800000 -MaxInternetClientRate=800000 - [/Script/Engine.CollisionProfile] -Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False) -Profiles=(Name="BlockAll",CollisionEnabled=QueryAndPhysics,ObjectTypeName="WorldStatic",CustomResponses=,HelpMessage="WorldStatic object that blocks all actors by default. All new custom channels will use its own default response. ",bCanModify=False) diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index aa86a62..05a1a08 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -88,8 +88,6 @@ +ActionMappings=(ActionName="GetDamaged",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=P) +ActionMappings=(ActionName="ResetCamera",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=R) +ActionMappings=(ActionName="ResetCamera",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_RightThumbstick) -+ActionMappings=(ActionName="LockTarget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MiddleMouseButton) -+ActionMappings=(ActionName="LockTarget",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) +AxisMappings=(AxisName="Roll",Scale=1.000000,Key=Q) +AxisMappings=(AxisName="MoveForward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="MoveRight",Scale=1.000000,Key=D) diff --git a/Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset b/Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset deleted file mode 100644 index 868eeb8..0000000 --- a/Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset b/Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset deleted file mode 100644 index 8a75c5f..0000000 --- a/Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/MagneticShield/Shield.uasset b/Content/Assets/Items/MagneticShield/Shield.uasset deleted file mode 100644 index d047a4b..0000000 --- a/Content/Assets/Items/MagneticShield/Shield.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/MagneticShield/Shield_mat.uasset b/Content/Assets/Items/MagneticShield/Shield_mat.uasset deleted file mode 100644 index e022a2e..0000000 --- a/Content/Assets/Items/MagneticShield/Shield_mat.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset b/Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset deleted file mode 100644 index 092ea47..0000000 --- a/Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset b/Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset deleted file mode 100644 index c7196df..0000000 --- a/Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/skull.uasset b/Content/Assets/Items/Overcharge/skull/skull.uasset deleted file mode 100644 index 2942423..0000000 --- a/Content/Assets/Items/Overcharge/skull/skull.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/skull_gloss.uasset b/Content/Assets/Items/Overcharge/skull/skull_gloss.uasset deleted file mode 100644 index b0e6e22..0000000 --- a/Content/Assets/Items/Overcharge/skull/skull_gloss.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/skull_norm.uasset b/Content/Assets/Items/Overcharge/skull/skull_norm.uasset deleted file mode 100644 index 8676f64..0000000 --- a/Content/Assets/Items/Overcharge/skull/skull_norm.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset b/Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset deleted file mode 100644 index 0e0b379..0000000 --- a/Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset b/Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset deleted file mode 100644 index 3c1c26c..0000000 --- a/Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/RepairKit/fbx/HealthKit.uasset b/Content/Assets/Items/RepairKit/fbx/HealthKit.uasset deleted file mode 100644 index 4e30266..0000000 --- a/Content/Assets/Items/RepairKit/fbx/HealthKit.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset b/Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset deleted file mode 100644 index 5048438..0000000 --- a/Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/NewTargetSystem/BP_target_marker.uasset b/Content/Assets/NewTargetSystem/BP_target_marker.uasset deleted file mode 100644 index 019e395..0000000 --- a/Content/Assets/NewTargetSystem/BP_target_marker.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/NewTargetSystem/P_Target_new.uasset b/Content/Assets/NewTargetSystem/P_Target_new.uasset deleted file mode 100644 index 78a77d7..0000000 --- a/Content/Assets/NewTargetSystem/P_Target_new.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/NewTargetSystem/TargetWidget.uasset b/Content/Assets/NewTargetSystem/TargetWidget.uasset deleted file mode 100644 index b3d23a0..0000000 --- a/Content/Assets/NewTargetSystem/TargetWidget.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/NewTargetSystem/TargetableComponent.uasset b/Content/Assets/NewTargetSystem/TargetableComponent.uasset deleted file mode 100644 index a688202..0000000 --- a/Content/Assets/NewTargetSystem/TargetableComponent.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/NewTargetSystem/right-arrow.uasset b/Content/Assets/NewTargetSystem/right-arrow.uasset deleted file mode 100644 index 61ea479..0000000 --- a/Content/Assets/NewTargetSystem/right-arrow.uasset +++ /dev/null Binary files differ diff --git a/Content/Assets/NormieAsset/Test_anim.uasset b/Content/Assets/NormieAsset/Test_anim.uasset index a79bbbe..27447cd 100644 --- a/Content/Assets/NormieAsset/Test_anim.uasset +++ b/Content/Assets/NormieAsset/Test_anim.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset index cad01e7..51b8e2b 100644 --- a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset +++ b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/BP_West_Fighter_Typhoon.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset index 44d7854..db9325c 100644 --- a/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset +++ b/Content/Assets/NormieAsset/VigilanteContent/Vehicles/West_Fighter_Typhoon/FX/NS_West_Fighter_Typhoon_Jet.uasset Binary files differ diff --git a/Content/Levels/Sergio_Level.umap b/Content/Levels/Sergio_Level.umap index 620029e..f7ddda5 100644 --- a/Content/Levels/Sergio_Level.umap +++ b/Content/Levels/Sergio_Level.umap Binary files differ diff --git a/Content/Levels/StartMap.umap b/Content/Levels/StartMap.umap deleted file mode 100644 index 0bf75ca..0000000 --- a/Content/Levels/StartMap.umap +++ /dev/null Binary files differ diff --git a/Content/Levels/test_idk.umap b/Content/Levels/test_idk.umap index 485acdd..43db57f 100644 --- a/Content/Levels/test_idk.umap +++ b/Content/Levels/test_idk.umap Binary files differ diff --git a/Content/Matchmaking_Widget.uasset b/Content/Matchmaking_Widget.uasset index 1761516..7680607 100644 --- a/Content/Matchmaking_Widget.uasset +++ b/Content/Matchmaking_Widget.uasset Binary files differ diff --git a/Content/NewGameMode_BP.uasset b/Content/NewGameMode_BP.uasset index 4ed1277..45ce29f 100644 --- a/Content/NewGameMode_BP.uasset +++ b/Content/NewGameMode_BP.uasset Binary files differ diff --git a/Content/PlaneTest/Missile.uasset b/Content/PlaneTest/Missile.uasset index fc17b7b..f0b9211 100644 --- a/Content/PlaneTest/Missile.uasset +++ b/Content/PlaneTest/Missile.uasset Binary files differ diff --git a/Content/PlaneTest/Projectile_BP.uasset b/Content/PlaneTest/Projectile_BP.uasset index 8d53b81..99e917e 100644 --- a/Content/PlaneTest/Projectile_BP.uasset +++ b/Content/PlaneTest/Projectile_BP.uasset Binary files differ diff --git a/Content/PlaneTest/Targets_BP.uasset b/Content/PlaneTest/Targets_BP.uasset index 6b16bd3..32caaa6 100644 --- a/Content/PlaneTest/Targets_BP.uasset +++ b/Content/PlaneTest/Targets_BP.uasset Binary files differ diff --git a/Content/PlaneTest/ThirdPersonFlying.uasset b/Content/PlaneTest/ThirdPersonFlying.uasset index 1580c53..7930746 100644 --- a/Content/PlaneTest/ThirdPersonFlying.uasset +++ b/Content/PlaneTest/ThirdPersonFlying.uasset Binary files differ diff --git a/Source/SkyFrontier/Private/MyButton.cpp b/Source/SkyFrontier/Private/MyButton.cpp index ed16293..a4ba9cc 100644 --- a/Source/SkyFrontier/Private/MyButton.cpp +++ b/Source/SkyFrontier/Private/MyButton.cpp @@ -5,7 +5,7 @@ UMyButton::UMyButton() { - OnClicked.AddDynamic(this, &UMyButton::OnClick); +OnClicked.AddDynamic(this, &UMyButton::OnClick); } void UMyButton::SetSessionInfo(int sID, TCPClient *tclient) { diff --git a/Source/SkyFrontier/Private/MyButtonHost.cpp b/Source/SkyFrontier/Private/MyButtonHost.cpp deleted file mode 100644 index f382b9d..0000000 --- a/Source/SkyFrontier/Private/MyButtonHost.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "MyButtonHost.h" - -UMyButtonHost::UMyButtonHost() -{ - OnClicked.AddDynamic(this, &UMyButtonHost::OnClick); -} -void UMyButtonHost::SetSessionInfo(FString sname, TCPClient *tclient) -{ - sessionName = sname; tcpClient = tclient; -} -void UMyButtonHost::OnClick() -{ - tcpClient->CreateNewGameSession(sessionName); -} \ No newline at end of file diff --git a/Source/SkyFrontier/Private/TCPClient.cpp b/Source/SkyFrontier/Private/TCPClient.cpp index 4edafa8..82daf34 100644 --- a/Source/SkyFrontier/Private/TCPClient.cpp +++ b/Source/SkyFrontier/Private/TCPClient.cpp @@ -97,8 +97,7 @@ int32 size = FCString::Strlen(serializedChar); int32 sent = 0; bool successful = Socket->Send((uint8*) TCHAR_TO_UTF8(serializedChar), size, sent); - if (successful) - UE_LOG(LogTemp, Log, TEXT("MESSAGE SENT!!!!")); + if (successful) UE_LOG(LogTemp, Log, TEXT("MESSAGE SENT!!!!")); } void TCPClient::JoinGameSession(int sID) { @@ -107,6 +106,5 @@ int32 size = FCString::Strlen(serializedChar); int32 sent = 0; bool successful = Socket->Send((uint8*) TCHAR_TO_UTF8(serializedChar), size, sent); - if (successful) - UE_LOG(LogTemp, Log, TEXT("MESSAGE SENT!!!!")); + if (successful) UE_LOG(LogTemp, Log, TEXT("MESSAGE SENT!!!!")); } \ No newline at end of file diff --git a/Source/SkyFrontier/Public/MyButtonHost.h b/Source/SkyFrontier/Public/MyButtonHost.h deleted file mode 100644 index c810c7b..0000000 --- a/Source/SkyFrontier/Public/MyButtonHost.h +++ /dev/null @@ -1,26 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "TCPClient.h" -#include "Components/Button.h" -#include "MyButtonHost.generated.h" - -/** - * - */ -UCLASS() -class SKYFRONTIER_API UMyButtonHost : public UButton -{ - GENERATED_BODY() -public: - UMyButtonHost(); - void SetSessionInfo(FString sname, TCPClient *tclient); -protected: FString sessionName; - TCPClient *tcpClient; - - UFUNCTION() - void OnClick(); - -}; \ No newline at end of file