Merge branch 'master' into TimePath/combined_updates

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index c6e28bc2b4a290cd08c04a7d5939d3045635b880..6b8f41dbdc4ae703799042906941b20522d6cdc6 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -240,11 +240,18 @@ void player_setupanimsformodel()
 void player_anim (void)
 {
        float deadbits = (self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2));
-       if(self.deadflag && !deadbits)
-               if(random() < 0.5)
-                       deadbits = ANIMSTATE_DEAD1;
-               else
-                       deadbits = ANIMSTATE_DEAD2;
+       if(self.deadflag) {
+               if (!deadbits) {
+                       // Decide on which death animation to use.
+                       if(random() < 0.5)
+                               deadbits = ANIMSTATE_DEAD1;
+                       else
+                               deadbits = ANIMSTATE_DEAD2;
+               }
+       } else {
+               // Clear a previous death animation.
+               deadbits = 0;
+       }
        float animbits = deadbits;
        if(self.frozen)
                animbits |= ANIMSTATE_FROZEN;

diff --git a/sound/tutorial/1-welcome.ogg b/sound/tutorial/1-welcome.ogg
deleted file mode 100644 (file)
index 05ff8eb..0000000
Binary files a/sound/tutorial/1-welcome.ogg and /dev/null differ

diff --git a/sound/tutorial/10-at_corp_switch.ogg b/sound/tutorial/10-at_corp_switch.ogg
deleted file mode 100644 (file)
index d312e51..0000000
Binary files a/sound/tutorial/10-at_corp_switch.ogg and /dev/null differ

diff --git a/sound/tutorial/11-behind_glass.ogg b/sound/tutorial/11-behind_glass.ogg
deleted file mode 100644 (file)
index 89fadfc..0000000
Binary files a/sound/tutorial/11-behind_glass.ogg and /dev/null differ

diff --git a/sound/tutorial/12-crylink.ogg b/sound/tutorial/12-crylink.ogg
deleted file mode 100644 (file)
index 1b69ddf..0000000
Binary files a/sound/tutorial/12-crylink.ogg and /dev/null differ

diff --git a/sound/tutorial/13-no_imitations.ogg b/sound/tutorial/13-no_imitations.ogg
deleted file mode 100644 (file)
index 2939a80..0000000
Binary files a/sound/tutorial/13-no_imitations.ogg and /dev/null differ

diff --git a/sound/tutorial/14-room_with_switch.ogg b/sound/tutorial/14-room_with_switch.ogg
deleted file mode 100644 (file)
index c311f4e..0000000
Binary files a/sound/tutorial/14-room_with_switch.ogg and /dev/null differ

diff --git a/sound/tutorial/15-x_marks_the_spot.ogg b/sound/tutorial/15-x_marks_the_spot.ogg
deleted file mode 100644 (file)
index b3781c6..0000000
Binary files a/sound/tutorial/15-x_marks_the_spot.ogg and /dev/null differ

diff --git a/sound/tutorial/16-shoot_with_electro.ogg b/sound/tutorial/16-shoot_with_electro.ogg
deleted file mode 100644 (file)
index 6a142d9..0000000
Binary files a/sound/tutorial/16-shoot_with_electro.ogg and /dev/null differ

diff --git a/sound/tutorial/17-deeper.ogg b/sound/tutorial/17-deeper.ogg
deleted file mode 100644 (file)
index 7da896c..0000000
Binary files a/sound/tutorial/17-deeper.ogg and /dev/null differ

diff --git a/sound/tutorial/18-fire_then_fire.ogg b/sound/tutorial/18-fire_then_fire.ogg
deleted file mode 100644 (file)
index 2d5d382..0000000
Binary files a/sound/tutorial/18-fire_then_fire.ogg and /dev/null differ

diff --git a/sound/tutorial/19-activates_the_buried_switch.ogg b/sound/tutorial/19-activates_the_buried_switch.ogg
deleted file mode 100644 (file)
index 76940bc..0000000
Binary files a/sound/tutorial/19-activates_the_buried_switch.ogg and /dev/null differ

diff --git a/sound/tutorial/2-jumppad.ogg b/sound/tutorial/2-jumppad.ogg
deleted file mode 100644 (file)
index 964efa2..0000000
Binary files a/sound/tutorial/2-jumppad.ogg and /dev/null differ

diff --git a/sound/tutorial/20-at_corp_says_you_are_smart.ogg b/sound/tutorial/20-at_corp_says_you_are_smart.ogg
deleted file mode 100644 (file)
index fd5f9fd..0000000
Binary files a/sound/tutorial/20-at_corp_says_you_are_smart.ogg and /dev/null differ

