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
+6 -6
View File
@@ -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
+1 -1
View File
@@ -1,5 +1,5 @@
[Mouse]
Sensitivity=0.5
Sensitivity=0.05
InvertPitch=false
[Keyboard]
+1 -1
View File
@@ -747,7 +747,7 @@ void Server::resetMap()
reliableBroadcast(removeMap);
removeWorld();
// 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);
Packet newWorld(MessageType::Snapshot);
createWorldSnapshot(newWorld);