Merge branch 'master' into fruitiex/newpanelhud_stable

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 5c2800aa85855dd3eb76cf1017f005b09290d885..6aeb7e9339c4ab4005803aebb935b7978d4f6fa6 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -206,6 +206,9 @@ seta crosshair_fireball_color_green 1.0     "crosshair color green component to disp
 seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball"
 seta crosshair_fireball_color_alpha 1  "crosshair alpha value to display when wielding the fireball"
 seta crosshair_fireball_size 1 "crosshair size when wielding the fireball"
+seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
+seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
+seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
 fov 90
 seta cl_velocityzoom 0 "velocity based zooming of fov, negative values zoom out"
 seta cl_velocityzoomtime 0.3   "time value for averaging speed values"
@@ -501,7 +504,6 @@ set g_laserguided_missile 0 "if set to 1 the rockets of the rocket launcher can
 set g_midair 0 "if set to 1 you can only apply damage to your opponent while he is airborne"
 set g_midair_shieldtime 0.3 "number of seconds you are still invincible since you lost contact to the ground"
 set g_spawnsound 1 "set to 0 if you don't want to hear the spawn sound when a player spawns"
-set g_spawnpoints_autodrop 0 "if set to 1, automatically drop spawn point locations if they were placed too high"
 set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid"
 set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once <g_respawn_delay> seconds are over"
 set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)"
@@ -547,6 +549,7 @@ set sv_dodging_wall_distance_threshold 10 "the maximum distance from a wall that
 set sv_dodging_sound 1 "if 1 dodging makes a sound. if 0 dodging is silent"
 
 set leadlimit 0
+set leadlimit_and_fraglimit 0 "if set, leadlimit is ANDed with fraglimit (otherwise ORed)"
 
 // this means that timelimit can be overidden globally and fraglimit can be overidden for each game mode: DM/TDM, Domination, CTF, and Runematch.
 seta timelimit_override -1     "Time limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
@@ -910,8 +913,12 @@ alias sv_loadconfig "exec $serverconfig"
 alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self"
 
 // aliases:
-alias +attack2 +button3
-alias -attack2 -button3
+alias +fire +attack
+alias -fire -attack
+alias +fire2 +button3
+alias -fire2 -button3
+alias +attack2 +button3 // old alias from Nexuiz
+alias -attack2 -button3 // old alias name from Nexuiz
 alias +zoom +button4
 alias -zoom -button4
 alias +crouch +button5
@@ -954,8 +961,8 @@ bind 8 "impulse 8"
 bind 9 "impulse 9"
 bind 0 "impulse 14" // cycles the superweapons
 bind q weaplast
-bind MOUSE1 +attack
-bind MOUSE2 +attack2
+bind MOUSE1 +fire
+bind MOUSE2 +fire2
 bind MOUSE3 +zoom
 bind MOUSE4 weaplast
 bind MOUSE5 +hook
@@ -989,8 +996,8 @@ bind JOY1 "+crouch"
 bind JOY2 "+jump"
 bind JOY3 "weapprev"
 bind JOY4 "weapnext"
-bind JOY5 "+attack2"
-bind JOY6 "+attack"
+bind JOY5 "+fire2"
+bind JOY6 "+fire"
 bind JOY7 "+zoom"
 bind JOY8 "dropweapon"
 bind JOY9 "menu_showteamselect"
@@ -1690,6 +1697,7 @@ alias cl_hook_gamestart_rc
 alias cl_hook_gamestart_nexball
 alias cl_hook_gamestart_cts
 alias cl_hook_gameend
+alias cl_hook_activeweapon
 
 alias _sv_hook_gamestart "set _sv_hook_gametype $1; _sv_hook_gamestart_stage2"
 alias _sv_hook_gamestart_stage2 "sv_hook_gamestart_all; sv_hook_gamestart_${_sv_hook_gametype}"

diff --git a/gfx/reticle_nex.tga b/gfx/reticle_nex.tga
new file mode 100644 (file)
index 0000000..3e0c142
Binary files /dev/null and b/gfx/reticle_nex.tga differ

diff --git a/gfx/reticle_normal.tga b/gfx/reticle_normal.tga
new file mode 100644 (file)
index 0000000..8b82ea8
Binary files /dev/null and b/gfx/reticle_normal.tga differ

diff --git a/hook-firing_swap.cfg b/hook-firing_swap.cfg
new file mode 100644 (file)
index 0000000..e556db7
--- /dev/null
+++ b/hook-firing_swap.cfg
@@ -0,0 +1,57 @@
+// This script allows swapping the primary and secondary fire buttons for any weapon
+//
+// To install, add
+//   exec hook-firing_swap.cfg
+// to your autoexec.cfg
+
+// NOTE: if combined with other scripts that also hook cl_hook_activeweapon, do
+//   alias cl_hook_activeweapon "firing_swap $1; commands of other scripts..."
+// after exec'ing them all from your autoexec.cfg
+
+// Set the cvars for each gun
+seta cl_swapattacks_tuba 0
+seta cl_swapattacks_laser 0
+seta cl_swapattacks_shotgun 0
+seta cl_swapattacks_uzi 0
+seta cl_swapattacks_campingrifle 0
+seta cl_swapattacks_grenadelauncher 0
+seta cl_swapattacks_electro 0
+seta cl_swapattacks_hlac 0
+seta cl_swapattacks_crylink 0
+seta cl_swapattacks_minstanex 0
+seta cl_swapattacks_nex 0
+seta cl_swapattacks_hagar 0
+seta cl_swapattacks_seeker 0
+seta cl_swapattacks_fireball 0
+seta cl_swapattacks_rocketlauncher 0
+seta cl_swapattacks_hook 0
+seta cl_swapattacks_porto 0
+
+// This part of the code is necessary to keep us firing when we switch weapons while holding a fire button pressed
+// Also updates the keys before firing, so we don't have to switch to another weapon and back to apply the changes
+set fire_last 0
+set fire2_last 0
+alias +fire "firing_swap_apply $firing_lastweapon; set fire_last 1; +checkattack"
+alias -fire "set fire_last 0; -checkattack"
+alias +fire2 "firing_swap_apply $firing_lastweapon; set fire2_last 1; +checkattack2"
+alias -fire2 "set fire2_last 0; -checkattack2"
+alias firing_switch_attack_0 ""
+alias firing_switch_attack2_0 ""
+alias firing_switch_attack_1 "+fire"
+alias firing_switch_attack2_1 "+fire2"
+alias firing_switch "-fire; -fire2; firing_switch_attack_$fire_last; firing_switch_attack2_$fire2_last;"
+
+// Now apply changes to the key binds and get the weapon we are using
+alias firing_decision_0 "alias +checkattack +attack; alias -checkattack -attack; alias +checkattack2 +attack2; alias -checkattack2 -attack2"
+alias firing_decision_1 "alias +checkattack +attack2; alias -checkattack -attack2; alias +checkattack2 +attack; alias -checkattack2 -attack"
+alias firing_swap_apply "firing_decision_${$1}"
+alias firing_swap "firing_swap_apply cl_swapattacks_$1; set firing_lastweapon cl_swapattacks_$1; firing_switch"
+
+// Not correct, but prevents firing from braking after executing the script until switching weapons
+alias +fire +attack
+alias -fire -attack
+alias +fire2 +attack2
+alias -fire2 -attack2
+
+// install
+alias cl_hook_activeweapon "firing_swap $1"

