Merge remote branch 'origin/master' into diabolik/newanims

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 255e980a68113acbd94c17863e38bac37d52dc6e..553b42f8ee693a72a2a5b3fb641ce7b420c6be02 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1185,9 +1185,9 @@ alias cl_fbskin_green "playermodel models/player/erebus.iqm; playerskin 1; color
 alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
 alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
 alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
-alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
-alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
-alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
+alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
+alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
+alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/megaerebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
 alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
 
 seta sv_servermodelsonly 1

diff --git a/models/player/erebus.iqm b/models/player/erebus.iqm
index fb9e1a1bf81ac6a2e850ceaa90361ffaad03adc8..101632988ef55fb1616d0563063eda361093951c 100644 (file)
Binary files a/models/player/erebus.iqm and b/models/player/erebus.iqm differ

diff --git a/models/player/erebus.iqm.framegroups b/models/player/erebus.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/erebus.iqm.framegroups
+++ b/models/player/erebus.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/erebus.iqm_1.skin b/models/player/erebus.iqm_1.skin
deleted file mode 100644 (file)
index 4597cef..0000000
--- a/models/player/erebus.iqm_1.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-erebus,erebusfullbright
-erebus.001,shadowhead

diff --git a/models/player/erebus.iqm_1.sounds b/models/player/erebus.iqm_1.sounds
deleted file mode 100644 (file)
index a97a073..0000000
--- a/models/player/erebus.iqm_1.sounds
+++ /dev/null
@@ -1,32 +0,0 @@
-//TAG: soldier
-//affirmative sound/player/carni-lycan/player/affirmative 0
-attack sound/player/soldier/coms/attack 0
-//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/coms/flagcarriertakingdamage 0
-freelance sound/player/soldier/coms/freelance 2
-getflag sound/player/soldier/coms/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.iqm_1.tga b/models/player/erebus.iqm_1.tga
deleted file mode 100644 (file)
index bf151b5..0000000
Binary files a/models/player/erebus.iqm_1.tga and /dev/null differ

diff --git a/models/player/erebus.iqm_1.txt b/models/player/erebus.iqm_1.txt
deleted file mode 100644 (file)
index 7b8389b..0000000
--- a/models/player/erebus.iqm_1.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-name Glowing Erebus
-species human
-sex Male
-weight 106
-age 26
-
-Heavyweight Xonotic Solider with LEDs

diff --git a/models/player/erebus_lod1.iqm b/models/player/erebus_lod1.iqm
index 7b35a7105bd3cfc7902a73300a960373a3a9da24..495b73d95be1486f7e2179abb336c16563da08d1 100644 (file)
Binary files a/models/player/erebus_lod1.iqm and b/models/player/erebus_lod1.iqm differ

diff --git a/models/player/erebus_lod1.iqm.framegroups b/models/player/erebus_lod1.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/erebus_lod1.iqm.framegroups
+++ b/models/player/erebus_lod1.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/erebus_lod1.iqm_1.skin b/models/player/erebus_lod1.iqm_1.skin
deleted file mode 100644 (file)
index 4597cef..0000000
--- a/models/player/erebus_lod1.iqm_1.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-erebus,erebusfullbright
-erebus.001,shadowhead

diff --git a/models/player/erebus_lod2.iqm b/models/player/erebus_lod2.iqm
index ba28fda523d9ab23295c082a1acddae7c3529458..539ddfd6e04073c8f24806c91db68b2c7051f488 100644 (file)
Binary files a/models/player/erebus_lod2.iqm and b/models/player/erebus_lod2.iqm differ

diff --git a/models/player/erebus_lod2.iqm.framegroups b/models/player/erebus_lod2.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/erebus_lod2.iqm.framegroups
+++ b/models/player/erebus_lod2.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/erebus_lod2.iqm_1.skin b/models/player/erebus_lod2.iqm_1.skin
deleted file mode 100644 (file)
index 4597cef..0000000
--- a/models/player/erebus_lod2.iqm_1.skin
+++ /dev/null
@@ -1,2 +0,0 @@
-erebus,erebusfullbright
-erebus.001,shadowhead

diff --git a/models/player/ignis.iqm b/models/player/ignis.iqm
index 2a098f101fde0cf084e5f7aab903b78a91ae07c7..1486383993c6951c97152ce208b7097f529e8c34 100644 (file)
Binary files a/models/player/ignis.iqm and b/models/player/ignis.iqm differ