diff --git a/sound/tutorial/21-rocket_launcher.ogg b/sound/tutorial/21-rocket_launcher.ogg
deleted file mode 100644 (file)
index 31824d0..0000000
Binary files a/sound/tutorial/21-rocket_launcher.ogg and /dev/null differ

diff --git a/sound/tutorial/22-as_a_special_feature.ogg b/sound/tutorial/22-as_a_special_feature.ogg
deleted file mode 100644 (file)
index f2ccfda..0000000
Binary files a/sound/tutorial/22-as_a_special_feature.ogg and /dev/null differ

diff --git a/sound/tutorial/23-hold_the_fire_button.ogg b/sound/tutorial/23-hold_the_fire_button.ogg
deleted file mode 100644 (file)
index b5f43b2..0000000
Binary files a/sound/tutorial/23-hold_the_fire_button.ogg and /dev/null differ

diff --git a/sound/tutorial/24-guide_the_rocket.ogg b/sound/tutorial/24-guide_the_rocket.ogg
deleted file mode 100644 (file)
index 9271d61..0000000
Binary files a/sound/tutorial/24-guide_the_rocket.ogg and /dev/null differ

diff --git a/sound/tutorial/25-omg_laser.ogg b/sound/tutorial/25-omg_laser.ogg
deleted file mode 100644 (file)
index ad53e9a..0000000
Binary files a/sound/tutorial/25-omg_laser.ogg and /dev/null differ

diff --git a/sound/tutorial/26-the_red_platform.ogg b/sound/tutorial/26-the_red_platform.ogg
deleted file mode 100644 (file)
index 48b6ced..0000000
Binary files a/sound/tutorial/26-the_red_platform.ogg and /dev/null differ

diff --git a/sound/tutorial/27-wga.ogg b/sound/tutorial/27-wga.ogg
deleted file mode 100644 (file)
index 3066024..0000000
Binary files a/sound/tutorial/27-wga.ogg and /dev/null differ

diff --git a/sound/tutorial/28-grappling_hook.ogg b/sound/tutorial/28-grappling_hook.ogg
deleted file mode 100644 (file)
index e46ea02..0000000
Binary files a/sound/tutorial/28-grappling_hook.ogg and /dev/null differ

diff --git a/sound/tutorial/29-hooker.ogg b/sound/tutorial/29-hooker.ogg
deleted file mode 100644 (file)
index d297b4e..0000000
Binary files a/sound/tutorial/29-hooker.ogg and /dev/null differ

diff --git a/sound/tutorial/3-death.ogg b/sound/tutorial/3-death.ogg
deleted file mode 100644 (file)
index 87d40d0..0000000
Binary files a/sound/tutorial/3-death.ogg and /dev/null differ

diff --git a/sound/tutorial/30-destination_of_the_hook.ogg b/sound/tutorial/30-destination_of_the_hook.ogg
deleted file mode 100644 (file)
index 5b17502..0000000
Binary files a/sound/tutorial/30-destination_of_the_hook.ogg and /dev/null differ

diff --git a/sound/tutorial/31-pogo_stick.ogg b/sound/tutorial/31-pogo_stick.ogg
deleted file mode 100644 (file)
index 19ef0a9..0000000
Binary files a/sound/tutorial/31-pogo_stick.ogg and /dev/null differ

diff --git a/sound/tutorial/32-way_to_go_champ.ogg b/sound/tutorial/32-way_to_go_champ.ogg
deleted file mode 100644 (file)
index aab3ce4..0000000
Binary files a/sound/tutorial/32-way_to_go_champ.ogg and /dev/null differ

diff --git a/sound/tutorial/33-cr-vi.ogg b/sound/tutorial/33-cr-vi.ogg
deleted file mode 100644 (file)
index 5d19619..0000000
Binary files a/sound/tutorial/33-cr-vi.ogg and /dev/null differ

diff --git a/sound/tutorial/34-pierce_walls.ogg b/sound/tutorial/34-pierce_walls.ogg
deleted file mode 100644 (file)
index c50042d..0000000
Binary files a/sound/tutorial/34-pierce_walls.ogg and /dev/null differ

diff --git a/sound/tutorial/35-shoot_your_instructor.ogg b/sound/tutorial/35-shoot_your_instructor.ogg
deleted file mode 100644 (file)
index 5c27ef8..0000000
Binary files a/sound/tutorial/35-shoot_your_instructor.ogg and /dev/null differ

diff --git a/sound/tutorial/36-hit_me.ogg b/sound/tutorial/36-hit_me.ogg
deleted file mode 100644 (file)
index eccbc9a..0000000
Binary files a/sound/tutorial/36-hit_me.ogg and /dev/null differ

diff --git a/sound/tutorial/36-just_shoot_it.ogg b/sound/tutorial/36-just_shoot_it.ogg
deleted file mode 100644 (file)
index 4b1c30a..0000000
Binary files a/sound/tutorial/36-just_shoot_it.ogg and /dev/null differ

