Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index c2697006a58e3a3996268b2d48f0be04c4361cb2..49a38f69a2c0ea4553ffd2a204c865a83bc6053f 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1439,6 +1439,8 @@ r_shadow_glossintensity 1
 // use fake light if map has no lightmaps
 r_fakelight 1
 
+r_water_hideplayer 1 // hide your own feet/player model in refraction views, this way you don't see half of your body under water
+
 // strength sound settings
 set sv_strengthsound_antispam_time 0.1 "minimum distance of strength sounds"
 set sv_strengthsound_antispam_refire_threshold 0.04 "apply minimum distance only if refire of the gun is smaller than this"

diff --git a/qcsrc/server/builtins.qh b/qcsrc/server/builtins.qh
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qcsrc/server/todo.txt b/qcsrc/server/todo.txt
deleted file mode 100644 (file)
index bbe81a2..0000000
--- a/qcsrc/server/todo.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://dev.xonotic.org/projects/xonotic/issues
-
-also: Maybe actually decide upon what to do with this todo file? No one uses it :P Just use the development tracker.
\ No newline at end of file