diff --git a/models/player/ignis.iqm.framegroups b/models/player/ignis.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/ignis.iqm.framegroups
+++ b/models/player/ignis.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/ignis_lod1.iqm b/models/player/ignis_lod1.iqm
index f53f423e57ee7e7379fbeb8de0a7e85800a02d06..4217c35e9f66fe48108c58b029a38c8f1fdec1d1 100644 (file)
Binary files a/models/player/ignis_lod1.iqm and b/models/player/ignis_lod1.iqm differ

diff --git a/models/player/ignis_lod1.iqm.framegroups b/models/player/ignis_lod1.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/ignis_lod1.iqm.framegroups
+++ b/models/player/ignis_lod1.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/ignis_lod2.iqm b/models/player/ignis_lod2.iqm
index 0d984b49fdb72c431776bf575f7dba3920cdd43f..7470df4773f4834e036fd6e293a274eebc8689a2 100644 (file)
Binary files a/models/player/ignis_lod2.iqm and b/models/player/ignis_lod2.iqm differ

diff --git a/models/player/ignis_lod2.iqm.framegroups b/models/player/ignis_lod2.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/ignis_lod2.iqm.framegroups
+++ b/models/player/ignis_lod2.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/ignishalfmasked.iqm b/models/player/ignishalfmasked.iqm
index 968f2322c9b241ea64e0c11367d7eef06f250eed..81559e34a42e09bef0b89c3e70082ed6fcec08fa 100644 (file)
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ

diff --git a/models/player/ignishalfmasked_lod1.iqm b/models/player/ignishalfmasked_lod1.iqm
index d0c50d1e57d006c3ca07b8435d5137bc50e4853e..c3cd504e2866d85d1323b283687a767033432859 100644 (file)
Binary files a/models/player/ignishalfmasked_lod1.iqm and b/models/player/ignishalfmasked_lod1.iqm differ

diff --git a/models/player/ignishalfmasked_lod2.iqm b/models/player/ignishalfmasked_lod2.iqm
index 069f96c212bb2e1c862f3b898e48b0f0f3ec21ba..13f23c3265c5a621228666301cacc026d1ee8b83 100644 (file)
Binary files a/models/player/ignishalfmasked_lod2.iqm and b/models/player/ignishalfmasked_lod2.iqm differ

diff --git a/models/player/ignismasked.iqm b/models/player/ignismasked.iqm
index 15cce9fd7673a2d26ea877734107d5203e39bc97..12753134a65b285cd4e2f0fc6648261b4e0eb373 100644 (file)
Binary files a/models/player/ignismasked.iqm and b/models/player/ignismasked.iqm differ

diff --git a/models/player/ignismasked.iqm.framegroups b/models/player/ignismasked.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/ignismasked.iqm.framegroups
+++ b/models/player/ignismasked.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/ignismasked_lod1.iqm b/models/player/ignismasked_lod1.iqm
index 15c031e6ca08523c33dc1b09cf045ef24aef479a..848a369886bf47ca3aa2bed3cb8a53baecd6773b 100644 (file)
Binary files a/models/player/ignismasked_lod1.iqm and b/models/player/ignismasked_lod1.iqm differ

diff --git a/models/player/ignismasked_lod1.iqm.framegroups b/models/player/ignismasked_lod1.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/ignismasked_lod1.iqm.framegroups
+++ b/models/player/ignismasked_lod1.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/ignismasked_lod2.iqm b/models/player/ignismasked_lod2.iqm
index 99e6dec0f695e938dc6ecaba8a0fae65455aa726..ef4d93b57aadb15e8cb359254cc98b055f22c9c0 100644 (file)
Binary files a/models/player/ignismasked_lod2.iqm and b/models/player/ignismasked_lod2.iqm differ

diff --git a/models/player/ignismasked_lod2.iqm.framegroups b/models/player/ignismasked_lod2.iqm.framegroups
index 9dc589e5c899b7d6820a214c60db0ced0081adfe..1d8d493b909bc51a67d429efee533767e174b18a 100644 (file)
--- a/models/player/ignismasked_lod2.iqm.framegroups
+++ b/models/player/ignismasked_lod2.iqm.framegroups
@@ -1,24 +1,24 @@
-0 36 15.000000 0 // dieone
-36 20 15.000000 0 // dietwo
-56 15 15.000000 1 // draw
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 0 // shoot
+205 15 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // 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
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.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
-433 21 20.000000 0 // melee
\ No newline at end of file
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

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

