Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir

diff --git a/effects-high.cfg b/effects-high.cfg
index 664fca7ad3aa2b8e51e595a3e0e0f17bd5f30824..48d0d43b87e409e030ca2ea3783fe1e7fd57bfd4 100644 (file)
--- a/effects-high.cfg
+++ b/effects-high.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 4
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-low.cfg b/effects-low.cfg
index 769ca51217b5a36b2d5691f34ca3bf8fbe5fb6b7..9609a5780234582d3945e02c316c9a77d188174e 100644 (file)
--- a/effects-low.cfg
+++ b/effects-low.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
 gl_flashblend 1

diff --git a/effects-med.cfg b/effects-med.cfg
index a6e5e7d0bd76b1f829cfa6761117040958c602bc..94a85e5091a2146c326077707410d87142075e2f 100644 (file)
--- a/effects-med.cfg
+++ b/effects-med.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-normal.cfg b/effects-normal.cfg
index dbad238261bf234989f3c1fc7fc6cc383daea6ee..7822102ba9c11e9a0a4088eecdf5550cbf108a14 100644 (file)
--- a/effects-normal.cfg
+++ b/effects-normal.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-omg.cfg b/effects-omg.cfg
index 6e6a1dcbbe96abc8b91f13090016ce4c40fec1b0..a68a15787ded9bb5b8a10003b278054e7e29c3c3 100644 (file)
--- a/effects-omg.cfg
+++ b/effects-omg.cfg
@@ -1,4 +1,5 @@
 cl_decals 0
+cl_decals_models 0
 cl_decals_time 2
 cl_particles_quality 0.4
 gl_flashblend 1

diff --git a/effects-ultimate.cfg b/effects-ultimate.cfg
index d6e501892b4fb334dc40a354e5b3d00888475e77..20cd2e563870d40b2678874e6802250a2ffbe02a 100644 (file)
--- a/effects-ultimate.cfg
+++ b/effects-ultimate.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/effects-ultra.cfg b/effects-ultra.cfg
index 47949e551b06203da8447f0425a42023c00eb50e..94d47fab2e7cfcf4a600c625ecf6b8b401d99760 100644 (file)
--- a/effects-ultra.cfg
+++ b/effects-ultra.cfg
@@ -1,4 +1,5 @@
 cl_decals 1
