DDS and shit

This commit is contained in:
2016-03-14 09:08:14 +01:00
parent 2a1f6cd9cf
commit cce43ebc1a
4 changed files with 9 additions and 9 deletions
+1 -1
Submodule assets updated: 78c4191346...d996fee9f9
+4 -4
View File
@@ -3,7 +3,7 @@ AutoReload=true
[Debug] [Debug]
LogLevel=1 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 true -> Pool allocation is not used when calling Allocate/Free, just use regular dynamic allocation.
; if false -> Use pool allocation. ; if false -> Use pool allocation.
DisableMemoryPool=false DisableMemoryPool=false
@@ -22,7 +22,7 @@ Height=720
FOV=45 FOV=45
[Networking] [Networking]
StartNetwork=false StartNetwork=true
IsServer=false IsServer=false
Name=Bob Name=Bob
Address=127.0.0.1 Address=127.0.0.1
@@ -43,7 +43,7 @@ AnnouncerVolume=1.0
Announcer=female Announcer=female
[SSAO] [SSAO]
Quality=0 Quality=1
[SSAO1] [SSAO1]
Radius=1.0 Radius=1.0
@@ -88,4 +88,4 @@ NumIterations=4
NumIterations=6 NumIterations=6
[MSAA] [MSAA]
Level = 0; Level=2
+1 -1
View File
@@ -1,5 +1,5 @@
[Mouse] [Mouse]
Sensitivity=0.5 Sensitivity=0.05
InvertPitch=false InvertPitch=false
[Keyboard] [Keyboard]
+1 -1
View File
@@ -747,7 +747,7 @@ void Server::resetMap()
reliableBroadcast(removeMap); reliableBroadcast(removeMap);
removeWorld(); removeWorld();
// Hardcoded for now. // Hardcoded for now.
auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/CP_Rocky2.xml"); auto entityFile = ResourceManager::Load<EntityFile>("Schema/Entities/CP_Valhalla.xml");
entityFile->MergeInto(m_World); entityFile->MergeInto(m_World);
Packet newWorld(MessageType::Snapshot); Packet newWorld(MessageType::Snapshot);
createWorldSnapshot(newWorld); createWorldSnapshot(newWorld);