Major changes to the vixen model! Players now use the iqm format, which is newer...

diff --git a/data/models/player/vixen-1.txt b/data/models/player/vixen-1.txt
index 2f2abcf307b7cf0748a4e8813821fc36546e1d37..261103ea5a4792f8d882bbc60572a22ef3a5395a 100644 (file)
--- a/data/models/player/vixen-1.txt
+++ b/data/models/player/vixen-1.txt
@@ -1,7 +1,7 @@
 Purple Vixen\r
 models/player/vixen-1\r
 0\r
-models/player/vixen.zym\r
+models/player/vixen.iqm\r
 species human\r
 \r
 Anthro fox warrior\r

diff --git a/data/models/player/vixen-2.txt b/data/models/player/vixen-2.txt
index d0f2a7577b7940878c1652915f758859f18a3ba2..0bf8f0919ba70470469c3b476532742913490b81 100644 (file)
--- a/data/models/player/vixen-2.txt
+++ b/data/models/player/vixen-2.txt
@@ -1,7 +1,7 @@
 Color Vixen\r
 models/player/vixen-2\r
 1\r
-models/player/vixen.zym\r
+models/player/vixen.iqm\r
 species human\r
 \r
 Anthro fox warrior\r

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

diff --git a/data/models/player/vixen.iqm.sounds b/data/models/player/vixen.iqm.sounds
new file mode 100644 (file)
index 0000000..478f8c2
--- /dev/null
+++ b/data/models/player/vixen.iqm.sounds
@@ -0,0 +1,39 @@
+//TAG: female
+//affirmative sound/player/female/coms/affirmative 0
+attack sound/player/female/coms/attack 2
+//attacking sound/player/female/coms/attacking 0
+attackinfive sound/player/female/coms/attackinfive 0
+coverme sound/player/female/coms/coverme 0
+defend sound/player/female/coms/defend 0
+//defending sound/player/female/coms/defending 0
+//droppedflag sound/player/female/coms/droppedflag 0
+//flagcarriertakingdamage sound/player/female/coms/flagcarriertakingdamage 0
+freelance sound/player/female/coms/freelance 2
+//getflag sound/player/female/coms/getflag 0
+incoming sound/player/female/coms/incoming 0
+meet sound/player/female/coms/meet 0
+needhelp sound/player/female/coms/needhelp 1
+//negative sound/player/female/coms/negative 0
+//onmyway sound/player/female/coms/onmyway 0
+//roaming sound/player/female/coms/roaming 0
+//seenenemy sound/player/female/coms/seenenemy 0
+seenflag sound/player/female/coms/seenflag 0
+taunt sound/player/female/coms/taunt 5
+pred sound/player/female/coms/pred 6
+prey sound/player/female/coms/prey 6
+teamshoot sound/player/female/coms/teamshoot 4
+death sound/player/female/player/death 3
+drown sound/player/female/player/drown 0
+fall sound/player/female/player/fall 1
+falling sound/player/female/player/falling 0
+gasp sound/player/female/player/gasp 0
+jump sound/player/female/player/jump 0
+swallow sound/player/female/player/swallow 2
+digest sound/player/female/player/digest 0
+regurgitate sound/player/female/player/regurgitate 2
+regurgitate_prepare sound/player/female/player/regurgitate_prepare 0
+gurgle sound/player/female/player/gurgle 0
+pain25 sound/player/female/player/pain25 0
+pain50 sound/player/female/player/pain50 0
+pain75 sound/player/female/player/pain75 0
+pain100 sound/player/female/player/pain100 0

diff --git a/data/models/player/vixen.iqm_0.skin b/data/models/player/vixen.iqm_0.skin
new file mode 100644 (file)
index 0000000..93979d3
--- /dev/null
+++ b/data/models/player/vixen.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen.iqm_1.skin b/data/models/player/vixen.iqm_1.skin
new file mode 100644 (file)
index 0000000..0a5e8ed
--- /dev/null
+++ b/data/models/player/vixen.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen.zym b/data/models/player/vixen.zym
deleted file mode 100644 (file)
index 064962e..0000000
Binary files a/data/models/player/vixen.zym and /dev/null differ