+cl_decals_models 1
 cl_decals_time 10
 cl_particles_quality 1
 gl_flashblend 0

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.c b/qcsrc/menu/xonotic/dialog_settings_effects.c
index 2aa2d52397cb7020196df54513e4e890d010dab2..23cb6a3b9b6a2bc4252280c0df4155a198f39143 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.c
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.c
@@ -114,7 +114,9 @@ void XonoticEffectsSettingsTab_fill(entity me)
                me.TD(me, 1, 1.9, e = makeXonoticSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
+               me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals", _("Decals")));
+               me.TD(me, 1, 1.5, e = makeXonoticCheckBox(0, "cl_decals_models", _("Decals on models")));
+                       setDependent(e, "cl_decals", 1, 1);
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Distance:")));

diff --git a/qcsrc/qc-client.cbp b/qcsrc/qc-client.cbp
deleted file mode 100644 (file)
index b8d82f5..0000000
--- a/qcsrc/qc-client.cbp
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-       <FileVersion major="1" minor="6" />
-       <Project>
-               <Option title="qc-client" />
-               <Option makefile="client" />
-               <Option makefile_is_custom="1" />
-               <Option pch_mode="2" />
-               <Option compiler="fteqcc" />
-               <MakeCommands>
-                       <Build command="$make -src $makefile" />
-                       <CompileFile command="$make -src $makefile" />
-                       <Clean command="$make -src $makefile" />
-                       <DistClean command="$make -f $makefile distclean$target" />
-                       <AskRebuildNeeded command="" />
-                       <SilentBuild command="$make -src $makefile" />
-               </MakeCommands>
-               <Build>
-                       <Target title="Debug">
-                               <Option output="bin\Debug\qc-server" prefix_auto="1" extension_auto="1" />
-                               <Option object_output="obj\Debug\" />
-                               <Option type="1" />
-                               <Option compiler="fteqcc" />
-                               <Compiler>
-                                       <Add option="-g" />
-                               </Compiler>
-                               <MakeCommands>
-                                       <Build command="$make -src $makefile" />
-                                       <CompileFile command="$make -src $makefile" />
-                                       <Clean command="$make -src $makefile" />
-                                       <DistClean command="" />
-                                       <AskRebuildNeeded command="" />
-                                       <SilentBuild command="$make -src $makefile" />
-                               </MakeCommands>
-                       </Target>
-                       <Target title="Release">
-                               <Option output="bin\Release\qc-server" prefix_auto="1" extension_auto="1" />
-                               <Option object_output="obj\Release\" />
-                               <Option type="1" />
-                               <Option compiler="fteqcc" />
-                               <Compiler>
-                                       <Add option="-O2" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-s" />
-                               </Linker>
-                               <MakeCommands>
-                                       <Build command="$make -src $makefile" />
-                                       <CompileFile command="$make -src $makefile" />
-                                       <Clean command="$make -src $makefile" />
-                                       <DistClean command="" />
-                                       <AskRebuildNeeded command="" />
-                                       <SilentBuild command="$make -src $makefile" />
-                               </MakeCommands>
-                       </Target>
-               </Build>
-               <Compiler>
-                       <Add option="-g" />
-               </Compiler>
-               <Unit filename="client\Defs.qc" />
-               <Unit filename="client\Main.qc" />
-               <Unit filename="client\View.qc" />
-               <Unit filename="client\autocvars.qh" />
-               <Unit filename="client\bgmscript.qc" />
-               <Unit filename="client\bgmscript.qh" />
-               <Unit filename="client\casings.qc" />
-               <Unit filename="client\csqc_builtins.qc" />
-               <Unit filename="client\csqc_constants.qc" />
-               <Unit filename="client\ctf.qc" />
-               <Unit filename="client\damage.qc" />
-               <Unit filename="client\effects.qc" />
-               <Unit filename="client\gibs.qc" />
-               <Unit filename="client\hook.qc" />
-               <Unit filename="client\hud.qc" />
-               <Unit filename="client\hud.qh" />
-               <Unit filename="client\hud_config.qc" />
-               <Unit filename="client\interpolate.qc" />
-               <Unit filename="client\interpolate.qh" />
-               <Unit filename="client\laser.qc" />
-               <Unit filename="client\main.qh" />
-               <Unit filename="client\mapvoting.qc" />
-               <Unit filename="client\miscfunctions.qc" />
-               <Unit filename="client\modeleffects.qc" />
-               <Unit filename="client\movetypes.qc" />
-               <Unit filename="client\movetypes.qh" />
-               <Unit filename="client\noise.qc" />
-               <Unit filename="client\noise.qh" />
-               <Unit filename="client\particles.qc" />
-               <Unit filename="client\prandom.qc" />
-               <Unit filename="client\prandom.qh" />
-               <Unit filename="client\pre.qh" />
-               <Unit filename="client\progs.src" />
-               <Unit filename="client\progs.src.BASE.src" />
-               <Unit filename="client\progs.src.LOCAL.src" />
-               <Unit filename="client\progs.src.REMOTE.src" />
-               <Unit filename="client\projectile.qc" />
-               <Unit filename="client\rubble.qc" />
-               <Unit filename="client\scoreboard.qc" />
-               <Unit filename="client\scoreboard.qh" />
-               <Unit filename="client\shownames.qc" />
-               <Unit filename="client\shownames.qh" />
-               <Unit filename="client\sortlist.qc" />
-               <Unit filename="client\target_music.qc" />
-               <Unit filename="client\teamplay.qc" />
-               <Unit filename="client\teamplay.qh" />
-               <Unit filename="client\teamradar.qc" />
-               <Unit filename="client\teamradar.qh" />
-               <Unit filename="client\tturrets.qc" />
-               <Unit filename="client\tturrets.qh" />
-               <Unit filename="client\tuba.qc" />
-               <Unit filename="client\vehicles\vehicles.qc" />
-               <Unit filename="client\vehicles\vehicles.qh" />
-               <Unit filename="client\wall.qc" />
-               <Unit filename="client\waypointsprites.qc" />
-               <Unit filename="client\waypointsprites.qh" />
-               <Extensions>
-                       <code_completion />
-                       <debugger />
-               </Extensions>
-       </Project>
-</CodeBlocks_project_file>

diff --git a/qcsrc/qc-common.cbp b/qcsrc/qc-common.cbp
deleted file mode 100644 (file)
index 95f1ba8..0000000
--- a/qcsrc/qc-common.cbp
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-       <FileVersion major="1" minor="6" />
-       <Project>
-               <Option title="qc-common" />
-               <Option makefile="none" />
-               <Option makefile_is_custom="1" />
-               <Option pch_mode="2" />
-               <Option compiler="qaukec" />
-               <Build>
-                       <Target title="Debug">
-                               <Option output="bin\Debug\qc-server" prefix_auto="1" extension_auto="1" />
-                               <Option object_output="obj\Debug\" />
-                               <Option type="1" />
-                               <Option compiler="qaukec" />
-                               <Compiler>
-                                       <Add option="-g" />
-                               </Compiler>
-                               <MakeCommands>
-                                       <Build command="$make -src $makefile" />
-                                       <CompileFile command="" />
-                                       <Clean command="" />
-                                       <DistClean command="" />
-                               </MakeCommands>
-                       </Target>
-                       <Target title="Release">
-                               <Option output="bin\Release\qc-server" prefix_auto="1" extension_auto="1" />
-                               <Option object_output="obj\Release\" />
-                               <Option type="1" />
-                               <Option compiler="qaukec" />
-                               <Compiler>
-                                       <Add option="-O2" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-s" />
-                               </Linker>
-                               <MakeCommands>
-                                       <Build command="$make -src $makefile" />
-                                       <CompileFile command="" />
-                                       <Clean command="" />
-                                       <DistClean command="" />
-                               </MakeCommands>
-                       </Target>
-               </Build>
-               <Compiler>
-                       <Add option="-Wall" />
-               </Compiler>
-               <Unit filename="common\campaign_common.qh" />
-               <Unit filename="common\campaign_file.qc" />
-               <Unit filename="common\campaign_setup.qc" />
-               <Unit filename="common\constants.qh" />
-               <Unit filename="common\gamecommand.qc" />
-               <Unit filename="common\items.qc" />
-               <Unit filename="common\items.qh" />
-               <Unit filename="common\mapinfo.qc" />
-               <Unit filename="common\mapinfo.qh" />
-               <Unit filename="common\util-pre.qh" />
-               <Unit filename="common\util.qc" />
-               <Unit filename="common\util.qh" />
-               <Extensions>
-                       <code_completion />
-                       <debugger />
-               </Extensions>
-       </Project>
-</CodeBlocks_project_file>

diff --git a/qcsrc/qc-server.cbp b/qcsrc/qc-server.cbp
deleted file mode 100644 (file)
index eaa30d2..0000000
--- a/qcsrc/qc-server.cbp
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-       <FileVersion major="1" minor="6" />
-       <Project>
-               <Option title="qc-server" />
-               <Option makefile="server/" />
-               <Option makefile_is_custom="1" />
-               <Option pch_mode="2" />
-               <Option compiler="qaukec" />
-               <Build>
-                       <Target title="Debug">
-                               <Option output="bin\Debug\qc-server" prefix_auto="1" extension_auto="1" />
-                               <Option object_output="obj\Debug\" />
-                               <Option type="1" />
-                               <Option compiler="qaukec" />
-                               <Compiler>
-                                       <Add option="-g" />
-                               </Compiler>
-                               <MakeCommands>
-                                       <Build command="$make -DVEHICLES_ENABLED -DRELEASE -src $makefile" />
-                                       <CompileFile command="" />
-                                       <Clean command="" />
-                                       <DistClean command="" />
-                               </MakeCommands>
-                       </Target>
-                       <Target title="Release">
-                               <Option output="bin\Release\qc-server" prefix_auto="1" extension_auto="1" />
-                               <Option object_output="obj\Release\" />
-                               <Option type="1" />
-                               <Option compiler="qaukec" />
-                               <Compiler>
-                                       <Add option="-O2" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-s" />
-                               </Linker>
-                               <MakeCommands>
-                                       <Build command="$make -DVEHICLES_ENABLED -DRELEASE -src $makefile" />
-                                       <CompileFile command="" />
-                                       <Clean command="" />
-                                       <DistClean command="" />
-                               </MakeCommands>
-                       </Target>
-               </Build>
-               <Compiler>
-                       <Add option="-Wall" />
-               </Compiler>
-               <Unit filename="anticheat.qc" />
-               <Unit filename="anticheat.qh" />
-               <Unit filename="antilag.qc" />
-               <Unit filename="antilag.qh" />
-               <Unit filename="arena.qc" />
-               <Unit filename="assault.qc" />
-               <Unit filename="bot\aim.qc" />
-               <Unit filename="bot\aim.qh" />
-               <Unit filename="bot\bot.qc" />
-               <Unit filename="bot\bot.qh" />
-               <Unit filename="bot\havocbot\havocbot.qc" />
-               <Unit filename="bot\havocbot\havocbot.qh" />
-               <Unit filename="bot\havocbot\role_ctf.qc" />
-               <Unit filename="bot\havocbot\role_keyhunt.qc" />
-               <Unit filename="bot\havocbot\role_onslaught.qc" />
-               <Unit filename="bot\havocbot\roles.qc" />
-               <Unit filename="bot\navigation.qc" />
-               <Unit filename="bot\navigation.qh" />
-               <Unit filename="bot\scripting.qc" />
-               <Unit filename="bot\waypoints.qc" />
-               <Unit filename="bot\waypoints.qh" />
-               <Unit filename="builtins.qh" />
-               <Unit filename="campaign.qc" />
-               <Unit filename="campaign.qh" />
-               <Unit filename="cheats.qc" />
-               <Unit filename="cheats.qh" />
-               <Unit filename="cl_client.qc" />
-               <Unit filename="cl_impulse.qc" />
-               <Unit filename="cl_physics.qc" />
-               <Unit filename="cl_player.qc" />
-               <Unit filename="cl_weapons.qc" />
-               <Unit filename="cl_weaponsystem.qc" />
-               <Unit filename="clientcommands.qc" />
-               <Unit filename="constants.qh" />
-               <Unit filename="csqceffects.qc" />
-               <Unit filename="csqcprojectile.qc" />
-               <Unit filename="csqcprojectile.qh" />
-               <Unit filename="ctf.qc" />
-               <Unit filename="defs.qh" />
-               <Unit filename="domination.qc" />
-               <Unit filename="ent_cs.qc" />
-               <Unit filename="extensions.qh" />
-               <Unit filename="func_breakable.qc" />
-               <Unit filename="g_casings.qc" />
-               <Unit filename="g_damage.qc" />
-               <Unit filename="g_hook.qc" />
-               <Unit filename="g_hook.qh" />
-               <Unit filename="g_lights.qc" />
-               <Unit filename="g_models.qc" />
-               <Unit filename="g_subs.qc" />
-               <Unit filename="g_swamp.qc" />
-               <Unit filename="g_tetris.qc" />
-               <Unit filename="g_triggers.qc" />
-               <Unit filename="g_violence.qc" />
-               <Unit filename="g_world.qc" />
-               <Unit filename="gamecommand.qc" />
-               <Unit filename="ipban.qc" />
-               <Unit filename="ipban.qh" />
-               <Unit filename="miscfunctions.qc" />
-               <Unit filename="mode_onslaught.qc" />
-               <Unit filename="monsters\ai.qc" />
-               <Unit filename="monsters\defs.qc" />
-               <Unit filename="monsters\fight.qc" />
-               <Unit filename="monsters\m_monsters.qc" />
-               <Unit filename="monsters\mode_management.qc" />
-               <Unit filename="monsters\monster_zombie.qc" />
-               <Unit filename="movelib.qc" />
-               <Unit filename="mutators\base.qc" />
-               <Unit filename="mutators\base.qh" />
-               <Unit filename="mutators\gamemode_keyhunt.qc" />
-               <Unit filename="mutators\gamemode_keyhunt.qh" />
-               <Unit filename="mutators\mutator_dodging.qc" />
-               <Unit filename="mutators\mutator_dodging.qh" />
-               <Unit filename="mutators\mutator_nix.qc" />
-               <Unit filename="mutators\mutators.qh" />
-               <Unit filename="nexball.qc" />
-               <Unit filename="pathlib.qc" />
-               <Unit filename="pathlib\costs.qc" />
-               <Unit filename="pathlib\debug.qc" />
-               <Unit filename="pathlib\expandnode.qc" />
-               <Unit filename="pathlib\main.qc" />
-               <Unit filename="pathlib\movenode.qc" />
-               <Unit filename="pathlib\pathlib.qh" />
-               <Unit filename="pathlib\utility.qc" />
-               <Unit filename="playerdemo.qc" />
-               <Unit filename="playerdemo.qh" />
-               <Unit filename="portals.qc" />
-               <Unit filename="portals.qh" />
-               <Unit filename="post-builtins.qh" />
-               <Unit filename="pre-builtins.qh" />
-               <Unit filename="progs.src" />
-               <Unit filename="race.qc" />
-               <Unit filename="race.qh" />
-               <Unit filename="runematch.qc" />
-               <Unit filename="scores.qc" />
-               <Unit filename="scores.qh" />
-               <Unit filename="scores_rules.qc" />
-               <Unit filename="steerlib.qc" />
-               <Unit filename="sv_main.qc" />
-               <Unit filename="sv_stats.qc" />
-               <Unit filename="sys.qh" />
-               <Unit filename="t_halflife.qc" />
-               <Unit filename="t_items.qc" />
-               <Unit filename="t_jumppads.qc" />
-               <Unit filename="t_plats.qc" />
-               <Unit filename="t_quake.qc" />
-               <Unit filename="t_quake3.qc" />
-               <Unit filename="t_swamp.qc" />
-               <Unit filename="t_teleporters.qc" />
-               <Unit filename="target_spawn.qc" />
-               <Unit filename="teamplay.qc" />
-               <Unit filename="tturrets\include\turrets.qh" />
-               <Unit filename="tturrets\include\turrets_early.qh" />
-               <Unit filename="tturrets\system\system_aimprocs.qc" />
-               <Unit filename="tturrets\system\system_damage.qc" />
-               <Unit filename="tturrets\system\system_main.qc" />
-               <Unit filename="tturrets\system\system_misc.qc" />
-               <Unit filename="tturrets\system\system_scoreprocs.qc" />
-               <Unit filename="tturrets\units\unit_checkpoint.qc" />
-               <Unit filename="tturrets\units\unit_common.qc" />
-               <Unit filename="tturrets\units\unit_ewheel.qc" />
-               <Unit filename="tturrets\units\unit_flac.qc" />
-               <Unit filename="tturrets\units\unit_fusionreactor.qc" />
-               <Unit filename="tturrets\units\unit_hellion.qc" />
-               <Unit filename="tturrets\units\unit_hk.qc" />
-               <Unit filename="tturrets\units\unit_machinegun.qc" />
-               <Unit filename="tturrets\units\unit_mlrs.qc" />
-               <Unit filename="tturrets\units\unit_phaser.qc" />
-               <Unit filename="tturrets\units\unit_plasma.qc" />
-               <Unit filename="tturrets\units\unit_targettrigger.qc" />
-               <Unit filename="tturrets\units\unit_tessla.qc" />
-               <Unit filename="tturrets\units\unit_walker.qc" />
-               <Unit filename="vehicles\racer.qc" />
-               <Unit filename="vehicles\raptor.qc" />
-               <Unit filename="vehicles\spiderbot.qc" />
-               <Unit filename="vehicles\vehicles.qc" />
-               <Unit filename="vehicles\vehicles.qh" />
-               <Unit filename="verbstack.qc" />
-               <Unit filename="vote.qc" />
-               <Unit filename="vote.qh" />
-               <Unit filename="w_all.qc" />
-               <Unit filename="w_campingrifle.qc" />
-               <Unit filename="w_common.qc" />
-               <Unit filename="w_crylink.qc" />
-               <Unit filename="w_electro.qc" />
-               <Unit filename="w_fireball.qc" />
-               <Unit filename="w_grenadelauncher.qc" />
-               <Unit filename="w_minelayer.qc" />
-               <Unit filename="w_hagar.qc" />
-               <Unit filename="w_hlac.qc" />
-               <Unit filename="w_hook.qc" />
-               <Unit filename="w_laser.qc" />
-               <Unit filename="w_minstanex.qc" />
-               <Unit filename="w_nex.qc" />
-               <Unit filename="w_porto.qc" />
-               <Unit filename="w_rocketlauncher.qc" />
-               <Unit filename="w_shotgun.qc" />
-               <Unit filename="w_tuba.qc" />
-               <Unit filename="w_uzi.qc" />
-               <Unit filename="waypointsprites.qc" />
-               <Extensions>
-                       <code_completion />
-                       <debugger />
-               </Extensions>
-       </Project>
-</CodeBlocks_project_file>

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 2a0d8bc5374f456e9f935cc707c48ab3cd1ceb31..85009dd830967c11f8b9d1a3c08953db803f970d 100644 (file)
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -313,9 +313,31 @@ void spawnfunc_target_assault_roundstart() {
 
 // trigger new round
 // reset objectives, toggle spawnpoints, reset triggers, ...
-void assault_new_round() {
+void vehicles_clearrturn();
+void vehicles_spawn();
+void assault_new_round() 
+{
+    entity oldself;
        //bprint("ASSAULT: new round\n");
 
+       oldself = self;
+       // Eject players from vehicles
+    FOR_EACH_PLAYER(self)
+    {
+        if(self.vehicle)
+            vehicles_exit(VHEF_RELESE);        
+    }
+    
+    self = findchainflags(vehicle_flags, VHF_ISVEHICLE);
+    while(self)
+    {
+        vehicles_clearrturn();
+        vehicles_spawn();
+        self = self.chain;
+    }
+
+    self = oldself;
+
        // up round counter
        self.winning = self.winning + 1;
 
@@ -338,7 +360,7 @@ void assault_new_round() {
                                ent.team_saved = COLOR_TEAM1;
                }
        }
-
+       
        // reset the level with a countdown
        cvar_set("timelimit", ftos(ceil(time - game_starttime) / 60));
        ReadyRestartForce(); // sets game_starttime

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index c1d3162a5739da2da60f6604d6f4a72368414aaa..bace1dd7ea26f67dfa2e377c937eebca5e5aee1f 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -239,6 +239,11 @@ void SV_ParseClientCommand(string s) {
                if(self.classname == "player" && autocvar_sv_spectate == 1) {
                        ClientKill_TeamChange(-2); // observe
                }
+               if(g_ca && self.caplayer && (self.classname == "spectator" || self.classname == "observer")) {
+                       // in CA, allow a dead player to move to spectatators (without that, caplayer!=0 will be moved back to the player list)
+                       sprint(self, "WARNING: you will spectate in the next round.\n");
+                       self.caplayer = 0;
+               }
        } else if(cmd == "join") {
                if not(self.flags & FL_CLIENT)
                        return;

diff --git a/qcsrc/server/mode_onslaught.qc b/qcsrc/server/mode_onslaught.qc
index 457141f74a5fc4042a7ee6fce50a434987a16a08..4f6b6328d466e1d3e2e72925198a0cd81ec0cd57 100644 (file)
--- a/qcsrc/server/mode_onslaught.qc
+++ b/qcsrc/server/mode_onslaught.qc
@@ -1067,33 +1067,55 @@ void onslaught_controlpoint_icon_think()
 
                self.owner.waslinked = self.owner.islinked;
        }
-       if (self.punchangle_x > 2)
-               self.punchangle_x = self.punchangle_x - 2;
-       else if (self.punchangle_x < -2)
-               self.punchangle_x = self.punchangle_x + 2;
-       else
-               self.punchangle_x = 0;
-       if (self.punchangle_y > 2)
-               self.punchangle_y = self.punchangle_y - 2;
-       else if (self.punchangle_y < -2)
-               self.punchangle_y = self.punchangle_y + 2;
-       else
-               self.punchangle_y = 0;
-       if (self.punchangle_z > 2)
-               self.punchangle_z = self.punchangle_z - 2;
-       else if (self.punchangle_z < -2)
-               self.punchangle_z = self.punchangle_z + 2;
-       else
-               self.punchangle_z = 0;
+
+       if (self.punchangle_x > 0)
+       {
+               self.punchangle_x = self.punchangle_x - 60 * sys_frametime;
+               if (self.punchangle_x < 0)
+                       self.punchangle_x = 0;
+       }
+       else if (self.punchangle_x < 0)
+       {
+               self.punchangle_x = self.punchangle_x + 60 * sys_frametime;
+               if (self.punchangle_x > 0)
+                       self.punchangle_x = 0;
+       }
+
+       if (self.punchangle_y > 0)
+       {
+               self.punchangle_y = self.punchangle_y - 60 * sys_frametime;
+               if (self.punchangle_y < 0)
+                       self.punchangle_y = 0;
+       }
+       else if (self.punchangle_y < 0)
+       {
+               self.punchangle_y = self.punchangle_y + 60 * sys_frametime;
+               if (self.punchangle_y > 0)
+                       self.punchangle_y = 0;
+       }
+
+       if (self.punchangle_z > 0)
+       {
+               self.punchangle_z = self.punchangle_z - 60 * sys_frametime;
+               if (self.punchangle_z < 0)
+                       self.punchangle_z = 0;
+       }
+       else if (self.punchangle_z < 0)
+       {
+               self.punchangle_z = self.punchangle_z + 60 * sys_frametime;
+               if (self.punchangle_z > 0)
+                       self.punchangle_z = 0;
+       }
+
        self.angles_x = self.punchangle_x;
        self.angles_y = self.punchangle_y + self.mangle_y;
        self.angles_z = self.punchangle_z;
-       self.mangle_y = self.mangle_y + 1.5;
+       self.mangle_y = self.mangle_y + 45 * sys_frametime;
 
-       self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd / 8));
-       self.cp_bob_spd = self.cp_bob_spd + 0.5;
+       self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd));
+       self.cp_bob_spd = self.cp_bob_spd + 1.875 * sys_frametime;
        if(self.cp_bob_dmg_z > 0)