diff --git a/models/player/megaerebus.iqm.framegroups b/models/player/megaerebus.iqm.framegroups
new file mode 100644 (file)
index 0000000..1d8d493
--- /dev/null
+++ b/models/player/megaerebus.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // shoot
+240 21 15.000000 1 // taunt
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/models/player/megaerebus.iqm_0.skin b/models/player/megaerebus.iqm_0.skin
new file mode 100644 (file)
index 0000000..4597cef
--- /dev/null
+++ b/models/player/megaerebus.iqm_0.skin
@@ -0,0 +1,2 @@
+erebus,erebusfullbright
+erebus.001,shadowhead

diff --git a/models/player/megaerebus.iqm_0.sounds b/models/player/megaerebus.iqm_0.sounds
new file mode 100644 (file)
index 0000000..a97a073
--- /dev/null
+++ b/models/player/megaerebus.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/soldier/coms/attack 0
+//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/coms/flagcarriertakingdamage 0
+freelance sound/player/soldier/coms/freelance 2
+getflag sound/player/soldier/coms/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/megaerebus.iqm_0.tga b/models/player/megaerebus.iqm_0.tga
new file mode 100644 (file)
index 0000000..69f1664
Binary files /dev/null and b/models/player/megaerebus.iqm_0.tga differ

diff --git a/models/player/megaerebus.iqm_0.txt b/models/player/megaerebus.iqm_0.txt
new file mode 100644 (file)
index 0000000..b4e2aa8
--- /dev/null
+++ b/models/player/megaerebus.iqm_0.txt
@@ -0,0 +1,7 @@
+name Mega Erebus
+species human
+sex Male
+weight 210
+age 26
+
+Heavyweight Xonotic Solider

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

diff --git a/models/player/megaerebus_lod1.iqm.framegroups b/models/player/megaerebus_lod1.iqm.framegroups
new file mode 100644 (file)
index 0000000..1d8d493
--- /dev/null
+++ b/models/player/megaerebus_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // shoot
+240 21 15.000000 1 // taunt
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

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

diff --git a/models/player/megaerebus_lod2.iqm.framegroups b/models/player/megaerebus_lod2.iqm.framegroups
new file mode 100644 (file)
index 0000000..1d8d493
--- /dev/null
+++ b/models/player/megaerebus_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 30.000000 0 // dieone
+36 20 25.000000 0 // dietwo
+56 15 30.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 24.000000 0 // painone
+220 17 34.000000 0 // paintwo
+237 3 3.000000 0 // shoot
+240 21 15.000000 1 // taunt
+261 20 29.000000 1 // run
+282 20 29.000000 1 // runbackwards
+303 20 29.000000 1 // strafeleft
+324 20 29.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 20 29.000000 1 // forwardright
+370 20 29.000000 1 // forwardleft
+391 20 29.000000 1 // backright
+412 20 29.000000 1 // backleft
+433 21 20.000000 0 // melee

diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index 4233e7d92d755b7651a60362f27080c192e888c7..6a3f5ea889515ca7cc2ac568effbe999dcd08ded 100644 (file)
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1258,7 +1258,6 @@ void weapon_thinkf(float fr, float t, void() func)
        //dprint("next ", ftos(self.weapon_nextthink), "\n");
 
     // The shoot animation looks TERRIBLE without animation blending! Yay for moonwalking while shooting!
-    /*
        if (restartanim)
        if (t)
        if (!self.crouch) // shoot anim stands up, this looks bad
@@ -1266,12 +1265,11 @@ void weapon_thinkf(float fr, float t, void() func)
                local vector anim;
                if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2)
                        anim = self.anim_melee;
-               else
-                       anim = self.anim_shoot;
+               /*else
+                       anim = self.anim_shoot;*/
                anim_z = anim_y / (t + sys_frametime);
                setanim(self, anim, FALSE, TRUE, TRUE);
        }
-    */
 };
 
 void weapon_boblayer1(float spd, vector org)