diff --git a/Game/Config/DefaultEngine.ini b/Game/Config/DefaultEngine.ini index c146213c..bd2e3e2a 100644 --- a/Game/Config/DefaultEngine.ini +++ b/Game/Config/DefaultEngine.ini @@ -50,6 +50,9 @@ DefaultGraphicsPerformance=Maximum [/Script/SpatialGDK.SpatialGameInstance] bPreventAutoConnectWithLocator=False +[/Script/NavigationSystem.NavigationSystemV1] +bAllowClientSideNavigation=True + [/Script/Engine.PhysicsSettings] DefaultGravityZ=-1960.000000 DefaultTerminalVelocity=4000.000000 @@ -93,6 +96,3 @@ InitialAverageFrameRate=0.016667 PhysXTreeRebuildRate=10 DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2) -[/Script/NavigationSystem.NavigationSystemV1] -bAllowClientSideNavigation=True - diff --git a/Game/Config/DefaultSpatialGDKEditorSettings.ini b/Game/Config/DefaultSpatialGDKEditorSettings.ini index 5651a92d..10f29068 100644 --- a/Game/Config/DefaultSpatialGDKEditorSettings.ini +++ b/Game/Config/DefaultSpatialGDKEditorSettings.ini @@ -3,6 +3,6 @@ bDeleteDynamicEntities=True bGenerateDefaultLaunchConfig=True bStopSpatialOnExit=False SpatialOSSnapshotFile=default.snapshot -LaunchConfigDesc=(Template="w2_r0500_e5",World=(Dimensions=(X=2000,Y=2000),ChunkEdgeLengthMeters=5,StreamingQueryIntervalSeconds=4,SnapshotWritePeriodSeconds=0,LegacyFlags=(("bridge_qos_max_timeout", "0"),("bridge_soft_handover_enabled", "false"),("enable_chunk_interest", "false")),LegacyJavaParams=()),ServerWorkers=((WorkerTypeName="UnrealWorker"),(WorkerTypeName="AIWorker"),(WorkerTypeName="CrashBotWorker"))) +LaunchConfigDesc=(Template="w2_r0500_e5",World=(Dimensions=(X=2000,Y=2000),ChunkEdgeLengthMeters=5,StreamingQueryIntervalSeconds=4,SnapshotWritePeriodSeconds=0,LegacyFlags=(("bridge_qos_max_timeout", "0"),("bridge_soft_handover_enabled", "false"),("enable_chunk_interest", "false")),LegacyJavaParams=()),ServerWorkers=((WorkerTypeName="UnrealWorker"))) bGeneratePlaceholderEntitiesInSnapshot=True diff --git a/Game/Config/DefaultSpatialGDKSettings.ini b/Game/Config/DefaultSpatialGDKSettings.ini index 19490179..dd9b8f27 100644 --- a/Game/Config/DefaultSpatialGDKSettings.ini +++ b/Game/Config/DefaultSpatialGDKSettings.ini @@ -8,6 +8,8 @@ ActorReplicationRateLimit=0 EntityCreationRateLimit=0 OpsUpdateRate=1000.000000 bEnableHandover=True +MaxNetCullDistanceSquared=900000000.000000 +QueuedIncomingRPCWaitTime=1.000000 bUsingQBI=True PositionUpdateFrequency=1.000000 PositionDistanceThreshold=100.000000 @@ -17,18 +19,15 @@ MetricsReportRate=2.000000 bUseFrameTimeAsLoad=False bCheckRPCOrder=False bBatchSpatialPositionUpdates=True +MaxDynamicallyAttachedSubobjectsPerClass=3 bEnableServerQBI=True -bPackUnreliableRPCs=True +bPackRPCs=True +DefaultReceptionistHost=127.0.0.1 bUseDevelopmentAuthenticationFlow=False DevelopmentAuthenticationToken= DevelopmentDeploymentToConnect= DefaultWorkerType=(WorkerTypeName="UnrealWorker") bEnableOffloading=False -ActorGroups=(("AI", (OwningWorkerType=(WorkerTypeName="AIWorker"),ActorClasses=(/Game/Characters/Turret/BP_Turret_Base.BP_Turret_Base_C,/Game/Controllers/BP_TurretController.BP_TurretController_C,/Game/Characters/Turret/BP_TurretShield.BP_TurretShield_C,/Game/Blueprints/Weapons/BP_HeavyMachineGun_ForTurret.BP_HeavyMachineGun_ForTurret_C,/Game/Blueprints/Weapons/Grenades/Turret_Rocket_Propelled.Turret_Rocket_Propelled_C,/Game/Blueprints/Weapons/BP_RocketLauncher_Continuous.BP_RocketLauncher_Continuous_C))),("CrashBot", (OwningWorkerType=(WorkerTypeName="CrashBotWorker"),ActorClasses=(/Game/Characters/BP_CrashBot.BP_CrashBot_C,/Game/Controllers/BP_CrashBotController.BP_CrashBotController_C)))) -ServerWorkerTypes=("UnrealWorker","AIWorker","CrashBotWorker") -MaxDynamicallyAttachedSubobjectsPerClass=3 -bPackRPCs=True -DefaultReceptionistHost=127.0.0.1 -MaxNetCullDistanceSquared=900000000.000000 - +ActorGroups=() +ServerWorkerTypes=("UnrealWorker") diff --git a/Game/Content/Blueprints/Weapons/BP_Crashbot_Rifle.uasset b/Game/Content/Blueprints/Weapons/BP_Crashbot_Rifle.uasset new file mode 100644 index 00000000..39198616 Binary files /dev/null and b/Game/Content/Blueprints/Weapons/BP_Crashbot_Rifle.uasset differ diff --git a/Game/Content/Characters/BP_CrashBot.uasset b/Game/Content/Characters/BP_CrashBot.uasset index 8158cb5f..88d92aaf 100644 Binary files a/Game/Content/Characters/BP_CrashBot.uasset and b/Game/Content/Characters/BP_CrashBot.uasset differ diff --git a/Game/Content/Characters/BP_CrashBot_PlacedInWorld.uasset b/Game/Content/Characters/BP_CrashBot_PlacedInWorld.uasset index 6b9877cb..5a8eafd0 100644 Binary files a/Game/Content/Characters/BP_CrashBot_PlacedInWorld.uasset and b/Game/Content/Characters/BP_CrashBot_PlacedInWorld.uasset differ diff --git a/Game/Content/Controllers/BP_CrashBotController.uasset b/Game/Content/Controllers/BP_CrashBotController.uasset index 3aef406e..f70214ee 100644 Binary files a/Game/Content/Controllers/BP_CrashBotController.uasset and b/Game/Content/Controllers/BP_CrashBotController.uasset differ diff --git a/Game/Content/Maps/CrashBot_Gym.umap b/Game/Content/Maps/CrashBot_Gym.umap index 87bbbd2d..65d056d5 100644 Binary files a/Game/Content/Maps/CrashBot_Gym.umap and b/Game/Content/Maps/CrashBot_Gym.umap differ diff --git a/Game/Content/Maps/Offloading_Gym.umap b/Game/Content/Maps/Offloading_Gym.umap deleted file mode 100644 index abc74a4b..00000000 Binary files a/Game/Content/Maps/Offloading_Gym.umap and /dev/null differ diff --git a/Game/Content/Maps/Offloading_Gym_BuiltData.uasset b/Game/Content/Maps/Offloading_Gym_BuiltData.uasset deleted file mode 100644 index e4a3fb33..00000000 Binary files a/Game/Content/Maps/Offloading_Gym_BuiltData.uasset and /dev/null differ diff --git a/Game/Source/GDKShooter/Private/Characters/Components/ShootingComponent.cpp b/Game/Source/GDKShooter/Private/Characters/Components/ShootingComponent.cpp index 88a8e218..88630aba 100644 --- a/Game/Source/GDKShooter/Private/Characters/Components/ShootingComponent.cpp +++ b/Game/Source/GDKShooter/Private/Characters/Components/ShootingComponent.cpp @@ -33,7 +33,8 @@ void UShootingComponent::BeginPlay() if (!bHasTraceProvider) { - UE_LOG(LogGDK, Error, TEXT("Shooting Component Exists without a Trace Providing component, please add an Actor Component that implements ITraceProvider.")); + UE_LOG(LogGDK, Error, TEXT("Shooting Component on %s exists without a Trace Providing component, please add an Actor Component that implements ITraceProvider."), + *GetPathNameSafe(GetOwner())); } } diff --git a/spatial/workers/unreal/spatialos.AIWorker.worker.json b/spatial/workers/unreal/spatialos.AIWorker.worker.json deleted file mode 100644 index b6a4c824..00000000 --- a/spatial/workers/unreal/spatialos.AIWorker.worker.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "build": { - "tasks": [ - { - "name": "codegen", - "description": "required by spatial worker build build-config.", - "steps": [{"name": "No-op", "command": "echo", "arguments": ["No-op."]}] - }, - { - "name": "build", - "description": "required by spatial worker build build-config.", - "steps": [{"name": "No-op", "command": "echo", "arguments": ["No-op."]}] - }, - { - "name": "clean", - "description": "required by spatial worker build build-config.", - "steps": [{"name": "No-op", "command": "echo", "arguments": ["No-op."]}] - } - ] - }, - "bridge": { - "worker_attribute_set": { - "attributes": [ - "AIWorker" - ] - }, - "entity_interest": { - "range_entity_interest": { - "radius": 50 - } - }, - "streaming_query": [ - { - "global_component_streaming_query": { - "component_name": "unreal.SingletonManager" - } - }, - { - "global_component_streaming_query": { - "component_name": "unreal.Singleton" - } - } - ], - "component_delivery": { - "default": "RELIABLE_ORDERED", - "checkout_all_initially": true - } - }, - "managed": { - "windows": { - "artifact_name": "UnrealEditor@Windows.zip", - "command": "StartEditor.bat", - "arguments": [ - "ThirdPersonExampleMap", - "-server", - "-stdout", - "-nowrite", - "-unattended", - "-nologtimes", - "-nopause", - "-messaging", - "-SaveToUserDir", - "+appName", - "${IMPROBABLE_PROJECT_NAME}", - "+receptionistHost", - "${IMPROBABLE_RECEPTIONIST_HOST}", - "+receptionistPort", - "${IMPROBABLE_RECEPTIONIST_PORT}", - "+workerType", - "${IMPROBABLE_WORKER_NAME}", - "+workerId", - "${IMPROBABLE_WORKER_ID}", - "+linkProtocol", - "Tcp", - "-abslog=${IMPROBABLE_LOG_FILE}", - "-NoVerifyGC" - ] - }, - "linux": { - "artifact_name": "UnrealWorker@Linux.zip", - "command": "StartWorker.sh", - "arguments": [ - "${IMPROBABLE_WORKER_ID}", - "${IMPROBABLE_LOG_FILE}", - "ThirdPersonExampleMap", - "+appName", - "${IMPROBABLE_PROJECT_NAME}", - "+receptionistHost", - "${IMPROBABLE_RECEPTIONIST_HOST}", - "+receptionistPort", - "${IMPROBABLE_RECEPTIONIST_PORT}", - "+workerType", - "${IMPROBABLE_WORKER_NAME}", - "+workerId", - "${IMPROBABLE_WORKER_ID}", - "+linkProtocol", - "Tcp", - "-NoVerifyGC", - "-OverrideSpatialNetworking" - ] - } - } -} diff --git a/spatial/workers/unreal/spatialos.CrashBotWorker.worker.json b/spatial/workers/unreal/spatialos.CrashBotWorker.worker.json deleted file mode 100644 index 179cb622..00000000 --- a/spatial/workers/unreal/spatialos.CrashBotWorker.worker.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "build": { - "tasks": [ - { - "name": "codegen", - "description": "required by spatial worker build build-config.", - "steps": [{"name": "No-op", "command": "echo", "arguments": ["No-op."]}] - }, - { - "name": "build", - "description": "required by spatial worker build build-config.", - "steps": [{"name": "No-op", "command": "echo", "arguments": ["No-op."]}] - }, - { - "name": "clean", - "description": "required by spatial worker build build-config.", - "steps": [{"name": "No-op", "command": "echo", "arguments": ["No-op."]}] - } - ] - }, - "bridge": { - "worker_attribute_set": { - "attributes": [ - "CrashBotWorker" - ] - }, - "entity_interest": { - "range_entity_interest": { - "radius": 50 - } - }, - "streaming_query": [ - { - "global_component_streaming_query": { - "component_name": "unreal.SingletonManager" - } - }, - { - "global_component_streaming_query": { - "component_name": "unreal.Singleton" - } - } - ], - "component_delivery": { - "default": "RELIABLE_ORDERED", - "checkout_all_initially": true - } - }, - "managed": { - "windows": { - "artifact_name": "UnrealEditor@Windows.zip", - "command": "StartEditor.bat", - "arguments": [ - "ThirdPersonExampleMap", - "-server", - "-stdout", - "-nowrite", - "-unattended", - "-nologtimes", - "-nopause", - "-messaging", - "-SaveToUserDir", - "+appName", - "${IMPROBABLE_PROJECT_NAME}", - "+receptionistHost", - "${IMPROBABLE_RECEPTIONIST_HOST}", - "+receptionistPort", - "${IMPROBABLE_RECEPTIONIST_PORT}", - "+workerType", - "${IMPROBABLE_WORKER_NAME}", - "+workerId", - "${IMPROBABLE_WORKER_ID}", - "+linkProtocol", - "Tcp", - "-abslog=${IMPROBABLE_LOG_FILE}", - "-NoVerifyGC" - ] - }, - "linux": { - "artifact_name": "UnrealWorker@Linux.zip", - "command": "StartWorker.sh", - "arguments": [ - "${IMPROBABLE_WORKER_ID}", - "${IMPROBABLE_LOG_FILE}", - "ThirdPersonExampleMap", - "+appName", - "${IMPROBABLE_PROJECT_NAME}", - "+receptionistHost", - "${IMPROBABLE_RECEPTIONIST_HOST}", - "+receptionistPort", - "${IMPROBABLE_RECEPTIONIST_PORT}", - "+workerType", - "${IMPROBABLE_WORKER_NAME}", - "+workerId", - "${IMPROBABLE_WORKER_ID}", - "+linkProtocol", - "Tcp", - "-NoVerifyGC", - "-OverrideSpatialNetworking" - ] - } - } -}