Merge remote branch 'origin/master' into samual/updatecommands

diff --git a/balanceXPM.cfg b/balanceXPM.cfg
index ace23d621de3e1e50f9b0d5ba4895bf17eafee1d..5358f8f2bc24d999274c6388c95a2d9973f66057 100644 (file)
--- a/balanceXPM.cfg
+++ b/balanceXPM.cfg
@@ -99,7 +99,7 @@ set g_pickup_respawntime_short 15
 set g_pickup_respawntime_medium 20
 set g_pickup_respawntime_long 30
 set g_pickup_respawntime_powerup 120
-set g_pickup_respawntime_weapon 15
+set g_pickup_respawntime_weapon 10
 set g_pickup_respawntime_ammo 15
 set g_pickup_respawntimejitter_short 0
 set g_pickup_respawntimejitter_medium 0
@@ -334,7 +334,7 @@ set g_balance_grenadelauncher_primary_radius 120
 set g_balance_grenadelauncher_primary_speed 1900
 set g_balance_grenadelauncher_primary_speed_up 225
 set g_balance_grenadelauncher_primary_speed_z 0
-set g_balance_grenadelauncher_primary_spread 0.02
+set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 5
 set g_balance_grenadelauncher_primary_lifetime2 1
 set g_balance_grenadelauncher_primary_refire 0.8
@@ -352,7 +352,7 @@ set g_balance_grenadelauncher_secondary_radius 120
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 150
 set g_balance_grenadelauncher_secondary_speed_z 0
-set g_balance_grenadelauncher_secondary_spread 0.02
+set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 5
 set g_balance_grenadelauncher_secondary_lifetime_bounce 0.5
 set g_balance_grenadelauncher_secondary_lifetime_stick 0
@@ -594,9 +594,9 @@ set g_balance_rocketlauncher_damage 80
 set g_balance_rocketlauncher_edgedamage 40
 set g_balance_rocketlauncher_force 500
 set g_balance_rocketlauncher_radius 120
-set g_balance_rocketlauncher_speed 1200
-set g_balance_rocketlauncher_speedaccel 1200
-set g_balance_rocketlauncher_speedstart 1200
+set g_balance_rocketlauncher_speed 1300
+set g_balance_rocketlauncher_speedaccel 1300
+set g_balance_rocketlauncher_speedstart 1000
 set g_balance_rocketlauncher_lifetime 10
 set g_balance_rocketlauncher_refire 1.1
 set g_balance_rocketlauncher_animtime 0.35

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 5ea76a22ef6121d56e78c3e60bef9d8f4c796b27..3111e54156d06539e0d842fa0319dc61c1693de1 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -334,7 +334,7 @@ set g_balance_grenadelauncher_primary_radius 120
 set g_balance_grenadelauncher_primary_speed 1900
 set g_balance_grenadelauncher_primary_speed_up 225
 set g_balance_grenadelauncher_primary_speed_z 0
-set g_balance_grenadelauncher_primary_spread 0.02
+set g_balance_grenadelauncher_primary_spread 0
 set g_balance_grenadelauncher_primary_lifetime 5
 set g_balance_grenadelauncher_primary_lifetime2 1
 set g_balance_grenadelauncher_primary_refire 0.8
@@ -352,7 +352,7 @@ set g_balance_grenadelauncher_secondary_radius 120
 set g_balance_grenadelauncher_secondary_speed 1400
 set g_balance_grenadelauncher_secondary_speed_up 150
 set g_balance_grenadelauncher_secondary_speed_z 0
-set g_balance_grenadelauncher_secondary_spread 0.02
+set g_balance_grenadelauncher_secondary_spread 0
 set g_balance_grenadelauncher_secondary_lifetime 5
 set g_balance_grenadelauncher_secondary_lifetime_bounce 0.5
 set g_balance_grenadelauncher_secondary_lifetime_stick 0
@@ -594,9 +594,9 @@ set g_balance_rocketlauncher_damage 80
 set g_balance_rocketlauncher_edgedamage 40
 set g_balance_rocketlauncher_force 500
 set g_balance_rocketlauncher_radius 120
-set g_balance_rocketlauncher_speed 1200
-set g_balance_rocketlauncher_speedaccel 1200
-set g_balance_rocketlauncher_speedstart 1200
+set g_balance_rocketlauncher_speed 1300
+set g_balance_rocketlauncher_speedaccel 1300
+set g_balance_rocketlauncher_speedstart 1000
 set g_balance_rocketlauncher_lifetime 10
 set g_balance_rocketlauncher_refire 1.1
 set g_balance_rocketlauncher_animtime 0.35

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 722f591389a8b375527825fa0bb8644e1519e7ae..bad14b5c076daa39bf31fe233f8d626036cadf96 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1798,6 +1798,9 @@ sv_gameplayfix_consistentplayerprethink 1
 // support Q1BSP maps
 mod_q1bsp_polygoncollisions 1
 
+// match q3map2
+mod_obj_orientation 0
+
 // improve some minor details
 sv_gameplayfix_gravityunaffectedbyticrate 1
 sv_gameplayfix_nogravityonground 1

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 690fd752d7fe237241099f571b6db4602727cb05..befdb9bcc437e552e423d8489ac81f14cfec7d26 100644 (file)
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -128,15 +128,15 @@ float g_clientmodel_genericsendentity (entity to, float sf)
 
 
 #define G_MODEL_INIT(sol) \
-       SetBrushEntityModel(); \
        if(!self.scale) self.scale = self.modelscale; \
+       SetBrushEntityModel(); \
        self.use = g_model_setcolormaptoactivator; \
        InitializeEntity(self, g_model_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
        if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT;
 
 #define G_CLIENTMODEL_INIT(sol) \
-       SetBrushEntityModel(); \
        if(!self.scale) self.scale = self.modelscale; \
+       SetBrushEntityModel(); \
        self.use = g_clientmodel_setcolormaptoactivator; \
        InitializeEntity(self, g_clientmodel_dropbyspawnflags, INITPRIO_DROPTOFLOOR); \
        if(!self.solid) self.solid = (sol); else if(self.solid < 0) self.solid = SOLID_NOT; \