Merge remote-tracking branch 'origin/master' into DDS

Conflicts:
	assets
	resources/DefaultConfig.ini
This commit is contained in:
Teejoon
2016-03-14 09:32:46 +01:00
5 changed files with 29 additions and 10 deletions
+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,7 +88,7 @@ NumIterations=4
NumIterations=6
[MSAA]
Level=0
Level=2
[Shadows]
Enable=false