From 9478a545da5866146c11b7706ad69cce65f6c364 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 8 Jan 2009 18:18:10 +0000 Subject: [PATCH] menu rearrangements item_respawn effect more particles git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5455 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/effectinfo.txt | 2 +- data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c | 2 +- data/qcsrc/menu/nexuiz/dialog_settings_audio.c | 4 ++-- data/qcsrc/menu/nexuiz/dialog_settings_video.c | 1 + data/qcsrc/server/cl_player.qc | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/data/effectinfo.txt b/data/effectinfo.txt index 3f8582994..edf3ea80a 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -850,7 +850,7 @@ size 32 32 alpha 128 128 128 // cloud of particles which expand rapidly and then slow to form a ball effect item_respawn -count 64 +count 256 type spark tex 41 41 color 0x63F2EA 0x63f2EA diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c index 1a5cce6ec..82eaf8e20 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c @@ -7,7 +7,7 @@ CLASS(NexuizMutatorsDialog) EXTENDS(NexuizDialog) ATTRIB(NexuizMutatorsDialog, title, string, "Mutators") ATTRIB(NexuizMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS) ATTRIB(NexuizMutatorsDialog, intendedWidth, float, 0.8) - ATTRIB(NexuizMutatorsDialog, rows, float, 16) + ATTRIB(NexuizMutatorsDialog, rows, float, 17) ATTRIB(NexuizMutatorsDialog, columns, float, 6) ATTRIB(NexuizMutatorsDialog, refilterEntity, entity, NULL) ENDCLASS(NexuizMutatorsDialog) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_audio.c b/data/qcsrc/menu/nexuiz/dialog_settings_audio.c index d6d5f6056..27bb60016 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_audio.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_audio.c @@ -126,6 +126,8 @@ void fillNexuizAudioSettingsTab(entity me) me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "snd_spatialization_control", "Headphone friendly mode")); setDependent(e, "snd_channels", 1.5, 0.5); me.TR(me); + me.TR(me); + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_taunt_directional", "Play taunts directionally")); me.TR(me); sl = makeNexuizSlider(0.15, 1, 0.05, "cl_autotaunt"); me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "Automatic taunts")); @@ -134,8 +136,6 @@ void fillNexuizAudioSettingsTab(entity me) me.TR(me); me.TD(me, 1, 3, e = makeNexuizTextLabel(0.1, "Frequency:")); me.TD(me, 1, 2, sl); - me.TR(me); - me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_taunt_directional", "Play taunts directionally")); me.TR(me); me.TR(me); me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "cl_hitsound", "Hit indicator")); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_video.c b/data/qcsrc/menu/nexuiz/dialog_settings_video.c index cba65108a..7ae26840f 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_video.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_video.c @@ -90,6 +90,7 @@ void fillNexuizVideoSettingsTab(entity me) me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(4, 1, "vid_samples", "Use 4x multisampling")); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Left handed mode")); me.TR(me); diff --git a/data/qcsrc/server/cl_player.qc b/data/qcsrc/server/cl_player.qc index adc0b550f..1744f7c48 100644 --- a/data/qcsrc/server/cl_player.qc +++ b/data/qcsrc/server/cl_player.qc @@ -292,7 +292,7 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float self.dmg_take = self.dmg_take + take;//max(take - 10, 0); self.dmg_inflictor = inflictor; - if (self.health <= -50) + if (self.health <= -75) { // don't use any animations as a gib self.frame = 0; -- 2.39.2