From: Mircea Kitsune Date: Sun, 15 Sep 2013 20:57:09 +0000 (+0300) Subject: v1.1 with several fixes X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e0e4f8c098684de18bcfff81d5faa5a8e52dc44;p=xonotic%2Fxonotic-data.pk3dir.git v1.1 with several fixes --- diff --git a/models/player/terminusf.blend b/models/player/terminusf.blend deleted file mode 100644 index 1b56c748e..000000000 Binary files a/models/player/terminusf.blend and /dev/null differ diff --git a/models/player/terminusf.iqm b/models/player/terminusf.iqm deleted file mode 100644 index 56b4c87ea..000000000 Binary files a/models/player/terminusf.iqm and /dev/null differ diff --git a/models/player/terminusf.iqm.framegroups b/models/player/terminusf.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/terminusf.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -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 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusf.iqm_0.skin b/models/player/terminusf.iqm_0.skin deleted file mode 100644 index 71482d6b2..000000000 --- a/models/player/terminusf.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -terminus,terminus_body -terminus.001,terminus_head_female diff --git a/models/player/terminusf.iqm_0.sounds b/models/player/terminusf.iqm_0.sounds deleted file mode 100644 index 00eabbd25..000000000 --- a/models/player/terminusf.iqm_0.sounds +++ /dev/null @@ -1,32 +0,0 @@ -//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/terminusf.iqm_0.tga b/models/player/terminusf.iqm_0.tga deleted file mode 100644 index c691e8173..000000000 Binary files a/models/player/terminusf.iqm_0.tga and /dev/null differ diff --git a/models/player/terminusf.iqm_0.txt b/models/player/terminusf.iqm_0.txt deleted file mode 100644 index 828341b85..000000000 --- a/models/player/terminusf.iqm_0.txt +++ /dev/null @@ -1,13 +0,0 @@ -name Terminus - Female -species robot_solid -sex Female -weight 60 -age 3 -bone_upperbody spine2 -bone_aim0 0.25 spine2 -bone_aim1 0.4 spine4 -bone_aim2 0.35 bip01 r hand -bone_weapon bip01 r hand -fixbone 1 - -Heavyweight Xonotic Soldier diff --git a/models/player/terminusf_lod1.iqm b/models/player/terminusf_lod1.iqm deleted file mode 100644 index b18f7f152..000000000 Binary files a/models/player/terminusf_lod1.iqm and /dev/null differ diff --git a/models/player/terminusf_lod1.iqm.framegroups b/models/player/terminusf_lod1.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/terminusf_lod1.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -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 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusf_lod1.iqm_0.skin b/models/player/terminusf_lod1.iqm_0.skin deleted file mode 100644 index 71482d6b2..000000000 --- a/models/player/terminusf_lod1.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -terminus,terminus_body -terminus.001,terminus_head_female diff --git a/models/player/terminusf_lod2.iqm b/models/player/terminusf_lod2.iqm deleted file mode 100644 index 617099e9c..000000000 Binary files a/models/player/terminusf_lod2.iqm and /dev/null differ diff --git a/models/player/terminusf_lod2.iqm.framegroups b/models/player/terminusf_lod2.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/terminusf_lod2.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -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 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusf_lod2.iqm_0.skin b/models/player/terminusf_lod2.iqm_0.skin deleted file mode 100644 index 71482d6b2..000000000 --- a/models/player/terminusf_lod2.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -terminus,terminus_body -terminus.001,terminus_head_female diff --git a/models/player/terminusfemale.blend b/models/player/terminusfemale.blend new file mode 100644 index 000000000..16dbf5cc2 Binary files /dev/null and b/models/player/terminusfemale.blend differ diff --git a/models/player/terminusfemale.iqm b/models/player/terminusfemale.iqm new file mode 100644 index 000000000..4c60a2a77 Binary files /dev/null and b/models/player/terminusfemale.iqm differ diff --git a/models/player/terminusfemale.iqm.framegroups b/models/player/terminusfemale.iqm.framegroups new file mode 100644 index 000000000..6432971bb --- /dev/null +++ b/models/player/terminusfemale.iqm.framegroups @@ -0,0 +1,31 @@ +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 20 32.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 10.000000 1 // duckidle +143 41 5.000000 1 // idle +184 160 25.000000 0 // jump +344 15 24.000000 0 // painone +359 17 34.000000 0 // paintwo +376 3 3.000000 0 // shoot +379 21 15.000000 1 // taunt +400 20 29.000000 1 // run +421 20 29.000000 1 // runbackwards +442 20 29.000000 1 // strafeleft +463 20 29.000000 1 // straferight +484 2 15.000000 0 // deadone +486 2 15.000000 0 // deadtwo +488 20 29.000000 1 // forwardright +509 20 29.000000 1 // forwardleft +530 20 29.000000 1 // backright +551 20 29.000000 1 // backleft +572 21 20.000000 0 // melee +593 20 32.000000 1 // duckwalkbackwards +614 20 32.000000 1 // duckwalkstrafeleft +635 20 32.000000 1 // duckwalkstraferight +656 20 32.000000 1 // duckwalkforwardright +677 20 32.000000 1 // duckwalkforwardleft +698 20 32.000000 1 // duckwalkbackright +719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusfemale.iqm_0.skin b/models/player/terminusfemale.iqm_0.skin new file mode 100644 index 000000000..71482d6b2 --- /dev/null +++ b/models/player/terminusfemale.iqm_0.skin @@ -0,0 +1,2 @@ +terminus,terminus_body +terminus.001,terminus_head_female diff --git a/models/player/terminusfemale.iqm_0.sounds b/models/player/terminusfemale.iqm_0.sounds new file mode 100644 index 000000000..00eabbd25 --- /dev/null +++ b/models/player/terminusfemale.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/terminusfemale.iqm_0.tga b/models/player/terminusfemale.iqm_0.tga new file mode 100644 index 000000000..c691e8173 Binary files /dev/null and b/models/player/terminusfemale.iqm_0.tga differ diff --git a/models/player/terminusfemale.iqm_0.txt b/models/player/terminusfemale.iqm_0.txt new file mode 100644 index 000000000..828341b85 --- /dev/null +++ b/models/player/terminusfemale.iqm_0.txt @@ -0,0 +1,13 @@ +name Terminus - Female +species robot_solid +sex Female +weight 60 +age 3 +bone_upperbody spine2 +bone_aim0 0.25 spine2 +bone_aim1 0.4 spine4 +bone_aim2 0.35 bip01 r hand +bone_weapon bip01 r hand +fixbone 1 + +Heavyweight Xonotic Soldier diff --git a/models/player/terminusfemale_lod1.iqm b/models/player/terminusfemale_lod1.iqm new file mode 100644 index 000000000..50663e78d Binary files /dev/null and b/models/player/terminusfemale_lod1.iqm differ diff --git a/models/player/terminusfemale_lod1.iqm.framegroups b/models/player/terminusfemale_lod1.iqm.framegroups new file mode 100644 index 000000000..6432971bb --- /dev/null +++ b/models/player/terminusfemale_lod1.iqm.framegroups @@ -0,0 +1,31 @@ +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 20 32.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 10.000000 1 // duckidle +143 41 5.000000 1 // idle +184 160 25.000000 0 // jump +344 15 24.000000 0 // painone +359 17 34.000000 0 // paintwo +376 3 3.000000 0 // shoot +379 21 15.000000 1 // taunt +400 20 29.000000 1 // run +421 20 29.000000 1 // runbackwards +442 20 29.000000 1 // strafeleft +463 20 29.000000 1 // straferight +484 2 15.000000 0 // deadone +486 2 15.000000 0 // deadtwo +488 20 29.000000 1 // forwardright +509 20 29.000000 1 // forwardleft +530 20 29.000000 1 // backright +551 20 29.000000 1 // backleft +572 21 20.000000 0 // melee +593 20 32.000000 1 // duckwalkbackwards +614 20 32.000000 1 // duckwalkstrafeleft +635 20 32.000000 1 // duckwalkstraferight +656 20 32.000000 1 // duckwalkforwardright +677 20 32.000000 1 // duckwalkforwardleft +698 20 32.000000 1 // duckwalkbackright +719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusfemale_lod1.iqm_0.skin b/models/player/terminusfemale_lod1.iqm_0.skin new file mode 100644 index 000000000..71482d6b2 --- /dev/null +++ b/models/player/terminusfemale_lod1.iqm_0.skin @@ -0,0 +1,2 @@ +terminus,terminus_body +terminus.001,terminus_head_female diff --git a/models/player/terminusfemale_lod2.iqm b/models/player/terminusfemale_lod2.iqm new file mode 100644 index 000000000..8acbb97f2 Binary files /dev/null and b/models/player/terminusfemale_lod2.iqm differ diff --git a/models/player/terminusfemale_lod2.iqm.framegroups b/models/player/terminusfemale_lod2.iqm.framegroups new file mode 100644 index 000000000..6432971bb --- /dev/null +++ b/models/player/terminusfemale_lod2.iqm.framegroups @@ -0,0 +1,31 @@ +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 20 32.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 10.000000 1 // duckidle +143 41 5.000000 1 // idle +184 160 25.000000 0 // jump +344 15 24.000000 0 // painone +359 17 34.000000 0 // paintwo +376 3 3.000000 0 // shoot +379 21 15.000000 1 // taunt +400 20 29.000000 1 // run +421 20 29.000000 1 // runbackwards +442 20 29.000000 1 // strafeleft +463 20 29.000000 1 // straferight +484 2 15.000000 0 // deadone +486 2 15.000000 0 // deadtwo +488 20 29.000000 1 // forwardright +509 20 29.000000 1 // forwardleft +530 20 29.000000 1 // backright +551 20 29.000000 1 // backleft +572 21 20.000000 0 // melee +593 20 32.000000 1 // duckwalkbackwards +614 20 32.000000 1 // duckwalkstrafeleft +635 20 32.000000 1 // duckwalkstraferight +656 20 32.000000 1 // duckwalkforwardright +677 20 32.000000 1 // duckwalkforwardleft +698 20 32.000000 1 // duckwalkbackright +719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusfemale_lod2.iqm_0.skin b/models/player/terminusfemale_lod2.iqm_0.skin new file mode 100644 index 000000000..71482d6b2 --- /dev/null +++ b/models/player/terminusfemale_lod2.iqm_0.skin @@ -0,0 +1,2 @@ +terminus,terminus_body +terminus.001,terminus_head_female diff --git a/models/player/terminusm.blend b/models/player/terminusm.blend deleted file mode 100644 index d922a1846..000000000 Binary files a/models/player/terminusm.blend and /dev/null differ diff --git a/models/player/terminusm.iqm b/models/player/terminusm.iqm deleted file mode 100644 index b621dc4c4..000000000 Binary files a/models/player/terminusm.iqm and /dev/null differ diff --git a/models/player/terminusm.iqm.framegroups b/models/player/terminusm.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/terminusm.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -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 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusm.iqm_0.skin b/models/player/terminusm.iqm_0.skin deleted file mode 100644 index 58608fea2..000000000 --- a/models/player/terminusm.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -terminus,terminus_body -terminus.001,terminus_head_male diff --git a/models/player/terminusm.iqm_0.sounds b/models/player/terminusm.iqm_0.sounds deleted file mode 100644 index a97a073b9..000000000 --- a/models/player/terminusm.iqm_0.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/terminusm.iqm_0.tga b/models/player/terminusm.iqm_0.tga deleted file mode 100644 index 444e79841..000000000 Binary files a/models/player/terminusm.iqm_0.tga and /dev/null differ diff --git a/models/player/terminusm.iqm_0.txt b/models/player/terminusm.iqm_0.txt deleted file mode 100644 index b990ac8f2..000000000 --- a/models/player/terminusm.iqm_0.txt +++ /dev/null @@ -1,14 +0,0 @@ -name Terminus - Male -species robot_solid -sex Male -weight 75 -age 5 -bone_upperbody spine2 -bone_aim0 0.25 spine2 -bone_aim1 0.4 spine4 -bone_aim2 0.2 upperarm_L -bone_aim3 0.35 bip01 r hand -bone_weapon bip01 r hand -fixbone 1 - -Heavyweight Xonotic Solider diff --git a/models/player/terminusm_lod1.iqm b/models/player/terminusm_lod1.iqm deleted file mode 100644 index 1dec5313d..000000000 Binary files a/models/player/terminusm_lod1.iqm and /dev/null differ diff --git a/models/player/terminusm_lod1.iqm.framegroups b/models/player/terminusm_lod1.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/terminusm_lod1.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -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 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusm_lod1.iqm_0.skin b/models/player/terminusm_lod1.iqm_0.skin deleted file mode 100644 index 58608fea2..000000000 --- a/models/player/terminusm_lod1.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -terminus,terminus_body -terminus.001,terminus_head_male diff --git a/models/player/terminusm_lod2.iqm b/models/player/terminusm_lod2.iqm deleted file mode 100644 index 433dce2ac..000000000 Binary files a/models/player/terminusm_lod2.iqm and /dev/null differ diff --git a/models/player/terminusm_lod2.iqm.framegroups b/models/player/terminusm_lod2.iqm.framegroups deleted file mode 100644 index 6432971bb..000000000 --- a/models/player/terminusm_lod2.iqm.framegroups +++ /dev/null @@ -1,31 +0,0 @@ -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 20 32.000000 1 // duckwalk -112 16 15.000000 0 // duckjump -128 15 10.000000 1 // duckidle -143 41 5.000000 1 // idle -184 160 25.000000 0 // jump -344 15 24.000000 0 // painone -359 17 34.000000 0 // paintwo -376 3 3.000000 0 // shoot -379 21 15.000000 1 // taunt -400 20 29.000000 1 // run -421 20 29.000000 1 // runbackwards -442 20 29.000000 1 // strafeleft -463 20 29.000000 1 // straferight -484 2 15.000000 0 // deadone -486 2 15.000000 0 // deadtwo -488 20 29.000000 1 // forwardright -509 20 29.000000 1 // forwardleft -530 20 29.000000 1 // backright -551 20 29.000000 1 // backleft -572 21 20.000000 0 // melee -593 20 32.000000 1 // duckwalkbackwards -614 20 32.000000 1 // duckwalkstrafeleft -635 20 32.000000 1 // duckwalkstraferight -656 20 32.000000 1 // duckwalkforwardright -677 20 32.000000 1 // duckwalkforwardleft -698 20 32.000000 1 // duckwalkbackright -719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusm_lod2.iqm_0.skin b/models/player/terminusm_lod2.iqm_0.skin deleted file mode 100644 index 58608fea2..000000000 --- a/models/player/terminusm_lod2.iqm_0.skin +++ /dev/null @@ -1,2 +0,0 @@ -terminus,terminus_body -terminus.001,terminus_head_male diff --git a/models/player/terminusmale.blend b/models/player/terminusmale.blend new file mode 100644 index 000000000..4c6232c88 Binary files /dev/null and b/models/player/terminusmale.blend differ diff --git a/models/player/terminusmale.iqm b/models/player/terminusmale.iqm new file mode 100644 index 000000000..fc68a1734 Binary files /dev/null and b/models/player/terminusmale.iqm differ diff --git a/models/player/terminusmale.iqm.framegroups b/models/player/terminusmale.iqm.framegroups new file mode 100644 index 000000000..6432971bb --- /dev/null +++ b/models/player/terminusmale.iqm.framegroups @@ -0,0 +1,31 @@ +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 20 32.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 10.000000 1 // duckidle +143 41 5.000000 1 // idle +184 160 25.000000 0 // jump +344 15 24.000000 0 // painone +359 17 34.000000 0 // paintwo +376 3 3.000000 0 // shoot +379 21 15.000000 1 // taunt +400 20 29.000000 1 // run +421 20 29.000000 1 // runbackwards +442 20 29.000000 1 // strafeleft +463 20 29.000000 1 // straferight +484 2 15.000000 0 // deadone +486 2 15.000000 0 // deadtwo +488 20 29.000000 1 // forwardright +509 20 29.000000 1 // forwardleft +530 20 29.000000 1 // backright +551 20 29.000000 1 // backleft +572 21 20.000000 0 // melee +593 20 32.000000 1 // duckwalkbackwards +614 20 32.000000 1 // duckwalkstrafeleft +635 20 32.000000 1 // duckwalkstraferight +656 20 32.000000 1 // duckwalkforwardright +677 20 32.000000 1 // duckwalkforwardleft +698 20 32.000000 1 // duckwalkbackright +719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusmale.iqm_0.skin b/models/player/terminusmale.iqm_0.skin new file mode 100644 index 000000000..58608fea2 --- /dev/null +++ b/models/player/terminusmale.iqm_0.skin @@ -0,0 +1,2 @@ +terminus,terminus_body +terminus.001,terminus_head_male diff --git a/models/player/terminusmale.iqm_0.sounds b/models/player/terminusmale.iqm_0.sounds new file mode 100644 index 000000000..a97a073b9 --- /dev/null +++ b/models/player/terminusmale.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/terminusmale.iqm_0.tga b/models/player/terminusmale.iqm_0.tga new file mode 100644 index 000000000..444e79841 Binary files /dev/null and b/models/player/terminusmale.iqm_0.tga differ diff --git a/models/player/terminusmale.iqm_0.txt b/models/player/terminusmale.iqm_0.txt new file mode 100644 index 000000000..b990ac8f2 --- /dev/null +++ b/models/player/terminusmale.iqm_0.txt @@ -0,0 +1,14 @@ +name Terminus - Male +species robot_solid +sex Male +weight 75 +age 5 +bone_upperbody spine2 +bone_aim0 0.25 spine2 +bone_aim1 0.4 spine4 +bone_aim2 0.2 upperarm_L +bone_aim3 0.35 bip01 r hand +bone_weapon bip01 r hand +fixbone 1 + +Heavyweight Xonotic Solider diff --git a/models/player/terminusmale_lod1.iqm b/models/player/terminusmale_lod1.iqm new file mode 100644 index 000000000..ae2066b2b Binary files /dev/null and b/models/player/terminusmale_lod1.iqm differ diff --git a/models/player/terminusmale_lod1.iqm.framegroups b/models/player/terminusmale_lod1.iqm.framegroups new file mode 100644 index 000000000..6432971bb --- /dev/null +++ b/models/player/terminusmale_lod1.iqm.framegroups @@ -0,0 +1,31 @@ +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 20 32.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 10.000000 1 // duckidle +143 41 5.000000 1 // idle +184 160 25.000000 0 // jump +344 15 24.000000 0 // painone +359 17 34.000000 0 // paintwo +376 3 3.000000 0 // shoot +379 21 15.000000 1 // taunt +400 20 29.000000 1 // run +421 20 29.000000 1 // runbackwards +442 20 29.000000 1 // strafeleft +463 20 29.000000 1 // straferight +484 2 15.000000 0 // deadone +486 2 15.000000 0 // deadtwo +488 20 29.000000 1 // forwardright +509 20 29.000000 1 // forwardleft +530 20 29.000000 1 // backright +551 20 29.000000 1 // backleft +572 21 20.000000 0 // melee +593 20 32.000000 1 // duckwalkbackwards +614 20 32.000000 1 // duckwalkstrafeleft +635 20 32.000000 1 // duckwalkstraferight +656 20 32.000000 1 // duckwalkforwardright +677 20 32.000000 1 // duckwalkforwardleft +698 20 32.000000 1 // duckwalkbackright +719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusmale_lod1.iqm_0.skin b/models/player/terminusmale_lod1.iqm_0.skin new file mode 100644 index 000000000..58608fea2 --- /dev/null +++ b/models/player/terminusmale_lod1.iqm_0.skin @@ -0,0 +1,2 @@ +terminus,terminus_body +terminus.001,terminus_head_male diff --git a/models/player/terminusmale_lod2.iqm b/models/player/terminusmale_lod2.iqm new file mode 100644 index 000000000..121542b14 Binary files /dev/null and b/models/player/terminusmale_lod2.iqm differ diff --git a/models/player/terminusmale_lod2.iqm.framegroups b/models/player/terminusmale_lod2.iqm.framegroups new file mode 100644 index 000000000..6432971bb --- /dev/null +++ b/models/player/terminusmale_lod2.iqm.framegroups @@ -0,0 +1,31 @@ +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 20 32.000000 1 // duckwalk +112 16 15.000000 0 // duckjump +128 15 10.000000 1 // duckidle +143 41 5.000000 1 // idle +184 160 25.000000 0 // jump +344 15 24.000000 0 // painone +359 17 34.000000 0 // paintwo +376 3 3.000000 0 // shoot +379 21 15.000000 1 // taunt +400 20 29.000000 1 // run +421 20 29.000000 1 // runbackwards +442 20 29.000000 1 // strafeleft +463 20 29.000000 1 // straferight +484 2 15.000000 0 // deadone +486 2 15.000000 0 // deadtwo +488 20 29.000000 1 // forwardright +509 20 29.000000 1 // forwardleft +530 20 29.000000 1 // backright +551 20 29.000000 1 // backleft +572 21 20.000000 0 // melee +593 20 32.000000 1 // duckwalkbackwards +614 20 32.000000 1 // duckwalkstrafeleft +635 20 32.000000 1 // duckwalkstraferight +656 20 32.000000 1 // duckwalkforwardright +677 20 32.000000 1 // duckwalkforwardleft +698 20 32.000000 1 // duckwalkbackright +719 20 32.000000 1 // duckwalkbackleft diff --git a/models/player/terminusmale_lod2.iqm_0.skin b/models/player/terminusmale_lod2.iqm_0.skin new file mode 100644 index 000000000..58608fea2 --- /dev/null +++ b/models/player/terminusmale_lod2.iqm_0.skin @@ -0,0 +1,2 @@ +terminus,terminus_body +terminus.001,terminus_head_male diff --git a/textures/terminus_body.tga b/textures/terminus_body.tga index ca3f9e891..ff0552648 100644 Binary files a/textures/terminus_body.tga and b/textures/terminus_body.tga differ diff --git a/textures/terminus_body_gloss.tga b/textures/terminus_body_gloss.tga index f2829668d..59c7d9778 100644 Binary files a/textures/terminus_body_gloss.tga and b/textures/terminus_body_gloss.tga differ diff --git a/textures/terminus_body_norm.tga b/textures/terminus_body_norm.tga index 162330a96..c87670254 100644 Binary files a/textures/terminus_body_norm.tga and b/textures/terminus_body_norm.tga differ