Merge branch 'bones_was_here/805' into 'master'

Increase Xonotic version to 0.8.5

See merge request xonotic/xonotic-data.pk3dir!1034

diff --git a/models/arctrail.mdl b/models/arctrail.mdl
deleted file mode 100644 (file)
index 5669bc4..0000000
Binary files a/models/arctrail.mdl and /dev/null differ

diff --git a/models/arctrail.mdl_0.skin b/models/arctrail.mdl_0.skin
deleted file mode 100644 (file)
index 96ddf30..0000000
--- a/models/arctrail.mdl_0.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-Plane01,arc_projectile_core
-Plane02,arc_projectile_long

diff --git a/qcsrc/common/models/all.inc b/qcsrc/common/models/all.inc
index 56f07d2b49a81090ec7d07b80d79c26cf1846afb..b8fc08f388144d328b101b1c60e5557a92027187 100644 (file)
--- a/qcsrc/common/models/all.inc
+++ b/qcsrc/common/models/all.inc
@@ -88,7 +88,7 @@ MODEL(PROJECTILE_HOOKBOMB,              "models/grenademodel.md3");
 MODEL(PROJECTILE_HAGAR,                 "models/hagarmissile.mdl");
 MODEL(PROJECTILE_HAGAR_BOUNCING,        "models/hagarmissile.mdl");
 
-MODEL(PROJECTILE_ARC_BOLT,              "models/ebomb.mdl"); // TODO: remove models/arctrail.mdl right before 0.8.3 release!
+MODEL(PROJECTILE_ARC_BOLT,              "models/ebomb.mdl");
 
 // napalm grenade
 MODEL(PROJECTILE_NAPALM_FOUNTAIN,       "null");

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index 88aed86731647444d7ab27d5bfab22e41c98707c..41c9705da06f510026176c49d70f787505ad95fa 100644 (file)
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -517,13 +517,6 @@ void cvar_changes_init()
                BADCVAR("g_grappling_hook");
                BADCVAR("g_jetpack");
 
-               // temporary for testing
-               // TODO remove before 0.8.3 release
-               BADCVAR("g_ca_weaponarena");
-               BADCVAR("g_freezetag_weaponarena");
-               BADCVAR("g_lms_weaponarena");
-               BADCVAR("g_ctf_stalemate_time");
-
 #undef BADPRESUFFIX
 #undef BADPREFIX
 #undef BADCVAR