From: nifrek <nifrek@gmail.com>
Date: Wed, 15 Jun 2011 07:57:16 +0000 (-0400)
Subject: Add new jump anim to Nyx and fix issues with framegroups missing a frame somewhere
X-Git-Tag: xonotic-v0.5.0~199^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6275183618070d4399c62097c692c2d9f07ca7f2;p=xonotic%2Fxonotic-data.pk3dir.git

Add new jump anim to Nyx and fix issues with framegroups missing a frame somewhere
---

diff --git a/models/player/ignis.iqm.framegroups b/models/player/ignis.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/ignis.iqm.framegroups
+++ b/models/player/ignis.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/ignis_lod1.iqm.framegroups b/models/player/ignis_lod1.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/ignis_lod1.iqm.framegroups
+++ b/models/player/ignis_lod1.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/ignis_lod2.iqm.framegroups b/models/player/ignis_lod2.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/ignis_lod2.iqm.framegroups
+++ b/models/player/ignis_lod2.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/ignismasked.iqm.framegroups b/models/player/ignismasked.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/ignismasked.iqm.framegroups
+++ b/models/player/ignismasked.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/ignismasked_lod1.iqm.framegroups b/models/player/ignismasked_lod1.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/ignismasked_lod1.iqm.framegroups
+++ b/models/player/ignismasked_lod1.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/ignismasked_lod2.iqm.framegroups b/models/player/ignismasked_lod2.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/ignismasked_lod2.iqm.framegroups
+++ b/models/player/ignismasked_lod2.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/megaerebus.iqm.framegroups b/models/player/megaerebus.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/megaerebus.iqm.framegroups
+++ b/models/player/megaerebus.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/megaerebus_lod1.iqm.framegroups b/models/player/megaerebus_lod1.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/megaerebus_lod1.iqm.framegroups
+++ b/models/player/megaerebus_lod1.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/megaerebus_lod2.iqm.framegroups b/models/player/megaerebus_lod2.iqm.framegroups
index 9cec1e189..07516e08c 100644
--- a/models/player/megaerebus_lod2.iqm.framegroups
+++ b/models/player/megaerebus_lod2.iqm.framegroups
@@ -6,19 +6,19 @@
 112 16 15.000000 0 // duckjump
 128 15 5.000000 1 // duckidle
 143 41 5.000000 1 // idle
-184 159 25.000000 0 // jump
-343 15 24.000000 0 // painone
-358 17 34.000000 0 // paintwo
-375 3 3.000000 0 // shoot
-378 21 15.000000 1 // taunt
-399 20 29.000000 1 // run
-420 20 29.000000 1 // runbackwards
-441 20 29.000000 1 // strafeleft
-462 20 29.000000 1 // straferight
-483 2 15.000000 0 // deadone
-485 2 15.000000 0 // deadtwo
-487 20 29.000000 1 // forwardright
-508 20 29.000000 1 // forwardleft
-529 20 29.000000 1 // backright
-550 20 29.000000 1 // backleft
-571 21 20.000000 0 // melee
+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
diff --git a/models/player/nyx.iqm b/models/player/nyx.iqm
index 43546c143..24cc947bf 100644
Binary files a/models/player/nyx.iqm and b/models/player/nyx.iqm differ
diff --git a/models/player/nyx.iqm.framegroups b/models/player/nyx.iqm.framegroups
index 9dc589e5c..94baca733 100644
--- a/models/player/nyx.iqm.framegroups
+++ b/models/player/nyx.iqm.framegroups
@@ -6,19 +6,19 @@
 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
-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
-433 21 20.000000 0 // melee
\ No newline at end of file
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+598 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/nyx_lod1.iqm b/models/player/nyx_lod1.iqm
index ccbc45ad4..27a418a38 100644
Binary files a/models/player/nyx_lod1.iqm and b/models/player/nyx_lod1.iqm differ
diff --git a/models/player/nyx_lod1.iqm.framegroups b/models/player/nyx_lod1.iqm.framegroups
index 9dc589e5c..94baca733 100644
--- a/models/player/nyx_lod1.iqm.framegroups
+++ b/models/player/nyx_lod1.iqm.framegroups
@@ -6,19 +6,19 @@
 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
-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
-433 21 20.000000 0 // melee
\ No newline at end of file
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+598 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/nyx_lod2.iqm b/models/player/nyx_lod2.iqm
index e5f55cc47..82d48b6c9 100644
Binary files a/models/player/nyx_lod2.iqm and b/models/player/nyx_lod2.iqm differ
diff --git a/models/player/nyx_lod2.iqm.framegroups b/models/player/nyx_lod2.iqm.framegroups
index 9dc589e5c..94baca733 100644
--- a/models/player/nyx_lod2.iqm.framegroups
+++ b/models/player/nyx_lod2.iqm.framegroups
@@ -6,19 +6,19 @@
 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
-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
-433 21 20.000000 0 // melee
\ No newline at end of file
+184 160 25.000000 0 // jump
+344 15 15.000000 0 // painone
+359 17 15.000000 0 // paintwo
+376 3 15.000000 0 // shoot
+379 21 15.000000 1 // taunt
+400 21 35.000000 1 // run
+421 21 35.000000 1 // runbackwards
+442 21 35.000000 1 // strafeleft
+463 21 35.000000 1 // straferight
+484 2 15.000000 0 // deadone
+486 2 15.000000 0 // deadtwo
+488 21 35.000000 1 // forwardright
+598 21 35.000000 1 // forwardleft
+530 21 35.000000 1 // backright
+551 21 30.000000 1 // backleft
+572 21 20.000000 0 // melee
\ No newline at end of file