Merge branch 'master' into mario/monsters

diff --git a/commands.cfg b/commands.cfg
index f0e4f7c270dca89bb0273c16d038e2c87ef28b4f..fda08fc2e4f50d8f62a798e8e23ae0f1621f4723 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -11,6 +11,10 @@ alias if_dedicated "${* asis}"
 _if_dedicated alias if_client ""
 if_client alias if_dedicated ""
 
+// for easy access by QC
+if_dedicated set is_dedicated 1
+if_client    set is_dedicated 0
+
 if_dedicated "alias" qc_cmd_sv     "sv_cmd $$*"
 if_client    "alias" qc_cmd_sv     "sv_cmd $$*"
 // if_client    "alias" qc_cmd_sv     "echo This command only works on servers: sv_cmd $${* !}"

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 933726190d643ccf4be62c03bc178c52a4376cd1..a7c08d1942e1c885987df266c6dd46e271dab444 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1444,6 +1444,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/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc
index 1f8306e7675f4609b13f75777821ff12ad27902f..9fb02eddd8869e55583cce0c2ffc60508d478fa5 100644 (file)
--- a/qcsrc/client/csqcmodel_hooks.qc
+++ b/qcsrc/client/csqcmodel_hooks.qc
@@ -623,8 +623,8 @@ void CSQCModel_Hook_PreDraw(float isplayer)
                        }
                        else
                        {
-                               tracebox(self.origin + '0 0 1', self.mins, self.maxs, self.origin - '0 0 1', MOVE_NORMAL, self);
-                               if(trace_fraction < 1 && trace_plane_normal_z > 0.7)
+                               tracebox(self.origin + '0 0 1', self.mins, self.maxs, self.origin - '0 0 4', MOVE_NORMAL, self);
+                               if(trace_startsolid || trace_fraction < 1)
                                        onground = 1;
                        }
                        animdecide_init(self);

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