diff --git a/keybinds.txt b/keybinds.txt
index 1aee5d8189a56169f1e9bf8d6c7fd507a800105a..028547ac27ac68b76f66c1c3696228247888e659 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -8,8 +8,8 @@
 "+hook"                                 "off-hand hook / jet pack"
 ""                                      ""
 ""                                      "Attacking"
-"+attack"                               "primary fire"
-"+attack2"                              "secondary fire"
+"+fire"                                 "primary fire"
+"+fire2"                                "secondary fire"
 ""                                      ""
 ""                                      "Weapon switching"
 "weapprev"                              "previous"

diff --git a/models/player/erebus.iqm_0.sounds b/models/player/erebus.iqm_0.sounds
new file mode 100644 (file)
index 0000000..831cc46
--- /dev/null
+++ b/models/player/erebus.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/soldier/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/soldier/coms/attackinfive 0
+coverme sound/player/soldier/coms/coverme 0
+defend sound/player/soldier/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/soldier/coms/freelance 2
+getflag sound/player/soldier/player/getflag 0
+incoming sound/player/soldier/coms/incoming 0
+meet sound/player/soldier/coms/meet 0
+needhelp sound/player/soldier/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/soldier/coms/seenflag 0
+taunt sound/player/soldier/coms/taunt 3
+teamshoot sound/player/soldier/coms/teamshoot 3
+death sound/player/soldier/player/death 3
+drown sound/player/soldier/player/drown 0
+fall sound/player/soldier/player/fall 0
+falling sound/player/soldier/player/falling 0
+gasp sound/player/soldier/player/gasp 0
+jump sound/player/soldier/player/jump 0
+pain25 sound/player/soldier/player/pain25 0
+pain50 sound/player/soldier/player/pain50 0
+pain75 sound/player/soldier/player/pain75 0
+pain100 sound/player/soldier/player/pain100 0

diff --git a/models/player/erebus_lod1.iqm b/models/player/erebus_lod1.iqm
new file mode 100644 (file)
index 0000000..21cd3d4
Binary files /dev/null and b/models/player/erebus_lod1.iqm differ

diff --git a/models/player/erebus_lod1.iqm.framegroups b/models/player/erebus_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/erebus_lod1.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/erebus_lod2.iqm b/models/player/erebus_lod2.iqm
new file mode 100644 (file)
index 0000000..34e7e80
Binary files /dev/null and b/models/player/erebus_lod2.iqm differ

diff --git a/models/player/erebus_lod2.iqm.framegroups b/models/player/erebus_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/erebus_lod2.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/gak.iqm_0.sounds b/models/player/gak.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
+++ b/models/player/gak.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/gakarmored.iqm_0.sounds b/models/player/gakarmored.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
+++ b/models/player/gakarmored.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/gakmasked.iqm_0.sounds b/models/player/gakmasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
+++ b/models/player/gakmasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/ignis.iqm_0.sounds b/models/player/ignis.iqm_0.sounds
new file mode 100644 (file)
index 0000000..952ba1c
--- /dev/null
+++ b/models/player/ignis.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: insurrectionist
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/insurrectionist/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/insurrectionist/coms/attackinfive 0
+coverme sound/player/insurrectionist/coms/coverme 0
+defend sound/player/insurrectionist/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/insurrectionist/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/insurrectionist/coms/incoming 0
+meet sound/player/insurrectionist/coms/meet 0
+needhelp sound/player/insurrectionist/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/insurrectionist/coms/seenflag 0
+taunt sound/player/insurrectionist/coms/taunt 4
+teamshoot sound/player/insurrectionist/coms/teamshoot 3
+death sound/player/insurrectionist/player/death 3
+drown sound/player/insurrectionist/player/drown 0
+fall sound/player/insurrectionist/player/fall 0
+falling sound/player/insurrectionist/player/falling 0
+gasp sound/player/insurrectionist/player/gasp 0
+jump sound/player/insurrectionist/player/jump 0
+pain25 sound/player/insurrectionist/player/pain25 0
+pain50 sound/player/insurrectionist/player/pain50 0
+pain75 sound/player/insurrectionist/player/pain75 0
+pain100 sound/player/insurrectionist/player/pain100 0

diff --git a/models/player/ignis_lod1.iqm b/models/player/ignis_lod1.iqm
new file mode 100644 (file)
index 0000000..38a6b3b
Binary files /dev/null and b/models/player/ignis_lod1.iqm differ

diff --git a/models/player/ignis_lod1.iqm.framegroups b/models/player/ignis_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/ignis_lod1.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/ignis_lod2.iqm b/models/player/ignis_lod2.iqm
new file mode 100644 (file)
index 0000000..ac9a406
Binary files /dev/null and b/models/player/ignis_lod2.iqm differ

diff --git a/models/player/ignis_lod2.iqm.framegroups b/models/player/ignis_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/ignis_lod2.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/ignishalfmasked.iqm_0.sounds b/models/player/ignishalfmasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..952ba1c
--- /dev/null
+++ b/models/player/ignishalfmasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: insurrectionist
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/insurrectionist/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/insurrectionist/coms/attackinfive 0
+coverme sound/player/insurrectionist/coms/coverme 0
+defend sound/player/insurrectionist/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/insurrectionist/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/insurrectionist/coms/incoming 0
+meet sound/player/insurrectionist/coms/meet 0
+needhelp sound/player/insurrectionist/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/insurrectionist/coms/seenflag 0
+taunt sound/player/insurrectionist/coms/taunt 4
+teamshoot sound/player/insurrectionist/coms/teamshoot 3
+death sound/player/insurrectionist/player/death 3
+drown sound/player/insurrectionist/player/drown 0
+fall sound/player/insurrectionist/player/fall 0
+falling sound/player/insurrectionist/player/falling 0
+gasp sound/player/insurrectionist/player/gasp 0
+jump sound/player/insurrectionist/player/jump 0
+pain25 sound/player/insurrectionist/player/pain25 0
+pain50 sound/player/insurrectionist/player/pain50 0
+pain75 sound/player/insurrectionist/player/pain75 0
+pain100 sound/player/insurrectionist/player/pain100 0

diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt
index 39c488c83f4aa2a869b8ee93c0da91047eb87f86..fd72a02f3f7a74c818b01a1479017bca6fdb9501 100644 (file)
--- a/models/player/ignishalfmasked.iqm_0.txt
+++ b/models/player/ignishalfmasked.iqm_0.txt
@@ -1,4 +1,4 @@
-name Ignis - HalfMasked
+name Ignis - Half Masked
 species human
 sex Male
 weight 90

diff --git a/models/player/ignishalfmasked_lod1.iqm.framegroups b/models/player/ignishalfmasked_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/ignishalfmasked_lod1.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/ignishalfmasked_lod2.iqm.framegroups b/models/player/ignishalfmasked_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/ignishalfmasked_lod2.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/ignismasked.iqm_0.sounds b/models/player/ignismasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..37d416d
--- /dev/null
+++ b/models/player/ignismasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: marine
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/marine/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/marine/coms/attackinfive 0
+coverme sound/player/marine/coms/coverme 0
+defend sound/player/marine/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/marine/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/marine/coms/incoming 0
+meet sound/player/marine/coms/meet 0
+needhelp sound/player/marine/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/marine/coms/seenflag 0
+taunt sound/player/marine/coms/taunt 3
+teamshoot sound/player/marine/coms/teamshoot 4
+death sound/player/marine/player/death 3
+drown sound/player/marine/player/drown 0
+fall sound/player/marine/player/fall 0
+falling sound/player/marine/player/falling 0
+gasp sound/player/marine/player/gasp 0
+jump sound/player/marine/player/jump 0
+pain25 sound/player/marine/player/pain25 0
+pain50 sound/player/marine/player/pain50 0
+pain75 sound/player/marine/player/pain75 0
+pain100 sound/player/marine/player/pain100 0

diff --git a/models/player/ignismasked_lod1.iqm b/models/player/ignismasked_lod1.iqm
new file mode 100644 (file)
index 0000000..44633d5
Binary files /dev/null and b/models/player/ignismasked_lod1.iqm differ

diff --git a/models/player/ignismasked_lod1.iqm.framegroups b/models/player/ignismasked_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/ignismasked_lod1.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/ignismasked_lod2.iqm b/models/player/ignismasked_lod2.iqm
new file mode 100644 (file)
index 0000000..a913231
Binary files /dev/null and b/models/player/ignismasked_lod2.iqm differ

diff --git a/models/player/ignismasked_lod2.iqm.framegroups b/models/player/ignismasked_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/ignismasked_lod2.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/nyx.iqm_0.sounds b/models/player/nyx.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
+++ b/models/player/nyx.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0

diff --git a/models/player/pyria.iqm_0.sounds b/models/player/pyria.iqm_0.sounds
index 691c58f6c88eda7618a326c7f5a9eec268fba54f..3953ebc93539db597b4d1c9941b5742056e0d262 100644 (file)
--- a/models/player/pyria.iqm_0.sounds
+++ b/models/player/pyria.iqm_0.sounds
@@ -3,14 +3,14 @@
 attack sound/player/pyria-skadi/coms/attack 2
 //attacking sound/player/carni-lycan/player/attacking 0
 attackinfive sound/player/pyria-skadi/coms/attackinfive 0
-//coverme sound/player/pyria-skadi/coms/coverme 0
-//defend sound/player/pyria-skadi/coms/defend 0
+coverme sound/player/pyria-skadi/coms/coverme 0
+defend sound/player/pyria-skadi/coms/defend 0
 //defending sound/player/carni-lycan/player/defending 0
 //droppedflag sound/player/carni-lycan/player/droppedflag 0
 //flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
 freelance sound/player/pyria-skadi/coms/freelance 2
 //getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/pyria-skadi/coms/incoming 0
+incoming sound/player/pyria-skadi/coms/incoming 0
 meet sound/player/pyria-skadi/coms/meet 0
 needhelp sound/player/pyria-skadi/coms/needhelp 2
 //negative sound/player/carni-lycan/player/negative 0
@@ -22,7 +22,7 @@ taunt sound/player/pyria-skadi/coms/taunt 5
 teamshoot sound/player/pyria-skadi/coms/teamshoot 4
 death sound/player/pyria-skadi/player/death 3
 drown sound/player/pyria-skadi/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
+fall sound/player/pyria-skadi/player/fall 0
 falling sound/player/pyria-skadi/player/falling 0
 gasp sound/player/pyria-skadi/player/gasp 0
 jump sound/player/pyria-skadi/player/jump 0

diff --git a/models/player/pyria_lod1.iqm b/models/player/pyria_lod1.iqm
deleted file mode 100644 (file)
index 5364a05..0000000
Binary files a/models/player/pyria_lod1.iqm and /dev/null differ

diff --git a/models/player/pyria_lod2.iqm b/models/player/pyria_lod2.iqm
deleted file mode 100644 (file)
index 3179c71..0000000
Binary files a/models/player/pyria_lod2.iqm and /dev/null differ

diff --git a/models/player/seraphina.iqm_0.sounds b/models/player/seraphina.iqm_0.sounds
new file mode 100644 (file)
index 0000000..3953ebc
--- /dev/null
+++ b/models/player/seraphina.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/pyria-skadi/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0
+coverme sound/player/pyria-skadi/coms/coverme 0
+defend sound/player/pyria-skadi/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
+freelance sound/player/pyria-skadi/coms/freelance 2
+//getflag sound/player/carni-lycan/player/getflag 0
+incoming sound/player/pyria-skadi/coms/incoming 0
+meet sound/player/pyria-skadi/coms/meet 0
+needhelp sound/player/pyria-skadi/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/pyria-skadi/coms/seenflag 0
+taunt sound/player/pyria-skadi/coms/taunt 5
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4
+death sound/player/pyria-skadi/player/death 3
+drown sound/player/pyria-skadi/player/drown 0
+fall sound/player/pyria-skadi/player/fall 0
+falling sound/player/pyria-skadi/player/falling 0
+gasp sound/player/pyria-skadi/player/gasp 0
+jump sound/player/pyria-skadi/player/jump 0
+pain25 sound/player/pyria-skadi/player/pain25 0
+pain50 sound/player/pyria-skadi/player/pain50 0
+pain75 sound/player/pyria-skadi/player/pain75 0
+pain100 sound/player/pyria-skadi/player/pain100 0

diff --git a/models/player/seraphina_lod1.iqm b/models/player/seraphina_lod1.iqm
new file mode 100644 (file)
index 0000000..d16f225
Binary files /dev/null and b/models/player/seraphina_lod1.iqm differ

diff --git a/models/player/seraphina_lod1.iqm.framegroups b/models/player/seraphina_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/seraphina_lod1.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/seraphina_lod2.iqm b/models/player/seraphina_lod2.iqm
new file mode 100644 (file)
index 0000000..f6ca53a
Binary files /dev/null and b/models/player/seraphina_lod2.iqm differ

