Merge commit 'origin/master' into diabolik/umbraplayermodel

diff --git a/Makefile b/Makefile
index 7128da2d683edadfd6d829cdc585b831a0b31689..e1d51f09dc0a562069da0a0184e300fa8b3c8903 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ ZIP ?= 7za a -tzip -mx=9
 ZIPEXCLUDE ?= -x\!*.pk3 -xr\!\.svn -x\!qcsrc
 DIFF ?= diff
 
-FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo
+FTEQCCFLAGS_WATERMARK ?= -DWATERMARK='"^1$(shell git describe) TEST BUILD"'
+FTEQCCFLAGS ?= -Werror -Wall -Wno-mundane -O3 -Ono-c -Ono-cs -flo $(FTEQCCFLAGS_EXTRA) $(FTEQCCFLAGS_WATERMARK)
 FTEQCCFLAGS_PROGS ?= 
 FTEQCCFLAGS_MENU ?= 
 

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d7ed1815a8eb970d6d1c3cd1842a983ef5d15e15..2c579ac49f137621eb316fe6e94c3d4db8ccd2ad 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1,17 +1,5 @@
 set g_xonoticversion 2.5svn    "Xonotic version (formatted for humans)"
 
-//!<showbrand
-showbrand 3
-echo
-echo A warning about this being a SVN development version was set up.
-echo This build shall be used for development and testing only!
-echo
-echo If you want to disable this warning, add the line
-echo   showbrand 0
-echo to your autoexec.cfg.
-echo
-//!>showbrand
-
 // changes a cvar and reports it to the server (for the menu to notify the
 // server about changes)
 alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\""

diff --git a/gfx/brand.tga b/gfx/brand.tga
deleted file mode 100644 (file)
index d2e88c2..0000000
Binary files a/gfx/brand.tga and /dev/null differ

diff --git a/models/items/a_bullets.md3 b/models/items/a_bullets.md3
index 0ffc127cba46eee3c50f40afea0fa0e635a473b8..5442fa5d508a6bd31e10cdf11558187f2f896f22 100644 (file)
Binary files a/models/items/a_bullets.md3 and b/models/items/a_bullets.md3 differ

diff --git a/models/items/a_bullets.mdl b/models/items/a_bullets.mdl
index 0ffc127cba46eee3c50f40afea0fa0e635a473b8..5442fa5d508a6bd31e10cdf11558187f2f896f22 100644 (file)
Binary files a/models/items/a_bullets.mdl and b/models/items/a_bullets.mdl differ

diff --git a/models/items/a_rockets.md3 b/models/items/a_rockets.md3
index 64526355619a370f66056b7839b8ae73650ede1a..61384b5fe7d861ad0ce3ea0af0d34546d91f63de 100644 (file)
Binary files a/models/items/a_rockets.md3 and b/models/items/a_rockets.md3 differ

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 9c1af7d5fa903352dd8c0feed74ae03ef87b909a..575f8b0622deb1b433f54702e79c17a2cf10a352 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -60,6 +60,10 @@ void CSQC_Init(void)
        
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4CSQC Build information: ", WATERMARK(), "\n");
+#endif
+
        float i;
        CSQC_CheckEngine();
 

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index 462337c05126cab5acbfe786cc1b0c23034df70c..b8fee02a13263a8b9e24a7b43359c150bc1f9dad 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -24,6 +24,10 @@ void() m_init =
 
        check_unacceptable_compiler_bugs();
 
+#ifdef WATERMARK
+       print("^4MQC Build information: ", WATERMARK(), "\n");
+#endif
+
        // list all game dirs (TEST)
        if(cvar("developer"))
        {

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 4f365d794f5829342a3fa933425bf99d2156b05e..0492760bfd66780a50b6d9cabe2f351e6b9182fa 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -322,8 +322,19 @@ float preMenuInit()
 
 string campaign_name_previous;
 float campaign_won_previous;
+#ifdef WATERMARK
+var string autocvar_menu_watermark = WATERMARK();
+#else
+var string autocvar_menu_watermark = "";
+#endif
 void postMenuDraw()
 {
+       if(autocvar_menu_watermark != "")
+       {
+               vector fs = '48 48 0';
+               float w;
+               draw_CenterText('0.5 0.1 0', autocvar_menu_watermark, globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
+       }
 }
 void preMenuDraw()
 {

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 5068f52d6aec12d8040ec0a3e02992cb416ece83..e9d9900ac28b5041326d7406f5e3cf4dba61e129 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1393,6 +1393,10 @@ void ClientConnect (void)
 
        DecodeLevelParms();
 
+#ifdef WATERMARK
+       sprint(self, strcat("^4SVQC Build information: ", WATERMARK(), "\n"));
+#endif
+
        self.classname = "player_joining";
 
        self.flags = FL_CLIENT;

diff --git a/textures/items/a_bullets.jpg b/textures/items/a_bullets.jpg
new file mode 100644 (file)
index 0000000..8a99c05
Binary files /dev/null and b/textures/items/a_bullets.jpg differ

diff --git a/textures/items/a_rocket_box.jpg b/textures/items/a_rocket_box.jpg
new file mode 100644 (file)
index 0000000..a29505b
Binary files /dev/null and b/textures/items/a_rocket_box.jpg differ

diff --git a/textures/items/a_rocket_gre.jpg b/textures/items/a_rocket_gre.jpg
new file mode 100644 (file)
index 0000000..66fbc3c
Binary files /dev/null and b/textures/items/a_rocket_gre.jpg differ

diff --git a/textures/items/a_rocket_gre_glow.jpg b/textures/items/a_rocket_gre_glow.jpg
new file mode 100644 (file)
index 0000000..b26e87d
Binary files /dev/null and b/textures/items/a_rocket_gre_glow.jpg differ

diff --git a/textures/items/a_rocket_roc.jpg b/textures/items/a_rocket_roc.jpg
new file mode 100644 (file)
index 0000000..300b2b9
Binary files /dev/null and b/textures/items/a_rocket_roc.jpg differ

diff --git a/textures/items/a_rocket_roc_gloss.jpg b/textures/items/a_rocket_roc_gloss.jpg
new file mode 100644 (file)
index 0000000..0e6f937
Binary files /dev/null and b/textures/items/a_rocket_roc_gloss.jpg differ

diff --git a/textures/items/a_rocket_roc_glow.jpg b/textures/items/a_rocket_roc_glow.jpg
new file mode 100644 (file)
index 0000000..2bb921a
Binary files /dev/null and b/textures/items/a_rocket_roc_glow.jpg differ

diff --git a/textures/items/a_rocket_roc_norm.jpg b/textures/items/a_rocket_roc_norm.jpg
new file mode 100644 (file)
index 0000000..8073764
Binary files /dev/null and b/textures/items/a_rocket_roc_norm.jpg differ

diff --git a/textures/items/a_rocket_tag.jpg b/textures/items/a_rocket_tag.jpg
new file mode 100644 (file)
index 0000000..1314605
Binary files /dev/null and b/textures/items/a_rocket_tag.jpg differ