diff --git a/assets b/assets index 78c41913..d996fee9 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 78c4191346f0342909229a9f2680f37a2b0f85d5 +Subproject commit d996fee9f96630840dfbc8a42518f30fe322ffc6 diff --git a/resources/DefaultConfig.ini b/resources/DefaultConfig.ini index a4deff88..7d954d1b 100644 --- a/resources/DefaultConfig.ini +++ b/resources/DefaultConfig.ini @@ -3,11 +3,11 @@ AutoReload=true [Debug] LogLevel=1 -LoadMap= +LoadMap=Schema/Entities/StartMenu.xml ; if true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation. ; if false -> Use pool allocation. DisableMemoryPool=false -RespawnTime = -1.0 +RespawnTime=-1.0 EditorEnabled=false OutOfBodyExperience=false @@ -22,7 +22,7 @@ Height=720 FOV=45 [Networking] -StartNetwork=false +StartNetwork=true IsServer=false Name=Bob Address=127.0.0.1 @@ -30,7 +30,7 @@ Port=27666 MaxConnections=8 SnapshotInterval=0.05 SendInputIntervalMs=33 -PingIntervalMs= 1000 +PingIntervalMs=1000 TimeoutMs=15000 [Multithreading] @@ -43,7 +43,7 @@ AnnouncerVolume=1.0 Announcer=female [SSAO] -Quality=0 +Quality=1 [SSAO1] Radius=1.0 @@ -88,4 +88,4 @@ NumIterations=4 NumIterations=6 [MSAA] -Level = 0; +Level=2 diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini index 18fb943f..9d1a1706 100644 --- a/resources/DefaultInput.ini +++ b/resources/DefaultInput.ini @@ -1,5 +1,5 @@ [Mouse] -Sensitivity=0.5 +Sensitivity=0.05 InvertPitch=false [Keyboard] diff --git a/src/Engine/Network/Server.cpp b/src/Engine/Network/Server.cpp index 3ec73969..76cdd1ec 100644 --- a/src/Engine/Network/Server.cpp +++ b/src/Engine/Network/Server.cpp @@ -747,7 +747,7 @@ void Server::resetMap() reliableBroadcast(removeMap); removeWorld(); // Hardcoded for now. - auto entityFile = ResourceManager::Load("Schema/Entities/CP_Rocky2.xml"); + auto entityFile = ResourceManager::Load("Schema/Entities/CP_Valhalla.xml"); entityFile->MergeInto(m_World); Packet newWorld(MessageType::Snapshot); createWorldSnapshot(newWorld);