diff --git a/models/player/seraphina_lod2.iqm.framegroups b/models/player/seraphina_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/seraphina_lod2.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/seraphinamasked.iqm_0.sounds b/models/player/seraphinamasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
+++ b/models/player/seraphinamasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0

diff --git a/models/player/seraphinamasked_lod1.iqm b/models/player/seraphinamasked_lod1.iqm
new file mode 100644 (file)
index 0000000..5a99524
Binary files /dev/null and b/models/player/seraphinamasked_lod1.iqm differ

diff --git a/models/player/seraphinamasked_lod1.iqm.framegroups b/models/player/seraphinamasked_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/seraphinamasked_lod1.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/seraphinamasked_lod2.iqm b/models/player/seraphinamasked_lod2.iqm
new file mode 100644 (file)
index 0000000..927d56c
Binary files /dev/null and b/models/player/seraphinamasked_lod2.iqm differ

diff --git a/models/player/seraphinamasked_lod2.iqm.framegroups b/models/player/seraphinamasked_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
+++ b/models/player/seraphinamasked_lod2.iqm.framegroups
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft

diff --git a/models/player/umbra.iqm_0.sounds b/models/player/umbra.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
+++ b/models/player/umbra.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0

diff --git a/models/weapons/h_campingrifle.iqm b/models/weapons/h_campingrifle.iqm
index 2d4e970c728829e2e43fd7da94f1831ce39c8c12..c7da48ea127db22dcb59cb45e120a2d07961be88 100644 (file)
Binary files a/models/weapons/h_campingrifle.iqm and b/models/weapons/h_campingrifle.iqm differ

diff --git a/models/weapons/h_electro.iqm b/models/weapons/h_electro.iqm
index ef0c7e261258c8dfd064bd0eb7ae94b316187683..8ae8898d5a43a78b8be68fe75b45fba37c176c08 100644 (file)
Binary files a/models/weapons/h_electro.iqm and b/models/weapons/h_electro.iqm differ

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index 369f8741ca061c5302ba41ce379530509e99ad73..7d218cb6540ee0621e99aae09e8fe2371d61571c 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -213,9 +213,9 @@ void CSQC_Shutdown(void)
        if not(isdemo())
        {
                if not(calledhooks & HOOK_START)
-                       localcmd("\n_cl_hook_gamestart nop;");
+                       localcmd("\n_cl_hook_gamestart nop\n");
                if not(calledhooks & HOOK_END)
-                       localcmd("\ncl_hook_gameend;");
+                       localcmd("\ncl_hook_gameend\n");
        }
 }
 
@@ -965,7 +965,7 @@ void Gamemode_Init()
 
        if not(isdemo())
        {
-               localcmd("\n_cl_hook_gamestart ", GametypeNameFromType(gametype), ";");
+               localcmd("\n_cl_hook_gamestart ", GametypeNameFromType(gametype), "\n");
                calledhooks |= HOOK_START;
        }
 }

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 118f63ce2f5bf73dd8de43a1b8485c43cdff8473..8c642415ddebede591b7cbe57ae4e86c19cb2364 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -341,6 +341,7 @@ void CSQC_Demo_Camera();
 float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
+float reticle_type;
 string NextFrameCommand;
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
@@ -354,6 +355,8 @@ void CSQC_UpdateView(float w, float h)
        float f, i, j;
        vector v, vo;
 
+       vector reticle_pos, reticle_size;
+
        WaypointSprite_Load();
 
        if(spectatee_status)
@@ -432,7 +435,7 @@ void CSQC_UpdateView(float w, float h)
        if(intermission && !isdemo() && !(calledhooks & HOOK_END))
                if(calledhooks & HOOK_START)
                {
-                       localcmd("\ncl_hook_gameend;");
+                       localcmd("\ncl_hook_gameend\n");
                        calledhooks |= HOOK_END;
                }
 
@@ -474,6 +477,13 @@ void CSQC_UpdateView(float w, float h)
        if(last_weapon != activeweapon) {
                weapontime = time;
                last_weapon = activeweapon;
+
+               entity e;
+               e = get_weaponinfo(activeweapon);
+               if(e.netname != "")
+                       localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n");
+               else
+                       localcmd("\ncl_hook_activeweapon none\n");
        }
 
        // ALWAYS Clear Current Scene First
@@ -549,6 +559,45 @@ void CSQC_UpdateView(float w, float h)
        // next R_RenderScene call
        drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
 
+       // Draw the aiming reticle for weapons that use it
+       // reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
+       // It must be a persisted float for fading out to work properly (you let go of the zoom button for
+       // the view to go back to normal, so reticle_type would become 0 as we fade out)
+       if(spectatee_status || getstati(STAT_HEALTH) <= 0)
+               reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators
+       else if(button_zoom)
+               reticle_type = 1; // normal zoom
+       else if(activeweapon == WEP_NEX && button_attack2)
+               reticle_type = 2; // nex zoom
+
+       if(cvar("cl_reticle_stretch"))
+       {
+               reticle_size_x = vid_conwidth;
+               reticle_size_y = vid_conheight;
+               reticle_pos_x = 0;
+               reticle_pos_y = 0;
+       }
+       else
+       {
+               reticle_size_x = max(vid_conwidth, vid_conheight);
+               reticle_size_y = max(vid_conwidth, vid_conheight);
+               reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
+               reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+       }
+
+       if(cvar("cl_reticle_item_normal"))
+       {
+               precache_pic("gfx/reticle_normal");
+               if(reticle_type == 1 && current_zoomfraction)
+                       drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL);
+       }
+       if(cvar("cl_reticle_item_nex"))
+       {
+               precache_pic("gfx/reticle_nex");
+               if(reticle_type == 2 && current_zoomfraction)
+                       drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_nex"), DRAWFLAG_NORMAL);
+       }
+
        // Draw the mouse cursor
        // NOTE: drawpic must happen after R_RenderScene for some reason
        //drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);

diff --git a/qcsrc/common/items.qc b/qcsrc/common/items.qc
index 0f1237d859478a5021ad9603008a39a2fdfe176f..33b48371502aaa00f1cdb922fe53cd6f3662a789 100644 (file)
--- a/qcsrc/common/items.qc
+++ b/qcsrc/common/items.qc
@@ -32,15 +32,16 @@ void register_weapons_done()
        dummy_weapon_info.classname = "weapon_info";
        dummy_weapon_info.weapon = 0; // you can recognize dummies by this
        dummy_weapon_info.weapons = 0; // you can recognize dummies by this too