-               self.cp_bob_dmg_z = self.cp_bob_dmg_z - 0.1;
+               self.cp_bob_dmg_z = self.cp_bob_dmg_z - 3 * sys_frametime;
        else
                self.cp_bob_dmg_z = 0;
        setorigin(self,self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg);

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 9fbd6541fc8e6af51254de34bc4a2eb9e772ff91..e3c74c5e190c864a1d0832834729d2fc4b534979 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -669,6 +669,10 @@ void spawnfunc_vehicle_racer()
         self.vehicle_flags |= VHF_HEALTHREGEN;
 
     self.think = racer_dinit;
-    self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
+    
+    if(g_assault)
+        self.nextthink = time + 0.5;
+    else
+        self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_racer_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
 }
 #endif // SVQC

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 26054ae092b7f4e8c2a14521b2769620eba5587f..201c186c37947d65ad983efd0b4c67c1f0484120 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -734,6 +734,10 @@ void spawnfunc_vehicle_raptor()
     precache_sound ("vehicles/raptor_speed.wav");
     
     self.think = raptor_dinit;
-    self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
+    
+    if(g_assault)
+        self.nextthink = time + 0.5;
+    else
+        self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_raptor_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
 }
 #endif // SVQC

diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 8d64ca420fef310560898e3524225c814461ffad..f43ec08e52f35f9a792a172a82c6a9da3e4f0093 100644 (file)
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -673,7 +673,11 @@ void spawnfunc_vehicle_spiderbot()
     if(autocvar_g_vehicle_spiderbot_health_regen)
         self.vehicle_flags |= VHF_HEALTHREGEN;
     