diff --git a/data/models/player/vixen.zym.sounds b/data/models/player/vixen.zym.sounds
deleted file mode 100644 (file)
index 478f8c2..0000000
--- a/data/models/player/vixen.zym.sounds
+++ /dev/null
@@ -1,39 +0,0 @@
-//TAG: female
-//affirmative sound/player/female/coms/affirmative 0
-attack sound/player/female/coms/attack 2
-//attacking sound/player/female/coms/attacking 0
-attackinfive sound/player/female/coms/attackinfive 0
-coverme sound/player/female/coms/coverme 0
-defend sound/player/female/coms/defend 0
-//defending sound/player/female/coms/defending 0
-//droppedflag sound/player/female/coms/droppedflag 0
-//flagcarriertakingdamage sound/player/female/coms/flagcarriertakingdamage 0
-freelance sound/player/female/coms/freelance 2
-//getflag sound/player/female/coms/getflag 0
-incoming sound/player/female/coms/incoming 0
-meet sound/player/female/coms/meet 0
-needhelp sound/player/female/coms/needhelp 1
-//negative sound/player/female/coms/negative 0
-//onmyway sound/player/female/coms/onmyway 0
-//roaming sound/player/female/coms/roaming 0
-//seenenemy sound/player/female/coms/seenenemy 0
-seenflag sound/player/female/coms/seenflag 0
-taunt sound/player/female/coms/taunt 5
-pred sound/player/female/coms/pred 6
-prey sound/player/female/coms/prey 6
-teamshoot sound/player/female/coms/teamshoot 4
-death sound/player/female/player/death 3
-drown sound/player/female/player/drown 0
-fall sound/player/female/player/fall 1
-falling sound/player/female/player/falling 0
-gasp sound/player/female/player/gasp 0
-jump sound/player/female/player/jump 0
-swallow sound/player/female/player/swallow 2
-digest sound/player/female/player/digest 0
-regurgitate sound/player/female/player/regurgitate 2
-regurgitate_prepare sound/player/female/player/regurgitate_prepare 0
-gurgle sound/player/female/player/gurgle 0
-pain25 sound/player/female/player/pain25 0
-pain50 sound/player/female/player/pain50 0
-pain75 sound/player/female/player/pain75 0
-pain100 sound/player/female/player/pain100 0

diff --git a/data/models/player/vixen.zym_0.skin b/data/models/player/vixen.zym_0.skin
deleted file mode 100644 (file)
index 93979d3..0000000
--- a/data/models/player/vixen.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen.zym_1.skin b/data/models/player/vixen.zym_1.skin
deleted file mode 100644 (file)
index 0a5e8ed..0000000
--- a/data/models/player/vixen.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file

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

diff --git a/data/models/player/vixen_state1.iqm_0.skin b/data/models/player/vixen_state1.iqm_0.skin
new file mode 100644 (file)
index 0000000..93979d3
--- /dev/null
+++ b/data/models/player/vixen_state1.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state1.iqm_1.skin b/data/models/player/vixen_state1.iqm_1.skin
new file mode 100644 (file)
index 0000000..0a5e8ed
--- /dev/null
+++ b/data/models/player/vixen_state1.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_state1.zym b/data/models/player/vixen_state1.zym
deleted file mode 100644 (file)
index 5a1cb70..0000000
Binary files a/data/models/player/vixen_state1.zym and /dev/null differ

diff --git a/data/models/player/vixen_state1.zym_0.skin b/data/models/player/vixen_state1.zym_0.skin
deleted file mode 100644 (file)
index 93979d3..0000000
--- a/data/models/player/vixen_state1.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state1.zym_1.skin b/data/models/player/vixen_state1.zym_1.skin
deleted file mode 100644 (file)
index 0a5e8ed..0000000
--- a/data/models/player/vixen_state1.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file

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

diff --git a/data/models/player/vixen_state2.iqm_0.skin b/data/models/player/vixen_state2.iqm_0.skin
new file mode 100644 (file)
index 0000000..93979d3
--- /dev/null
+++ b/data/models/player/vixen_state2.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state2.iqm_1.skin b/data/models/player/vixen_state2.iqm_1.skin
new file mode 100644 (file)
index 0000000..0a5e8ed
--- /dev/null
+++ b/data/models/player/vixen_state2.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_state2.zym b/data/models/player/vixen_state2.zym
deleted file mode 100644 (file)
index 5e3a142..0000000
Binary files a/data/models/player/vixen_state2.zym and /dev/null differ

diff --git a/data/models/player/vixen_state2.zym_0.skin b/data/models/player/vixen_state2.zym_0.skin
deleted file mode 100644 (file)
index 93979d3..0000000
--- a/data/models/player/vixen_state2.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state2.zym_1.skin b/data/models/player/vixen_state2.zym_1.skin
deleted file mode 100644 (file)
index 0a5e8ed..0000000
--- a/data/models/player/vixen_state2.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file

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

diff --git a/data/models/player/vixen_state3.iqm_0.skin b/data/models/player/vixen_state3.iqm_0.skin
new file mode 100644 (file)
index 0000000..93979d3
--- /dev/null
+++ b/data/models/player/vixen_state3.iqm_0.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state3.iqm_1.skin b/data/models/player/vixen_state3.iqm_1.skin
new file mode 100644 (file)
index 0000000..0a5e8ed
--- /dev/null
+++ b/data/models/player/vixen_state3.iqm_1.skin
@@ -0,0 +1 @@
+vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/models/player/vixen_state3.zym b/data/models/player/vixen_state3.zym
deleted file mode 100644 (file)
index 5cb154f..0000000
Binary files a/data/models/player/vixen_state3.zym and /dev/null differ