-       dummy_weapon_info.netname = "@!#%'n Tuba";
+       dummy_weapon_info.netname = "";
+       dummy_weapon_info.message = "@!#%'n Tuba";
        dummy_weapon_info.items = 0;
        dummy_weapon_info.weapon_func = w_null;
        dummy_weapon_info.mdl = "";
        dummy_weapon_info.model = "";
        dummy_weapon_info.spawnflags = 0;
+       dummy_weapon_info.model2 = "";
        dummy_weapon_info.impulse = -1;
        dummy_weapon_info.bot_pickupbasevalue = 0;
-       dummy_weapon_info.model2 = "";
 
        float i;
        weaponorder_byid = "";

diff --git a/qcsrc/menu/item/button.c b/qcsrc/menu/item/button.c
index 728413135ad1d5f8f9dfb6bd189e041e63aefef5..3d91229ec6669dcd6f3af7c1b56858db72708b2f 100644 (file)
--- a/qcsrc/menu/item/button.c
+++ b/qcsrc/menu/item/button.c
@@ -50,7 +50,7 @@ void Button_configureButton(entity me, string txt, float sz, string gfx)
 }
 float Button_keyDown(entity me, float key, float ascii, float shift)
 {
-       if(key == K_ENTER || key == K_SPACE)
+       if(key == K_ENTER || key == K_SPACE || key == K_KP_ENTER)
        {
                me.clickTime = 0.1; // delayed for effect
                return 1;

diff --git a/qcsrc/menu/item/listbox.c b/qcsrc/menu/item/listbox.c
index 4d6174cc593cb4bacb484addb4ec9b551e019909..ba3fa6a9f28ca8c3dbbb31f11b85982ba8bede03 100644 (file)
--- a/qcsrc/menu/item/listbox.c
+++ b/qcsrc/menu/item/listbox.c
@@ -7,6 +7,7 @@ CLASS(ListBox) EXTENDS(Item)
        METHOD(ListBox, mousePress, float(entity, vector))
        METHOD(ListBox, mouseDrag, float(entity, vector))
        METHOD(ListBox, mouseRelease, float(entity, vector))
+       METHOD(ListBox, focusLeave, void(entity))
        ATTRIB(ListBox, focusable, float, 1)
        ATTRIB(ListBox, selectedItem, float, 0)
        ATTRIB(ListBox, size, vector, '0 0 0')
@@ -188,6 +189,13 @@ float ListBox_mouseRelease(entity me, vector pos)
        me.pressed = 0;
        return 1;
 }
+void ListBox_focusLeave(entity me)
+{
+       // Reset the var pressed in case listbox loses focus
+       // by a mouse click on an item of the list
+       // for example showing a dialog on right click
+       me.pressed = 0;
+}
 void ListBox_updateControlTopBottom(entity me)
 {
        float f;

diff --git a/qcsrc/menu/item/nexposee.c b/qcsrc/menu/item/nexposee.c
index c43f44f509f38b9ee7cd2f902dfcc59fb949e885..2369a41077db5334d6ea9ac63348fe3fb47c2b56 100644 (file)
--- a/qcsrc/menu/item/nexposee.c
+++ b/qcsrc/menu/item/nexposee.c
@@ -309,7 +309,7 @@ float Nexposee_keyDown(entity me, float scan, float ascii, float shift)
        {
                case 0:
                case 3:
-                       nexposeeKey = ((scan == K_SPACE) || (scan == K_ENTER));
+                       nexposeeKey = ((scan == K_SPACE) || (scan == K_ENTER) || (scan == K_KP_ENTER));
                        break;
                case 1:
                case 2:

diff --git a/qcsrc/menu/xonotic/campaign.c b/qcsrc/menu/xonotic/campaign.c
index bd31f435e2f0d30e7bfcbb4c193bccfda3e5fb6c..e7667f69cfd64ceae7fd3bd7fd65b5397d5c18c6 100644 (file)
--- a/qcsrc/menu/xonotic/campaign.c
+++ b/qcsrc/menu/xonotic/campaign.c
@@ -315,7 +315,7 @@ void XonoticCampaignList_setSelected(entity me, float i)
 
 float XonoticCampaignList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER || scan == K_SPACE)
+       if(scan == K_ENTER || scan == K_SPACE || scan == K_KP_ENTER)
                CampaignList_LoadMap(me, me);
        else
                return SUPER(XonoticCampaignList).keyDown(me, scan, ascii, shift);

diff --git a/qcsrc/menu/xonotic/charmap.c b/qcsrc/menu/xonotic/charmap.c
index a448e3547e563f8eceae79086716a3b685c982df..0e375c9cc4654e10f81b938232f25ef36eca3c93 100644 (file)
--- a/qcsrc/menu/xonotic/charmap.c
+++ b/qcsrc/menu/xonotic/charmap.c
@@ -122,6 +122,7 @@ float XonoticCharmap_keyDown(entity me, float key, float ascii, float shift)
                        return 1;
                case K_SPACE:
                case K_ENTER:
+               case K_KP_ENTER:
                case K_INS:
                case K_KP_INS:
                        me.controlledTextbox.enterText(me.controlledTextbox, CharMap_CellToChar(me.selectedCharacterCell));

diff --git a/qcsrc/menu/xonotic/demolist.c b/qcsrc/menu/xonotic/demolist.c
index 0882a3ed4af375cfb0b157c411c3fe112e27c311..c16e4ae0008efe802b593f6be86b6e1d4b3d1569 100644 (file)
--- a/qcsrc/menu/xonotic/demolist.c
+++ b/qcsrc/menu/xonotic/demolist.c
@@ -155,7 +155,7 @@ void XonoticDemoList_clickListBoxItem(entity me, float i, vector where)
 
 float XonoticDemoList_keyDown(entity me, float scan, float ascii, float shift)
 {
-    if(scan == K_ENTER) {
+    if(scan == K_ENTER || scan == K_KP_ENTER) {
         me.startDemo(me);
         return 1;
     }

diff --git a/qcsrc/menu/xonotic/inputbox.c b/qcsrc/menu/xonotic/inputbox.c
index 26dc4536c477fa198a1abdf44c2adac91833ebb5..e457414b4a4ed411b422a7c0404925cab92c7603 100644 (file)
--- a/qcsrc/menu/xonotic/inputbox.c
+++ b/qcsrc/menu/xonotic/inputbox.c
@@ -74,7 +74,7 @@ float XonoticInputBox_keyDown(entity me, float key, float ascii, float shift)
 {
        float r;
        r = 0;
-       if(key == K_ENTER)
+       if(key == K_ENTER || key == K_KP_ENTER)
        {
                if(me.cvarName)
                {

diff --git a/qcsrc/menu/xonotic/keybinder.c b/qcsrc/menu/xonotic/keybinder.c
index 2eb51755dca6027427873bc4aabe7719fac22f3c..01ed3a55375d9ca6503790c3707eb0f1cede091d 100644 (file)
--- a/qcsrc/menu/xonotic/keybinder.c
+++ b/qcsrc/menu/xonotic/keybinder.c
@@ -240,10 +240,12 @@ float XonoticKeyBinder_keyDown(entity me, float key, float ascii, float shift)
        switch(key)
        {
                case K_ENTER:
+               case K_KP_ENTER:
                case K_SPACE:
                        KeyBinder_Bind_Change(me, me);
                        break;
                case K_DEL:
+               case K_KP_DEL:
                case K_BACKSPACE:
                        KeyBinder_Bind_Clear(me, me);
                        break;

diff --git a/qcsrc/menu/xonotic/maplist.c b/qcsrc/menu/xonotic/maplist.c
index 7a5a4ba150c6f5d332eaaa0648c3cd0961c3ac96..8b5ce6d6a7b46a3a9c58f0e1b090b47ee71c52c0 100644 (file)
--- a/qcsrc/menu/xonotic/maplist.c
+++ b/qcsrc/menu/xonotic/maplist.c
@@ -295,7 +295,7 @@ void MapList_LoadMap(entity btn, entity me)
 float XonoticMapList_keyDown(entity me, float scan, float ascii, float shift)
 {
        string ch, save;
-       if(scan == K_ENTER)
+       if(scan == K_ENTER || scan == K_KP_ENTER)
        {
                // pop up map info screen
                main.mapInfoDialog.loadMapInfo(main.mapInfoDialog, me.selectedItem, me);

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index c205fba70574e031eb1951cecbfa33d413c766ba..d721c2555e2dbae45621da79f75b5d4601c88978 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -582,7 +582,7 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
        org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size);
        sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
 
-       if(scan == K_ENTER)
+       if(scan == K_ENTER || scan == K_KP_ENTER)
        {
                ServerList_Connect_Click(NULL, me);
                return 1;
@@ -592,7 +592,7 @@ float XonoticServerList_keyDown(entity me, float scan, float ascii, float shift)
                main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
                DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
        }
-       else if(scan == K_INS || scan == K_MOUSE3)
+       else if(scan == K_INS || scan == K_MOUSE3 || scan == K_KP_INS)
        {
                i = me.selectedItem;
                if(i < me.nItems)

diff --git a/qcsrc/menu/xonotic/skinlist.c b/qcsrc/menu/xonotic/skinlist.c
index bcb62251aa9f30650c41894a486add3546383ae4..864b3054a5bb85dccbabb3b538ecf76bc0b8fb82 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.c
+++ b/qcsrc/menu/xonotic/skinlist.c
@@ -195,7 +195,7 @@ void XonoticSkinList_clickListBoxItem(entity me, float i, vector where)
 
 float XonoticSkinList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER) {
                me.setSkin(me);
                return 1;
        }

diff --git a/qcsrc/server/clientcommands.qc b/qcsrc/server/clientcommands.qc
index ff5794dae989397d202294c1641844ee7b678e57..171906428a39b2a29f146d811f3d97927a516196 100644 (file)
--- a/qcsrc/server/clientcommands.qc
+++ b/qcsrc/server/clientcommands.qc
@@ -486,7 +486,7 @@ void ReadyRestart()
        if(g_arena | g_assault | gameover | intermission_running | race_completing)
                localcmd("restart\n");
        else
-               localcmd("\nsv_hook_gamerestart;");
+               localcmd("\nsv_hook_gamerestart\n");
 
        ReadyRestartForce();
 

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index f873ea7c6b00331ed188b2bf1bf3f030f165fc4f..a5165706bae3f9351e22be5d9b48a2f571a79f16 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -699,7 +699,7 @@ void spawnfunc_worldspawn (void)
 
        CheatInit();
 
-       localcmd("\n_sv_hook_gamestart ", GetGametype(), ";");
+       localcmd("\n_sv_hook_gamestart ", GetGametype(), "\n");
 
        world_initialized = 1;
 }
@@ -1427,7 +1427,7 @@ void NextLevel()
        if(cvar("g_campaign"))
                CampaignPreIntermission();
 
-       localcmd("\nsv_hook_gameend;");
+       localcmd("\nsv_hook_gameend\n");
 }
 
 /*
@@ -1740,6 +1740,8 @@ void ShuffleMaplist()
 float leaderfrags;
 float WinningCondition_Scores(float limit, float leadlimit)
 {
+       float limitreached;
+
        // TODO make everything use THIS winning condition (except LMS)
        WinningConditionHelper();
 
@@ -1784,13 +1786,22 @@ float WinningCondition_Scores(float limit, float leadlimit)
                }
        }
 
+       limitreached = FALSE;
+       if(limit)
+               if(WinningConditionHelper_topscore >= limit)
+                       limitreached = TRUE;
+       if(leadlimit)
+       {
+               float leadlimitreached;
+               leadlimitreached = (WinningConditionHelper_topscore - WinningConditionHelper_secondscore >= leadlimit);
+               if(cvar("leadlimit_and_fraglimit"))
+                       limitreached = (limitreached && leadlimitreached);
+               else
+                       limitreached = (limitreached || leadlimitreached);
+       }
+
        return GetWinningCode(
-               WinningConditionHelper_topscore &&
-               (
-                       (limit && (WinningConditionHelper_topscore >= limit))
-                       ||
-                       (leadlimit && (WinningConditionHelper_topscore - WinningConditionHelper_secondscore >= leadlimit))
-               ),
+               WinningConditionHelper_topscore && limitreached,
                WinningConditionHelper_equality
        );
 }

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index fa61ad8712783892d3b916701f75a163e42d2ab3..aeee9cecbac843cc4e6203e29de494a0b8e41374 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -229,12 +229,6 @@ void relocate_spawnpoint()
         }
     }
 
-    if (cvar("g_spawnpoints_autodrop"))
-    {
-        setsize(self, PL_MIN, PL_MAX);
-        droptofloor();
-    }
-
     self.use = spawnpoint_use;
     self.team_saved = self.team;
     if (!self.cnt)

diff --git a/sound/player/carni-lycan/player/fall.ogg b/sound/player/carni-lycan/player/fall.ogg
new file mode 100644 (file)
index 0000000..fcea52a
Binary files /dev/null and b/sound/player/carni-lycan/player/fall.ogg differ

diff --git a/sound/player/carni-lycan/player/fall1.ogg b/sound/player/carni-lycan/player/fall1.ogg
deleted file mode 100644 (file)
index fcea52a..0000000
Binary files a/sound/player/carni-lycan/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/fricka/player/fall.ogg b/sound/player/fricka/player/fall.ogg
new file mode 100644 (file)
index 0000000..ff5ede1
Binary files /dev/null and b/sound/player/fricka/player/fall.ogg differ

diff --git a/sound/player/fricka/player/fall1.ogg b/sound/player/fricka/player/fall1.ogg
deleted file mode 100644 (file)
index ff5ede1..0000000
Binary files a/sound/player/fricka/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/insurrectionist/player/fall.ogg b/sound/player/insurrectionist/player/fall.ogg
new file mode 100644 (file)
index 0000000..37ed50a
Binary files /dev/null and b/sound/player/insurrectionist/player/fall.ogg differ

diff --git a/sound/player/insurrectionist/player/fall1.ogg b/sound/player/insurrectionist/player/fall1.ogg
deleted file mode 100644 (file)
index 37ed50a..0000000
Binary files a/sound/player/insurrectionist/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/marine/player/fall.ogg b/sound/player/marine/player/fall.ogg
new file mode 100644 (file)
index 0000000..b076a65
Binary files /dev/null and b/sound/player/marine/player/fall.ogg differ

diff --git a/sound/player/marine/player/fall1.ogg b/sound/player/marine/player/fall1.ogg
deleted file mode 100644 (file)
index b076a65..0000000
Binary files a/sound/player/marine/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/pyria-skadi/player/fall.ogg b/sound/player/pyria-skadi/player/fall.ogg
new file mode 100644 (file)
index 0000000..eecf14a
Binary files /dev/null and b/sound/player/pyria-skadi/player/fall.ogg differ

diff --git a/sound/player/pyria-skadi/player/fall1.ogg b/sound/player/pyria-skadi/player/fall1.ogg
deleted file mode 100644 (file)
index eecf14a..0000000
Binary files a/sound/player/pyria-skadi/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/reptilian/player/fall.ogg b/sound/player/reptilian/player/fall.ogg
new file mode 100644 (file)
index 0000000..f6e8bc3
Binary files /dev/null and b/sound/player/reptilian/player/fall.ogg differ

diff --git a/sound/player/reptilian/player/fall1.ogg b/sound/player/reptilian/player/fall1.ogg
deleted file mode 100644 (file)
index f6e8bc3..0000000
Binary files a/sound/player/reptilian/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/soldier/coms/flagcarriertakingdamage.ogg b/sound/player/soldier/coms/flagcarriertakingdamage.ogg
new file mode 100644 (file)
index 0000000..63ba47c
Binary files /dev/null and b/sound/player/soldier/coms/flagcarriertakingdamage.ogg differ

diff --git a/sound/player/soldier/coms/getflag.ogg b/sound/player/soldier/coms/getflag.ogg
new file mode 100644 (file)
index 0000000..a32e04d
Binary files /dev/null and b/sound/player/soldier/coms/getflag.ogg differ

diff --git a/sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg b/sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg
deleted file mode 100644 (file)
index 63ba47c..0000000
Binary files a/sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg and /dev/null differ

diff --git a/sound/player/soldier/coms/ideas/getourflagback.ogg b/sound/player/soldier/coms/ideas/getourflagback.ogg
deleted file mode 100644 (file)
index a32e04d..0000000
Binary files a/sound/player/soldier/coms/ideas/getourflagback.ogg and /dev/null differ

diff --git a/sound/player/soldier/player/fall.ogg b/sound/player/soldier/player/fall.ogg
new file mode 100644 (file)
index 0000000..6a75952
Binary files /dev/null and b/sound/player/soldier/player/fall.ogg differ

diff --git a/sound/player/soldier/player/fall1.ogg b/sound/player/soldier/player/fall1.ogg
deleted file mode 100644 (file)
index 6a75952..0000000
Binary files a/sound/player/soldier/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/specop/coms/needhelp.ogg b/sound/player/specop/coms/needhelp.ogg
new file mode 100644 (file)
index 0000000..729e100
Binary files /dev/null and b/sound/player/specop/coms/needhelp.ogg differ

diff --git a/sound/player/specop/coms/needhelp1.ogg b/sound/player/specop/coms/needhelp1.ogg
deleted file mode 100644 (file)
index 729e100..0000000
Binary files a/sound/player/specop/coms/needhelp1.ogg and /dev/null differ

diff --git a/sound/player/specop/player/fall.ogg b/sound/player/specop/player/fall.ogg
new file mode 100644 (file)
index 0000000..d6c1940
Binary files /dev/null and b/sound/player/specop/player/fall.ogg differ

diff --git a/sound/player/specop/player/fall1.ogg b/sound/player/specop/player/fall1.ogg
deleted file mode 100644 (file)
index d6c1940..0000000
Binary files a/sound/player/specop/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/torus/attack.ogg b/sound/player/torus/attack.ogg
deleted file mode 100644 (file)
index ec85b07..0000000
Binary files a/sound/player/torus/attack.ogg and /dev/null differ

diff --git a/sound/player/torus/coms/attack.ogg b/sound/player/torus/coms/attack.ogg
new file mode 100644 (file)
index 0000000..ec85b07
Binary files /dev/null and b/sound/player/torus/coms/attack.ogg differ

diff --git a/sound/player/torus/coms/coverme.ogg b/sound/player/torus/coms/coverme.ogg
new file mode 100644 (file)
index 0000000..81be7a3
Binary files /dev/null and b/sound/player/torus/coms/coverme.ogg differ

diff --git a/sound/player/torus/coms/incoming.ogg b/sound/player/torus/coms/incoming.ogg
new file mode 100644 (file)
index 0000000..dd3fdd8
Binary files /dev/null and b/sound/player/torus/coms/incoming.ogg differ

diff --git a/sound/player/torus/coms/jump.ogg b/sound/player/torus/coms/jump.ogg
new file mode 100644 (file)
index 0000000..fbb0d64
Binary files /dev/null and b/sound/player/torus/coms/jump.ogg differ

diff --git a/sound/player/torus/coms/letsgo.ogg b/sound/player/torus/coms/letsgo.ogg
new file mode 100644 (file)
index 0000000..8bf3d29
Binary files /dev/null and b/sound/player/torus/coms/letsgo.ogg differ

diff --git a/sound/player/torus/coms/needhelp.ogg b/sound/player/torus/coms/needhelp.ogg
new file mode 100644 (file)
index 0000000..5f6bd6d
Binary files /dev/null and b/sound/player/torus/coms/needhelp.ogg differ

diff --git a/sound/player/torus/coms/seenflag.ogg b/sound/player/torus/coms/seenflag.ogg
new file mode 100644 (file)
index 0000000..a295614
Binary files /dev/null and b/sound/player/torus/coms/seenflag.ogg differ

diff --git a/sound/player/torus/coms/taunt1.ogg b/sound/player/torus/coms/taunt1.ogg
new file mode 100644 (file)
index 0000000..197c462
Binary files /dev/null and b/sound/player/torus/coms/taunt1.ogg differ

diff --git a/sound/player/torus/coms/taunt2.ogg b/sound/player/torus/coms/taunt2.ogg
new file mode 100644 (file)
index 0000000..b9de0af
Binary files /dev/null and b/sound/player/torus/coms/taunt2.ogg differ

diff --git a/sound/player/torus/coms/teamshoot.ogg b/sound/player/torus/coms/teamshoot.ogg
new file mode 100644 (file)
index 0000000..51e1410
Binary files /dev/null and b/sound/player/torus/coms/teamshoot.ogg differ

diff --git a/sound/player/torus/coms/waypoint.ogg b/sound/player/torus/coms/waypoint.ogg
new file mode 100644 (file)
index 0000000..45bfb16
Binary files /dev/null and b/sound/player/torus/coms/waypoint.ogg differ

diff --git a/sound/player/torus/coverme.ogg b/sound/player/torus/coverme.ogg
deleted file mode 100644 (file)
index 81be7a3..0000000
Binary files a/sound/player/torus/coverme.ogg and /dev/null differ

diff --git a/sound/player/torus/death.ogg b/sound/player/torus/death.ogg
deleted file mode 100644 (file)
index 43ef547..0000000
Binary files a/sound/player/torus/death.ogg and /dev/null differ

diff --git a/sound/player/torus/drown.ogg b/sound/player/torus/drown.ogg
deleted file mode 100644 (file)
index 0b7bd8d..0000000
Binary files a/sound/player/torus/drown.ogg and /dev/null differ

diff --git a/sound/player/torus/fall.ogg b/sound/player/torus/fall.ogg
deleted file mode 100644 (file)
index 88e62ff..0000000
Binary files a/sound/player/torus/fall.ogg and /dev/null differ

diff --git a/sound/player/torus/flagseen.ogg b/sound/player/torus/flagseen.ogg
deleted file mode 100644 (file)
index a295614..0000000
Binary files a/sound/player/torus/flagseen.ogg and /dev/null differ

diff --git a/sound/player/torus/gasp.ogg b/sound/player/torus/gasp.ogg
deleted file mode 100644 (file)
index 6551083..0000000
Binary files a/sound/player/torus/gasp.ogg and /dev/null differ

diff --git a/sound/player/torus/hooah.ogg b/sound/player/torus/hooah.ogg
deleted file mode 100644 (file)
index b9de0af..0000000
Binary files a/sound/player/torus/hooah.ogg and /dev/null differ

diff --git a/sound/player/torus/incoming.ogg b/sound/player/torus/incoming.ogg
deleted file mode 100644 (file)
index dd3fdd8..0000000
Binary files a/sound/player/torus/incoming.ogg and /dev/null differ

diff --git a/sound/player/torus/jump.ogg b/sound/player/torus/jump.ogg
deleted file mode 100644 (file)
index fbb0d64..0000000
Binary files a/sound/player/torus/jump.ogg and /dev/null differ

diff --git a/sound/player/torus/letsgo.ogg b/sound/player/torus/letsgo.ogg
deleted file mode 100644 (file)
index 8bf3d29..0000000
Binary files a/sound/player/torus/letsgo.ogg and /dev/null differ

diff --git a/sound/player/torus/needhelp.ogg b/sound/player/torus/needhelp.ogg
deleted file mode 100644 (file)
index 5f6bd6d..0000000
Binary files a/sound/player/torus/needhelp.ogg and /dev/null differ

diff --git a/sound/player/torus/pain100.ogg b/sound/player/torus/pain100.ogg
deleted file mode 100644 (file)
index eec5acc..0000000
Binary files a/sound/player/torus/pain100.ogg and /dev/null differ

diff --git a/sound/player/torus/pain25.ogg b/sound/player/torus/pain25.ogg
deleted file mode 100644 (file)
index ab2a226..0000000
Binary files a/sound/player/torus/pain25.ogg and /dev/null differ

diff --git a/sound/player/torus/pain50.ogg b/sound/player/torus/pain50.ogg
deleted file mode 100644 (file)
index 023d7a6..0000000
Binary files a/sound/player/torus/pain50.ogg and /dev/null differ

diff --git a/sound/player/torus/pain75.ogg b/sound/player/torus/pain75.ogg
deleted file mode 100644 (file)
index 65b45cf..0000000
Binary files a/sound/player/torus/pain75.ogg and /dev/null differ

diff --git a/sound/player/torus/player/death.ogg b/sound/player/torus/player/death.ogg
new file mode 100644 (file)
index 0000000..43ef547
Binary files /dev/null and b/sound/player/torus/player/death.ogg differ

diff --git a/sound/player/torus/player/drown.ogg b/sound/player/torus/player/drown.ogg
new file mode 100644 (file)
index 0000000..0b7bd8d
Binary files /dev/null and b/sound/player/torus/player/drown.ogg differ

diff --git a/sound/player/torus/player/fall.ogg b/sound/player/torus/player/fall.ogg
new file mode 100644 (file)
index 0000000..88e62ff
Binary files /dev/null and b/sound/player/torus/player/fall.ogg differ

diff --git a/sound/player/torus/player/gasp.ogg b/sound/player/torus/player/gasp.ogg
new file mode 100644 (file)
index 0000000..6551083
Binary files /dev/null and b/sound/player/torus/player/gasp.ogg differ

diff --git a/sound/player/torus/player/pain100.ogg b/sound/player/torus/player/pain100.ogg
new file mode 100644 (file)
index 0000000..eec5acc
Binary files /dev/null and b/sound/player/torus/player/pain100.ogg differ

diff --git a/sound/player/torus/player/pain25.ogg b/sound/player/torus/player/pain25.ogg
new file mode 100644 (file)
index 0000000..ab2a226
Binary files /dev/null and b/sound/player/torus/player/pain25.ogg differ

diff --git a/sound/player/torus/player/pain50.ogg b/sound/player/torus/player/pain50.ogg
new file mode 100644 (file)
index 0000000..023d7a6
Binary files /dev/null and b/sound/player/torus/player/pain50.ogg differ

diff --git a/sound/player/torus/player/pain75.ogg b/sound/player/torus/player/pain75.ogg
new file mode 100644 (file)
index 0000000..65b45cf
Binary files /dev/null and b/sound/player/torus/player/pain75.ogg differ

diff --git a/sound/player/torus/taunt.ogg b/sound/player/torus/taunt.ogg
deleted file mode 100644 (file)
index 197c462..0000000
Binary files a/sound/player/torus/taunt.ogg and /dev/null differ

diff --git a/sound/player/torus/teamshoot.ogg b/sound/player/torus/teamshoot.ogg
deleted file mode 100644 (file)
index 51e1410..0000000
Binary files a/sound/player/torus/teamshoot.ogg and /dev/null differ

diff --git a/sound/player/torus/waypoint.ogg b/sound/player/torus/waypoint.ogg
deleted file mode 100644 (file)
index 45bfb16..0000000
Binary files a/sound/player/torus/waypoint.ogg and /dev/null differ