From 39da2bff276ec8cff8f0f5e4e731f343bad07f55 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Mar 2016 08:38:00 +0100 Subject: [PATCH 1/4] README --- resources/README.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 resources/README.txt 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 From 2a1f6cd9cf539a0f3067b75d37f2373d7242df13 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Mar 2016 08:38:08 +0100 Subject: [PATCH 2/4] Updated installer --- resources/Setup/Inno Setup Script.iss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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] From cce43ebc1a5a23a96d429e5697b946198142977c Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Mar 2016 09:08:14 +0100 Subject: [PATCH 3/4] DDS and shit --- assets | 2 +- resources/DefaultConfig.ini | 12 ++++++------ resources/DefaultInput.ini | 2 +- src/Engine/Network/Server.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) 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); From 39e5f7b2dc9054ed316c7d129691104f968ebfac Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Mon, 14 Mar 2016 09:21:07 +0100 Subject: [PATCH 4/4] Actually DDS --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index d996fee9..902cbf2b 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit d996fee9f96630840dfbc8a42518f30fe322ffc6 +Subproject commit 902cbf2ba6b17127542a7be7916b07bcb048a256