diff --git a/sound/tutorial/37-I_am_waiting.ogg b/sound/tutorial/37-I_am_waiting.ogg
deleted file mode 100644 (file)
index 78a6cfb..0000000
Binary files a/sound/tutorial/37-I_am_waiting.ogg and /dev/null differ

diff --git a/sound/tutorial/38-impatient.ogg b/sound/tutorial/38-impatient.ogg
deleted file mode 100644 (file)
index 0b8d173..0000000
Binary files a/sound/tutorial/38-impatient.ogg and /dev/null differ

diff --git a/sound/tutorial/39-srs_trouble.ogg b/sound/tutorial/39-srs_trouble.ogg
deleted file mode 100644 (file)
index ae3bace..0000000
Binary files a/sound/tutorial/39-srs_trouble.ogg and /dev/null differ

diff --git a/sound/tutorial/4-big_jump.ogg b/sound/tutorial/4-big_jump.ogg
deleted file mode 100644 (file)
index 24d5032..0000000
Binary files a/sound/tutorial/4-big_jump.ogg and /dev/null differ

diff --git a/sound/tutorial/5-to_the_left_to_the_left.ogg b/sound/tutorial/5-to_the_left_to_the_left.ogg
deleted file mode 100644 (file)
index 3a3830a..0000000
Binary files a/sound/tutorial/5-to_the_left_to_the_left.ogg and /dev/null differ

diff --git a/sound/tutorial/6-air_friction.ogg b/sound/tutorial/6-air_friction.ogg
deleted file mode 100644 (file)
index 811fbe6..0000000
Binary files a/sound/tutorial/6-air_friction.ogg and /dev/null differ

diff --git a/sound/tutorial/7-rocket_at_you.ogg b/sound/tutorial/7-rocket_at_you.ogg
deleted file mode 100644 (file)
index 5163486..0000000
Binary files a/sound/tutorial/7-rocket_at_you.ogg and /dev/null differ

diff --git a/sound/tutorial/8-shoot-switch.ogg b/sound/tutorial/8-shoot-switch.ogg
deleted file mode 100644 (file)
index 5615297..0000000
Binary files a/sound/tutorial/8-shoot-switch.ogg and /dev/null differ

diff --git a/sound/tutorial/9-unbreakable.ogg b/sound/tutorial/9-unbreakable.ogg
deleted file mode 100644 (file)
index 852b537..0000000
Binary files a/sound/tutorial/9-unbreakable.ogg and /dev/null differ

diff --git a/sound/tutorial/frag_on.ogg b/sound/tutorial/frag_on.ogg
deleted file mode 100644 (file)
index e8636cb..0000000
Binary files a/sound/tutorial/frag_on.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-at_corp_rap.ogg b/sound/tutorial/misc-at_corp_rap.ogg
deleted file mode 100644 (file)
index 9ec4f4a..0000000
Binary files a/sound/tutorial/misc-at_corp_rap.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-detonate.ogg b/sound/tutorial/misc-detonate.ogg
deleted file mode 100644 (file)
index 695c592..0000000
Binary files a/sound/tutorial/misc-detonate.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-did_yoda_show_you_that.ogg b/sound/tutorial/misc-did_yoda_show_you_that.ogg
deleted file mode 100644 (file)
index cec140a..0000000
Binary files a/sound/tutorial/misc-did_yoda_show_you_that.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-door.ogg b/sound/tutorial/misc-door.ogg
deleted file mode 100644 (file)
index 93c9532..0000000
Binary files a/sound/tutorial/misc-door.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-emergency_tele.ogg b/sound/tutorial/misc-emergency_tele.ogg
deleted file mode 100644 (file)
index efa552a..0000000
Binary files a/sound/tutorial/misc-emergency_tele.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-excellent.ogg b/sound/tutorial/misc-excellent.ogg
deleted file mode 100644 (file)
index 76691ae..0000000
Binary files a/sound/tutorial/misc-excellent.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-good_work.ogg b/sound/tutorial/misc-good_work.ogg
deleted file mode 100644 (file)
index 0b90df0..0000000
Binary files a/sound/tutorial/misc-good_work.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-nice.ogg b/sound/tutorial/misc-nice.ogg
deleted file mode 100644 (file)
index 06b711d..0000000
Binary files a/sound/tutorial/misc-nice.ogg and /dev/null differ

diff --git a/sound/tutorial/misc-very_impressive.ogg b/sound/tutorial/misc-very_impressive.ogg
deleted file mode 100644 (file)
index 49082a5..0000000
Binary files a/sound/tutorial/misc-very_impressive.ogg and /dev/null differ