Merge remote branch 'origin/master' into fruitiex/fruit_vs_tzork-balance

diff --git a/models/ice/ice.md3 b/models/ice/ice.md3
new file mode 100644 (file)
index 0000000..fc5cad6
Binary files /dev/null and b/models/ice/ice.md3 differ

diff --git a/models/ice/ice.tga b/models/ice/ice.tga
new file mode 100644 (file)
index 0000000..87e95b3
Binary files /dev/null and b/models/ice/ice.tga differ

diff --git a/models/ice/ice_gloss.tga b/models/ice/ice_gloss.tga
new file mode 100644 (file)
index 0000000..9841865
Binary files /dev/null and b/models/ice/ice_gloss.tga differ

diff --git a/models/ice/ice_glow.tga b/models/ice/ice_glow.tga
new file mode 100644 (file)
index 0000000..7e4c972
Binary files /dev/null and b/models/ice/ice_glow.tga differ

diff --git a/models/ice/ice_norm.tga b/models/ice/ice_norm.tga
new file mode 100644 (file)
index 0000000..051af66
Binary files /dev/null and b/models/ice/ice_norm.tga differ

diff --git a/models/ice/ice_reflect.tga b/models/ice/ice_reflect.tga
new file mode 100644 (file)
index 0000000..1f82c2a
Binary files /dev/null and b/models/ice/ice_reflect.tga differ

diff --git a/models/ice/iceshard.md3 b/models/ice/iceshard.md3
new file mode 100644 (file)
index 0000000..82728cb
Binary files /dev/null and b/models/ice/iceshard.md3 differ

diff --git a/models/sprites/freezetag_frozen_frame0.tga b/models/sprites/freezetag_frozen_frame0.tga
new file mode 100644 (file)
index 0000000..ff31747
Binary files /dev/null and b/models/sprites/freezetag_frozen_frame0.tga differ

diff --git a/models/sprites/make-sprites.sh b/models/sprites/make-sprites.sh
index be359dbde3ee8977ab210d7595b8acf4394633cd..59468b54fc32e708a421aac2d1e7c58394c72dd8 100644 (file)
--- a/models/sprites/make-sprites.sh
+++ b/models/sprites/make-sprites.sh
@@ -201,3 +201,5 @@ sprite item-strength      "Strength"      0050ff 000000 0.5 0050ff ffff00 0.5
 sprite item-shield        "Shield"        ff00ff 000000 0.5 ff00ff ffff00 0.5
 sprite item-fuelregen     "Fuel regen"    ff8000 000000 0.5 ff8000 ffff00 0.5
 sprite item-jetpack       "Jet Pack"      808080 000000 0.5 808080 ffff00 0.5
+
+sprite freezetag_frozen   "Frozen!"       40e6ff 000000 0.0 # bright cyan

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
index 3aea0e4858615ec2b5f2e8c72d4a49426daf16f5..4fb8ac0ca5836e662ef911416e356e532c81c6cc 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c
@@ -39,8 +39,6 @@ void XonoticServerCreateTab_fill(entity me)
                        if(e.checked) e0 = NULL;
                me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_arena", "Arena"));
                        if(e.checked) e0 = NULL;
-               me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_runematch", "Runematch"));
-                       if(e.checked) e0 = NULL;
                me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_race", "Race"));
                        if(e.checked) e0 = NULL;
                me.TD(me, 1, me.columns / n, e = makeXonoticGametypeButton(1, "g_cts", "Race CTS"));

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
index bd54aa219400ad57f61fe675d8666e8c31e5062a..467357810c005b050953b8f34192d727e7c27f82 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c
@@ -124,12 +124,10 @@ void XonoticMapInfoDialog_fill(entity me)
                        me.typeLMSLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Arena"));
                        me.typeArenaLabel = e;
-               me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Rune"));
-                       me.typeRuneLabel = e;
-       me.TR(me);
-               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Domination"));
                        me.typeDominationLabel = e;
+       me.TR(me);
+               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Key Hunt"));
                        me.typeKeyHuntLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "CTF"));
@@ -138,10 +136,10 @@ void XonoticMapInfoDialog_fill(entity me)
                        me.typeCALabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Assault"));
                        me.typeAssaultLabel = e;
-       me.TR(me);
-               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Onslaught"));
                        me.typeOnslaughtLabel = e;
+       me.TR(me);
+               me.TDempty(me, 0.2);
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "Race"));
                        me.typeRaceLabel = e;
                me.TD(me, 1, wgt, e = makeXonoticTextLabel(0, "CTS"));

diff --git a/scripts/ice.shader b/scripts/ice.shader
new file mode 100644 (file)
index 0000000..01c810b
--- /dev/null
+++ b/scripts/ice.shader
@@ -0,0 +1,10 @@
+models/ice/ice
+{
+       dpnoshadow
+       dpreflectcube cubemaps/default/sky
+ {
+       map models/ice/ice.tga
+       blendfunc add
+       rgbgen vertex
+ }
+}