-    self.think = vewhicle_spiderbot_dinit;    
-    self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
+    self.think = vewhicle_spiderbot_dinit;
+    
+    if(g_assault)
+        self.nextthink = time + 0.5;
+    else
+        self.nextthink = time + (autocvar_g_vehicles_delayspawn ? autocvar_g_vehicle_spiderbot_respawntime + (random() * autocvar_g_vehicles_delayspawn_jitter) : 0.5);
 }
 #endif // SVQC

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 901e68ff1b920dea2d533aab2654c978d919188f..d9d77b5f5211957f539c4ee41b1057beec0980a4 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -618,7 +618,9 @@ void vehicles_exit(float eject)
 
     if(!teamplay)
         self.team = 0;
-
+    else
+        self.team = self.tur_head.team;
+    
     if(self.owner.flagcarried)
     {
         self.owner.flagcarried.scale = 0.6;
@@ -629,6 +631,7 @@ void vehicles_exit(float eject)
     sound (self, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTN_NORM);
     self.vehicle_exit(eject);
     self.owner = world;
+    vehicles_reset_colors();
     
     if(oldself)
         self = oldself;
@@ -845,7 +848,7 @@ void vehicles_setreturn()
     ret.classname   = "vehicle_return";
     ret.enemy       = self;    
     ret.team        = self.team;
-    ret.think       = vehicles_showwp;        
+    ret.think       = vehicles_showwp;
     
     if(self.deadflag != DEAD_NO)
     {
@@ -856,8 +859,6 @@ void vehicles_setreturn()
     {
         ret.nextthink   = min(time + self.vehicle_respawntime, time + self.vehicle_respawntime - 1);        
     }
-        
-    
     
     setmodel(ret, "null");
     setorigin(ret, self.pos1 + '0 0 96');
@@ -959,7 +960,7 @@ float vehicle_initialize(string  net_name,
 
     if(self.team && !teamplay)
         self.team = 0;
-
+        
     self.vehicle_flags |= VHF_ISVEHICLE;
     
     setmodel(self, bodymodel);
@@ -1018,7 +1019,8 @@ float vehicle_initialize(string  net_name,
 
     self.pos1 = self.origin;
     self.pos2 = self.angles;
-
+    self.tur_head.team = self.team;
+    
     return TRUE;
 }
 

diff --git a/qcsrc/xonotic-gamecode.workspace b/qcsrc/xonotic-gamecode.workspace
deleted file mode 100644 (file)
index 3f4a59a..0000000
--- a/qcsrc/xonotic-gamecode.workspace
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-       <Workspace title="Xonotic Gamecode">
-               <Project filename="qc-server.cbp" active="1" />
-               <Project filename="qc-client.cbp" />
-               <Project filename="qc-common.cbp" />
-       </Workspace>
-</CodeBlocks_workspace_file>