diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index b4740c8..30edfa4 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -15,6 +15,19 @@ +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 05a1a08..aa86a62 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -88,6 +88,8 @@ +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 new file mode 100644 index 0000000..868eeb8 --- /dev/null +++ b/Content/Assets/Items/MagneticShield/MagneticShield_BP_WM.uasset Binary files differ diff --git a/Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset b/Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset new file mode 100644 index 0000000..8a75c5f --- /dev/null +++ b/Content/Assets/Items/MagneticShield/MagneticShield_WM.uasset Binary files differ diff --git a/Content/Assets/Items/MagneticShield/Shield.uasset b/Content/Assets/Items/MagneticShield/Shield.uasset new file mode 100644 index 0000000..d047a4b --- /dev/null +++ b/Content/Assets/Items/MagneticShield/Shield.uasset Binary files differ diff --git a/Content/Assets/Items/MagneticShield/Shield_mat.uasset b/Content/Assets/Items/MagneticShield/Shield_mat.uasset new file mode 100644 index 0000000..e022a2e --- /dev/null +++ b/Content/Assets/Items/MagneticShield/Shield_mat.uasset Binary files differ diff --git a/Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset b/Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset new file mode 100644 index 0000000..092ea47 --- /dev/null +++ b/Content/Assets/Items/Overcharge/OverCharge_BP_WM.uasset Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset b/Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset new file mode 100644 index 0000000..c7196df --- /dev/null +++ b/Content/Assets/Items/Overcharge/skull/Skull_MAt.uasset Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/skull.uasset b/Content/Assets/Items/Overcharge/skull/skull.uasset new file mode 100644 index 0000000..2942423 --- /dev/null +++ b/Content/Assets/Items/Overcharge/skull/skull.uasset Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/skull_gloss.uasset b/Content/Assets/Items/Overcharge/skull/skull_gloss.uasset new file mode 100644 index 0000000..b0e6e22 --- /dev/null +++ b/Content/Assets/Items/Overcharge/skull/skull_gloss.uasset Binary files differ diff --git a/Content/Assets/Items/Overcharge/skull/skull_norm.uasset b/Content/Assets/Items/Overcharge/skull/skull_norm.uasset new file mode 100644 index 0000000..8676f64 --- /dev/null +++ b/Content/Assets/Items/Overcharge/skull/skull_norm.uasset Binary files differ diff --git a/Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset b/Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset new file mode 100644 index 0000000..0e0b379 --- /dev/null +++ b/Content/Assets/Items/RepairKit/RepairKit_BP_WM.uasset Binary files differ diff --git a/Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset b/Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset new file mode 100644 index 0000000..3c1c26c --- /dev/null +++ b/Content/Assets/Items/RepairKit/Textures/HealthKit_Tex.uasset Binary files differ diff --git a/Content/Assets/Items/RepairKit/fbx/HealthKit.uasset b/Content/Assets/Items/RepairKit/fbx/HealthKit.uasset new file mode 100644 index 0000000..4e30266 --- /dev/null +++ b/Content/Assets/Items/RepairKit/fbx/HealthKit.uasset Binary files differ diff --git a/Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset b/Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset new file mode 100644 index 0000000..5048438 --- /dev/null +++ b/Content/Assets/Items/RepairKit/fbx/HealthKit_Mat.uasset Binary files differ diff --git a/Content/Assets/NewTargetSystem/BP_target_marker.uasset b/Content/Assets/NewTargetSystem/BP_target_marker.uasset new file mode 100644 index 0000000..019e395 --- /dev/null +++ b/Content/Assets/NewTargetSystem/BP_target_marker.uasset Binary files differ diff --git a/Content/Assets/NewTargetSystem/P_Target_new.uasset b/Content/Assets/NewTargetSystem/P_Target_new.uasset new file mode 100644 index 0000000..78a77d7 --- /dev/null +++ b/Content/Assets/NewTargetSystem/P_Target_new.uasset Binary files differ diff --git a/Content/Assets/NewTargetSystem/TargetWidget.uasset b/Content/Assets/NewTargetSystem/TargetWidget.uasset new file mode 100644 index 0000000..b3d23a0 --- /dev/null +++ b/Content/Assets/NewTargetSystem/TargetWidget.uasset Binary files differ diff --git a/Content/Assets/NewTargetSystem/TargetableComponent.uasset b/Content/Assets/NewTargetSystem/TargetableComponent.uasset new file mode 100644 index 0000000..a688202 --- /dev/null +++ b/Content/Assets/NewTargetSystem/TargetableComponent.uasset Binary files differ diff --git a/Content/Assets/NewTargetSystem/right-arrow.uasset b/Content/Assets/NewTargetSystem/right-arrow.uasset new file mode 100644 index 0000000..61ea479 --- /dev/null +++ b/Content/Assets/NewTargetSystem/right-arrow.uasset Binary files differ diff --git a/Content/Assets/NormieAsset/Test_anim.uasset b/Content/Assets/NormieAsset/Test_anim.uasset index 27447cd..a79bbbe 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 51b8e2b..cad01e7 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 db9325c..44d7854 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 f7ddda5..620029e 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 new file mode 100644 index 0000000..0bf75ca --- /dev/null +++ b/Content/Levels/StartMap.umap Binary files differ diff --git a/Content/Levels/test_idk.umap b/Content/Levels/test_idk.umap index 43db57f..485acdd 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 7680607..1761516 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 45ce29f..4ed1277 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 f0b9211..fc17b7b 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 99e917e..8d53b81 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 32caaa6..6b16bd3 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 7930746..1580c53 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 a4ba9cc..ed16293 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 new file mode 100644 index 0000000..f382b9d --- /dev/null +++ b/Source/SkyFrontier/Private/MyButtonHost.cpp @@ -0,0 +1,17 @@ +// 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 82daf34..4edafa8 100644 --- a/Source/SkyFrontier/Private/TCPClient.cpp +++ b/Source/SkyFrontier/Private/TCPClient.cpp @@ -97,7 +97,8 @@ 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) { @@ -106,5 +107,6 @@ 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 new file mode 100644 index 0000000..c810c7b --- /dev/null +++ b/Source/SkyFrontier/Public/MyButtonHost.h @@ -0,0 +1,26 @@ +// 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