diff --git a/resources/DefaultConfig.ini b/resources/DefaultConfig.ini index 9eb9a5f5..d40791ba 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,7 +88,7 @@ NumIterations=4 NumIterations=6 [MSAA] -Level=0 +Level=2 [Shadows] Enable=false 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/resources/README.txt b/resources/README.txt new file mode 100755 index 00000000..afaf55dd --- /dev/null +++ b/resources/README.txt @@ -0,0 +1,17 @@ +To start a server + + 1. Run Server.bat in the installation directory (C:\Program Files\Axyz) + 2. Press F1 to open the editor mode + 3. Expand the Entities window if it is minimized, by double-clicking it + 4. Mark StartMenu_Origin and hit Delete twice + 5. Hit Import and choose CP_Valhalla.xml + 6. Press F1 again to leave editor mode for an acceptable framerate + +To join a game + + 1. Run Axyz from the start menu or Axyz.exe in the installation directory (C:\Program Files\Axyz) + 2. Press Play + 3. Hit the refresh icon if no server is visible + 4. Click the server you want to join + 5. Follow on-screen directions + 6. Enjoy the game :) \ No newline at end of file diff --git a/resources/Setup/Inno Setup Script.iss b/resources/Setup/Inno Setup Script.iss index d271967d..9161c8d4 100755 --- a/resources/Setup/Inno Setup Script.iss +++ b/resources/Setup/Inno Setup Script.iss @@ -50,16 +50,18 @@ Source: "..\..\bin\Schema\*"; DestDir: "{app}\Schema\"; Flags: ignoreversion cre Source: "..\..\bin\Shaders\*"; DestDir: "{app}\Shaders\"; Flags: ignoreversion createallsubdirs recursesubdirs Source: "..\..\bin\Textures\*"; DestDir: "{app}\Textures\"; Flags: ignoreversion createallsubdirs recursesubdirs Source: "..\..\bin\assimp.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\DefaultConfig.ini"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\..\bin\DefaultInput.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\resources\DefaultConfig.ini"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\resources\DefaultInput.ini"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\glew32.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\glfw3.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\imgui.ini"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\Input.ini"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\Axyz.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\bin\Server.bat"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\xerces-c_3_1.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\zlib.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\resources\README.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\deps\redist\VC_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall [Icons] 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);