diff --git a/data/models/player/vixen_state3.zym_0.skin b/data/models/player/vixen_state3.zym_0.skin
deleted file mode 100644 (file)
index 93979d3..0000000
--- a/data/models/player/vixen_state3.zym_0.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-1
\ No newline at end of file

diff --git a/data/models/player/vixen_state3.zym_1.skin b/data/models/player/vixen_state3.zym_1.skin
deleted file mode 100644 (file)
index 0a5e8ed..0000000
--- a/data/models/player/vixen_state3.zym_1.skin
+++ /dev/null
@@ -1 +0,0 @@
-vixen, textures/player/vixen-2
\ No newline at end of file

diff --git a/data/qcsrc/server/cheats.qc b/data/qcsrc/server/cheats.qc
index 1f3a85533fc6cd6d38206d56a7c18d4f88c6d2b3..e7c811528b5b700093c4d54f1e8abee1e7f92577 100644 (file)
--- a/data/qcsrc/server/cheats.qc
+++ b/data/qcsrc/server/cheats.qc
@@ -221,11 +221,7 @@ float CheatImpulse(float i)
                        IS_CHEAT(i, 0, 0);
                        FOR_EACH_PLAYER(e)
                        {
-                               if( e.playermodel == "models/player/jeandarc.zym"
-                                               ||  e.playermodel == "models/player/pyria.zym"
-                                               ||  e.playermodel == "models/player/skadi.zym"
-                                               || (e.playermodel == "models/player/specop.zym" && random() < 0.5) // you never know
-                                               ||  e.playermodel == "models/player/visitant.zym")
+                               if(e.playermodel == "models/player/vixen.iqm")
                                {
                                        makevectors(e.angles);
                                        traceline(e.origin, e.origin + v_right * 256, MOVE_NORMAL, e);

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index c01fc3933bfd6eb84d59642e9b28989c7a5b3d5c..1edb3c189680ee706be9bdcfcea0833ac5c9506c 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -396,7 +396,7 @@ Checks if the argument string can be a valid playermodel.
 Returns a valid one in doubt.\r
 =============\r
 */\r
-string FallbackPlayerModel = "models/player/vixen.zym";\r
+string FallbackPlayerModel = "models/player/vixen.iqm";\r
 string CheckPlayerModel(string plyermodel) {\r
        if(strlen(plyermodel) < 4)\r
                return FallbackPlayerModel;\r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 9f4c0c8fb86a260c7a4cb05d59e6c806792dfc68..79244055705f2ce5af2851a095c78a638d1f48d0 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -1350,7 +1350,6 @@ void precache()
         precache_all_models("models/player/*.md3");\r
         precache_all_models("models/player/*.psk");\r
                precache_all_models("models/player/*.iqm");\r
-        //precache_model("models/player/vixen.zym");\r
     }\r
 \r
     if (cvar("sv_defaultcharacter"))\r

diff --git a/misc/source/media/models/player/vixen.blend b/misc/source/media/models/player/vixen.blend
index 5eb0f17c90ec0ad9dfb9b20f01c370d7f45399a8..00e895354261386d7ac4933053ae94bbff511c23 100644 (file)
Binary files a/misc/source/media/models/player/vixen.blend and b/misc/source/media/models/player/vixen.blend differ

diff --git a/misc/source/media/models/player/vixen_belly1.blend b/misc/source/media/models/player/vixen_belly1.blend
index 476a484b1f8a6da178785292791df41debdd4b11..0be4ae8223cdeb81cc041d9b8636accc9b8f57e5 100644 (file)
Binary files a/misc/source/media/models/player/vixen_belly1.blend and b/misc/source/media/models/player/vixen_belly1.blend differ

diff --git a/misc/source/media/models/player/vixen_belly2.blend b/misc/source/media/models/player/vixen_belly2.blend
index 3f8d8521f6a688e9cb8bb9071955b85ca6c3eb26..94bdeeae62ba8d7f014364de246674f6d1127257 100644 (file)
Binary files a/misc/source/media/models/player/vixen_belly2.blend and b/misc/source/media/models/player/vixen_belly2.blend differ

diff --git a/misc/source/media/models/player/vixen_belly3.blend b/misc/source/media/models/player/vixen_belly3.blend
index e7581277c02f4f7b680e8880d19423f27a215b9b..7d64e001475b6ce46dce4b5d44f0f31926097178 100644 (file)
Binary files a/misc/source/media/models/player/vixen_belly3.blend and b/misc/source/media/models/player/vixen_belly3.blend differ