Patches #442

Merge in xonotic/xonotic-data.pk3dir.git: diabolik/playermelee

Added by git-manager about 3 years ago. Updated about 3 years ago.

Status:ClosedStart date:05/10/2011
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:-

Description

Purpose of the branch:

Adds melee animation to all models thanks to nifrek.

Repository: xonotic/xonotic-data.pk3dir.git
Commit: 5d10e7f85672174ba387a2f281c1ef98e216f51e
Branch: diabolik/playermelee

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '5d10e7f85672174ba387a2f281c1ef98e216f51e'..'origin/diabolik/playermelee'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/diabolik/playermelee'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'diabolik/playermelee'

Diffstat:

 models/player/erebus.iqm                           |  Bin 738445 -> 755255 bytes
 models/player/erebus.iqm.framegroups               |    1 +
 models/player/erebus_lod1.iqm                      |  Bin 404181 -> 435643 bytes
 models/player/erebus_lod1.iqm.framegroups          |    1 +
 models/player/erebus_lod2.iqm                      |  Bin 373933 -> 413771 bytes
 models/player/erebus_lod2.iqm.framegroups          |    1 +
 models/player/gak.iqm                              |  Bin 591607 -> 602753 bytes
 models/player/gak.iqm.framegroups                  |    1 +
 models/player/gak_lod1.iqm                         |  Bin 0 -> 362289 bytes
 models/player/gak_lod1.iqm.framegroups             |   24 ++++++++++++++++++++
 models/player/gak_lod2.iqm                         |  Bin 0 -> 341665 bytes
 models/player/gak_lod2.iqm.framegroups             |   24 ++++++++++++++++++++
 models/player/gakarmored.iqm                       |  Bin 633629 -> 645641 bytes
 models/player/gakarmored.iqm.framegroups           |    1 +
 models/player/gakarmored_lod1.iqm                  |  Bin 0 -> 366969 bytes
 models/player/gakarmored_lod1.iqm.framegroups      |   24 ++++++++++++++++++++
 models/player/gakarmored_lod2.iqm                  |  Bin 0 -> 336737 bytes
 models/player/gakarmored_lod2.iqm.framegroups      |   24 ++++++++++++++++++++
 models/player/gakmasked.iqm                        |  Bin 596503 -> 607649 bytes
 models/player/gakmasked.iqm.framegroups            |    1 +
 models/player/gakmasked_lod1.iqm                   |  Bin 0 -> 367545 bytes
 models/player/gakmasked_lod1.iqm.framegroups       |   24 ++++++++++++++++++++
 models/player/gakmasked_lod2.iqm                   |  Bin 0 -> 343001 bytes
 models/player/gakmasked_lod2.iqm.framegroups       |   24 ++++++++++++++++++++
 models/player/ignis.iqm                            |  Bin 867618 -> 885336 bytes
 models/player/ignis.iqm.framegroups                |    1 +
 models/player/ignis_lod1.iqm                       |  Bin 410210 -> 424104 bytes
 models/player/ignis_lod1.iqm.framegroups           |    1 +
 models/player/ignis_lod2.iqm                       |  Bin 376938 -> 404336 bytes
 models/player/ignis_lod2.iqm.framegroups           |    1 +
 models/player/ignishalfmasked.iqm                  |  Bin 803810 -> 821528 bytes
 models/player/ignishalfmasked.iqm.framegroups      |    1 +
 models/player/ignishalfmasked_lod1.iqm             |  Bin 402650 -> 423888 bytes
 models/player/ignishalfmasked_lod1.iqm.framegroups |    1 +
 models/player/ignishalfmasked_lod2.iqm             |  Bin 372802 -> 401256 bytes
 models/player/ignishalfmasked_lod2.iqm.framegroups |    1 +
 models/player/ignismasked.iqm                      |  Bin 699154 -> 716872 bytes
 models/player/ignismasked.iqm.framegroups          |    1 +
 models/player/ignismasked_lod1.iqm                 |  Bin 409202 -> 423624 bytes
 models/player/ignismasked_lod1.iqm.framegroups     |    1 +
 models/player/ignismasked_lod2.iqm                 |  Bin 390042 -> 405184 bytes
 models/player/ignismasked_lod2.iqm.framegroups     |    1 +
 models/player/nyx.iqm                              |  Bin 746827 -> 762813 bytes
 models/player/nyx.iqm.framegroups                  |    1 +
 models/player/nyx_lod1.iqm                         |  Bin 0 -> 424445 bytes
 models/player/nyx_lod1.iqm.framegroups             |   24 ++++++++++++++++++++
 models/player/nyx_lod2.iqm                         |  Bin 0 -> 404557 bytes
 models/player/nyx_lod2.iqm.framegroups             |   24 ++++++++++++++++++++
 models/player/pyria.iqm                            |  Bin 646004 -> 661990 bytes
 models/player/pyria.iqm.framegroups                |    1 +
 models/player/pyria_lod1.iqm                       |  Bin 0 -> 399848 bytes
 models/player/pyria_lod1.iqm.framegroups           |   24 ++++++++++++++++++++
 models/player/pyria_lod2.iqm                       |  Bin 0 -> 379736 bytes
 models/player/pyria_lod2.iqm.framegroups           |   24 ++++++++++++++++++++
 models/player/seraphina.iqm                        |  Bin 803432 -> 819250 bytes
 models/player/seraphina.iqm.framegroups            |    1 +
 models/player/seraphina_lod1.iqm                   |  Bin 419880 -> 419754 bytes
 models/player/seraphina_lod1.iqm.framegroups       |    1 +
 models/player/seraphina_lod2.iqm                   |  Bin 380656 -> 395586 bytes
 models/player/seraphina_lod2.iqm.framegroups       |    1 +
 models/player/seraphinamasked.iqm                  |  Bin 725064 -> 740882 bytes
 models/player/seraphinamasked.iqm.framegroups      |    1 +
 models/player/seraphinamasked_lod1.iqm             |  Bin 397528 -> 420082 bytes
 models/player/seraphinamasked_lod1.iqm.framegroups |    1 +
 models/player/seraphinamasked_lod2.iqm             |  Bin 375416 -> 397650 bytes
 models/player/seraphinamasked_lod2.iqm.framegroups |    1 +
 models/player/umbra.iqm                            |  Bin 517738 -> 533724 bytes
 models/player/umbra.iqm.framegroups                |    1 +
 models/player/umbra_lod1.iqm                       |  Bin 0 -> 395254 bytes
 models/player/umbra_lod1.iqm.framegroups           |   24 ++++++++++++++++++++
 models/player/umbra_lod2.iqm                       |  Bin 0 -> 376782 bytes
 models/player/umbra_lod2.iqm.framegroups           |   24 ++++++++++++++++++++
 qcsrc/server/cl_player.qc                          |    2 +
 qcsrc/server/cl_weaponsystem.qc                    |    3 ++
 qcsrc/server/defs.qh                               |    1 +
 xonotic-credits.txt                                |    6 ++++-
 76 files changed, 323 insertions(+), 1 deletions(-)

Revision log:

commit 5d10e7f85672174ba387a2f281c1ef98e216f51e
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Commit: Sahil Singhal <sahil@sahil-desktop.(none)>

    Update the credits with nifrek and myself  as animators.

commit 047f2e63069691184b4ec285ace6a44f9d2ee983
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Commit: Sahil Singhal <sahil@sahil-desktop.(none)>

    Melee animations and lods thanks to nifrek.

commit e49ebf3a1a9d96e4a3f63d37cc5f8d012d3d8362
Author: Sahil Singhal <sahil@sahil-desktop.(none)>
Commit: Sahil Singhal <sahil@sahil-desktop.(none)>

    Code for the melee weapons.

User agreed to the GPLv2+.

Diff:

diff --git a/models/player/erebus.iqm b/models/player/erebus.iqm
index ebd112b..fb9e1a1 100644
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 16b3e92..9dc589e 100644
--- a/models/player/erebus.iqm.framegroups
+++ b/models/player/erebus.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/erebus_lod1.iqm b/models/player/erebus_lod1.iqm
index 21cd3d4..7b35a71 100644
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 16b3e92..9dc589e 100644
--- a/models/player/erebus_lod1.iqm.framegroups
+++ b/models/player/erebus_lod1.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/erebus_lod2.iqm b/models/player/erebus_lod2.iqm
index 34e7e80..ba28fda 100644
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 16b3e92..9dc589e 100644
--- a/models/player/erebus_lod2.iqm.framegroups
+++ b/models/player/erebus_lod2.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/gak.iqm b/models/player/gak.iqm
index dccf325..4e2835a 100644
Binary files a/models/player/gak.iqm and b/models/player/gak.iqm differ
diff --git a/models/player/gak.iqm.framegroups b/models/player/gak.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/gak.iqm.framegroups
+++ b/models/player/gak.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/gak_lod1.iqm b/models/player/gak_lod1.iqm
new file mode 100644
index 0000000..7fc4655
Binary files /dev/null and b/models/player/gak_lod1.iqm differ
diff --git a/models/player/gak_lod1.iqm.framegroups b/models/player/gak_lod1.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/gak_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/gak_lod2.iqm b/models/player/gak_lod2.iqm
new file mode 100644
index 0000000..8c35e2c
Binary files /dev/null and b/models/player/gak_lod2.iqm differ
diff --git a/models/player/gak_lod2.iqm.framegroups b/models/player/gak_lod2.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/gak_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/gakarmored.iqm b/models/player/gakarmored.iqm
index c4b574a..168f798 100644
Binary files a/models/player/gakarmored.iqm and b/models/player/gakarmored.iqm differ
diff --git a/models/player/gakarmored.iqm.framegroups b/models/player/gakarmored.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/gakarmored.iqm.framegroups
+++ b/models/player/gakarmored.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/gakarmored_lod1.iqm b/models/player/gakarmored_lod1.iqm
new file mode 100644
index 0000000..5d6d716
Binary files /dev/null and b/models/player/gakarmored_lod1.iqm differ
diff --git a/models/player/gakarmored_lod1.iqm.framegroups b/models/player/gakarmored_lod1.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/gakarmored_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/gakarmored_lod2.iqm b/models/player/gakarmored_lod2.iqm
new file mode 100644
index 0000000..36b6ed9
Binary files /dev/null and b/models/player/gakarmored_lod2.iqm differ
diff --git a/models/player/gakarmored_lod2.iqm.framegroups b/models/player/gakarmored_lod2.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/gakarmored_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/gakmasked.iqm b/models/player/gakmasked.iqm
index 646c628..01864ca 100644
Binary files a/models/player/gakmasked.iqm and b/models/player/gakmasked.iqm differ
diff --git a/models/player/gakmasked.iqm.framegroups b/models/player/gakmasked.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/gakmasked.iqm.framegroups
+++ b/models/player/gakmasked.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/gakmasked_lod1.iqm b/models/player/gakmasked_lod1.iqm
new file mode 100644
index 0000000..e8355c0
Binary files /dev/null and b/models/player/gakmasked_lod1.iqm differ
diff --git a/models/player/gakmasked_lod1.iqm.framegroups b/models/player/gakmasked_lod1.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/gakmasked_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/gakmasked_lod2.iqm b/models/player/gakmasked_lod2.iqm
new file mode 100644
index 0000000..9ea8fd1
Binary files /dev/null and b/models/player/gakmasked_lod2.iqm differ
diff --git a/models/player/gakmasked_lod2.iqm.framegroups b/models/player/gakmasked_lod2.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/gakmasked_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/ignis.iqm b/models/player/ignis.iqm
index 2e47493..2a098f1 100644
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 16b3e92..9dc589e 100644
--- a/models/player/ignis.iqm.framegroups
+++ b/models/player/ignis.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignis_lod1.iqm b/models/player/ignis_lod1.iqm
index 38a6b3b..f53f423 100644
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 16b3e92..9dc589e 100644
--- a/models/player/ignis_lod1.iqm.framegroups
+++ b/models/player/ignis_lod1.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignis_lod2.iqm b/models/player/ignis_lod2.iqm
index ac9a406..0d984b4 100644
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 16b3e92..9dc589e 100644
--- a/models/player/ignis_lod2.iqm.framegroups
+++ b/models/player/ignis_lod2.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignishalfmasked.iqm b/models/player/ignishalfmasked.iqm
index 7f5a512..968f232 100644
Binary files a/models/player/ignishalfmasked.iqm and b/models/player/ignishalfmasked.iqm differ
diff --git a/models/player/ignishalfmasked.iqm.framegroups b/models/player/ignishalfmasked.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/ignishalfmasked.iqm.framegroups
+++ b/models/player/ignishalfmasked.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignishalfmasked_lod1.iqm b/models/player/ignishalfmasked_lod1.iqm
index c3b3fa4..d0c50d1 100644
Binary files a/models/player/ignishalfmasked_lod1.iqm and b/models/player/ignishalfmasked_lod1.iqm differ
diff --git a/models/player/ignishalfmasked_lod1.iqm.framegroups b/models/player/ignishalfmasked_lod1.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/ignishalfmasked_lod1.iqm.framegroups
+++ b/models/player/ignishalfmasked_lod1.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignishalfmasked_lod2.iqm b/models/player/ignishalfmasked_lod2.iqm
index 3ad25e9..069f96c 100644
Binary files a/models/player/ignishalfmasked_lod2.iqm and b/models/player/ignishalfmasked_lod2.iqm differ
diff --git a/models/player/ignishalfmasked_lod2.iqm.framegroups b/models/player/ignishalfmasked_lod2.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/ignishalfmasked_lod2.iqm.framegroups
+++ b/models/player/ignishalfmasked_lod2.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignismasked.iqm b/models/player/ignismasked.iqm
index fbf2b00..15cce9f 100644
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 16b3e92..9dc589e 100644
--- a/models/player/ignismasked.iqm.framegroups
+++ b/models/player/ignismasked.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignismasked_lod1.iqm b/models/player/ignismasked_lod1.iqm
index 44633d5..15c031e 100644
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 16b3e92..9dc589e 100644
--- a/models/player/ignismasked_lod1.iqm.framegroups
+++ b/models/player/ignismasked_lod1.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/ignismasked_lod2.iqm b/models/player/ignismasked_lod2.iqm
index a913231..99e6dec 100644
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 16b3e92..9dc589e 100644
--- a/models/player/ignismasked_lod2.iqm.framegroups
+++ b/models/player/ignismasked_lod2.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/nyx.iqm b/models/player/nyx.iqm
index 505fcb9..88f2a7d 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 16b3e92..9dc589e 100644
--- a/models/player/nyx.iqm.framegroups
+++ b/models/player/nyx.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/nyx_lod1.iqm b/models/player/nyx_lod1.iqm
new file mode 100644
index 0000000..a60e8b2
Binary files /dev/null and b/models/player/nyx_lod1.iqm differ
diff --git a/models/player/nyx_lod1.iqm.framegroups b/models/player/nyx_lod1.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/nyx_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/nyx_lod2.iqm b/models/player/nyx_lod2.iqm
new file mode 100644
index 0000000..57b1773
Binary files /dev/null and b/models/player/nyx_lod2.iqm differ
diff --git a/models/player/nyx_lod2.iqm.framegroups b/models/player/nyx_lod2.iqm.framegroups
new file mode 100644
index 0000000..9dc589e
--- /dev/null
+++ b/models/player/nyx_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 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
diff --git a/models/player/pyria.iqm b/models/player/pyria.iqm
index ef2ef05..d3b7b2d 100644
Binary files a/models/player/pyria.iqm and b/models/player/pyria.iqm differ
diff --git a/models/player/pyria.iqm.framegroups b/models/player/pyria.iqm.framegroups
index a257a24..b3a5c26 100644
--- a/models/player/pyria.iqm.framegroups
+++ b/models/player/pyria.iqm.framegroups
@@ -21,3 +21,4 @@
 339 21 40.000000 1 // forwardleft
 360 21 40.000000 1 // backright
 381 21 40.000000 1 // backleft
+402 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/pyria_lod1.iqm b/models/player/pyria_lod1.iqm
new file mode 100644
index 0000000..dbbeef8
Binary files /dev/null and b/models/player/pyria_lod1.iqm differ
diff --git a/models/player/pyria_lod1.iqm.framegroups b/models/player/pyria_lod1.iqm.framegroups
new file mode 100644
index 0000000..b3a5c26
--- /dev/null
+++ b/models/player/pyria_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 20.000000 0 // dieone
+36 27 20.000000 0 // dietwo
+63 15 15.000000 1 // draw
+78 20 15.000000 1 // duck
+98 11 15.000000 1 // duckwalk
+109 16 15.000000 0 // duckjump
+125 15 5.000000 1 // duckidle
+140 16 5.000000 1 // idle
+156 16 15.000000 0 // jump
+172 15 15.000000 0 // painone
+187 17 15.000000 0 // paintwo
+204 5 15.000000 0 // shoot
+209 21 15.000000 1 // taunt
+230 21 40.000000 1 // run
+251 21 40.000000 1 // runbackwards
+272 21 40.000000 1 // strafeleft
+293 21 40.000000 1 // straferight
+314 2 15.000000 0 // deadone
+316 2 15.000000 0 // deadtwo
+318 21 40.000000 1 // forwardright
+339 21 40.000000 1 // forwardleft
+360 21 40.000000 1 // backright
+381 21 40.000000 1 // backleft
+402 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/pyria_lod2.iqm b/models/player/pyria_lod2.iqm
new file mode 100644
index 0000000..99fcc86
Binary files /dev/null and b/models/player/pyria_lod2.iqm differ
diff --git a/models/player/pyria_lod2.iqm.framegroups b/models/player/pyria_lod2.iqm.framegroups
new file mode 100644
index 0000000..b3a5c26
--- /dev/null
+++ b/models/player/pyria_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 20.000000 0 // dieone
+36 27 20.000000 0 // dietwo
+63 15 15.000000 1 // draw
+78 20 15.000000 1 // duck
+98 11 15.000000 1 // duckwalk
+109 16 15.000000 0 // duckjump
+125 15 5.000000 1 // duckidle
+140 16 5.000000 1 // idle
+156 16 15.000000 0 // jump
+172 15 15.000000 0 // painone
+187 17 15.000000 0 // paintwo
+204 5 15.000000 0 // shoot
+209 21 15.000000 1 // taunt
+230 21 40.000000 1 // run
+251 21 40.000000 1 // runbackwards
+272 21 40.000000 1 // strafeleft
+293 21 40.000000 1 // straferight
+314 2 15.000000 0 // deadone
+316 2 15.000000 0 // deadtwo
+318 21 40.000000 1 // forwardright
+339 21 40.000000 1 // forwardleft
+360 21 40.000000 1 // backright
+381 21 40.000000 1 // backleft
+402 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/seraphina.iqm b/models/player/seraphina.iqm
index 7e6dbc2..17f700e 100644
Binary files a/models/player/seraphina.iqm and b/models/player/seraphina.iqm differ
diff --git a/models/player/seraphina.iqm.framegroups b/models/player/seraphina.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/seraphina.iqm.framegroups
+++ b/models/player/seraphina.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/seraphina_lod1.iqm b/models/player/seraphina_lod1.iqm
index d16f225..692d24b 100644
Binary files a/models/player/seraphina_lod1.iqm and b/models/player/seraphina_lod1.iqm differ
diff --git a/models/player/seraphina_lod1.iqm.framegroups b/models/player/seraphina_lod1.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/seraphina_lod1.iqm.framegroups
+++ b/models/player/seraphina_lod1.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/seraphina_lod2.iqm b/models/player/seraphina_lod2.iqm
index f6ca53a..9624f0c 100644
Binary files a/models/player/seraphina_lod2.iqm and b/models/player/seraphina_lod2.iqm differ
diff --git a/models/player/seraphina_lod2.iqm.framegroups b/models/player/seraphina_lod2.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/seraphina_lod2.iqm.framegroups
+++ b/models/player/seraphina_lod2.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/seraphinamasked.iqm b/models/player/seraphinamasked.iqm
index f65dce6..418aeb7 100644
Binary files a/models/player/seraphinamasked.iqm and b/models/player/seraphinamasked.iqm differ
diff --git a/models/player/seraphinamasked.iqm.framegroups b/models/player/seraphinamasked.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/seraphinamasked.iqm.framegroups
+++ b/models/player/seraphinamasked.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/seraphinamasked_lod1.iqm b/models/player/seraphinamasked_lod1.iqm
index 5a99524..11b115c 100644
Binary files a/models/player/seraphinamasked_lod1.iqm and b/models/player/seraphinamasked_lod1.iqm differ
diff --git a/models/player/seraphinamasked_lod1.iqm.framegroups b/models/player/seraphinamasked_lod1.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/seraphinamasked_lod1.iqm.framegroups
+++ b/models/player/seraphinamasked_lod1.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/seraphinamasked_lod2.iqm b/models/player/seraphinamasked_lod2.iqm
index 927d56c..f4805a5 100644
Binary files a/models/player/seraphinamasked_lod2.iqm and b/models/player/seraphinamasked_lod2.iqm differ
diff --git a/models/player/seraphinamasked_lod2.iqm.framegroups b/models/player/seraphinamasked_lod2.iqm.framegroups
index 16b3e92..9dc589e 100644
--- a/models/player/seraphinamasked_lod2.iqm.framegroups
+++ b/models/player/seraphinamasked_lod2.iqm.framegroups
@@ -21,3 +21,4 @@
 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
diff --git a/models/player/umbra.iqm b/models/player/umbra.iqm
index f43ad67..f876a03 100644
Binary files a/models/player/umbra.iqm and b/models/player/umbra.iqm differ
diff --git a/models/player/umbra.iqm.framegroups b/models/player/umbra.iqm.framegroups
index a257a24..b3a5c26 100644
--- a/models/player/umbra.iqm.framegroups
+++ b/models/player/umbra.iqm.framegroups
@@ -21,3 +21,4 @@
 339 21 40.000000 1 // forwardleft
 360 21 40.000000 1 // backright
 381 21 40.000000 1 // backleft
+402 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/umbra_lod1.iqm b/models/player/umbra_lod1.iqm
new file mode 100644
index 0000000..e32fa7b
Binary files /dev/null and b/models/player/umbra_lod1.iqm differ
diff --git a/models/player/umbra_lod1.iqm.framegroups b/models/player/umbra_lod1.iqm.framegroups
new file mode 100644
index 0000000..b3a5c26
--- /dev/null
+++ b/models/player/umbra_lod1.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 20.000000 0 // dieone
+36 27 20.000000 0 // dietwo
+63 15 15.000000 1 // draw
+78 20 15.000000 1 // duck
+98 11 15.000000 1 // duckwalk
+109 16 15.000000 0 // duckjump
+125 15 5.000000 1 // duckidle
+140 16 5.000000 1 // idle
+156 16 15.000000 0 // jump
+172 15 15.000000 0 // painone
+187 17 15.000000 0 // paintwo
+204 5 15.000000 0 // shoot
+209 21 15.000000 1 // taunt
+230 21 40.000000 1 // run
+251 21 40.000000 1 // runbackwards
+272 21 40.000000 1 // strafeleft
+293 21 40.000000 1 // straferight
+314 2 15.000000 0 // deadone
+316 2 15.000000 0 // deadtwo
+318 21 40.000000 1 // forwardright
+339 21 40.000000 1 // forwardleft
+360 21 40.000000 1 // backright
+381 21 40.000000 1 // backleft
+402 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/models/player/umbra_lod2.iqm b/models/player/umbra_lod2.iqm
new file mode 100644
index 0000000..e283e9c
Binary files /dev/null and b/models/player/umbra_lod2.iqm differ
diff --git a/models/player/umbra_lod2.iqm.framegroups b/models/player/umbra_lod2.iqm.framegroups
new file mode 100644
index 0000000..b3a5c26
--- /dev/null
+++ b/models/player/umbra_lod2.iqm.framegroups
@@ -0,0 +1,24 @@
+0 36 20.000000 0 // dieone
+36 27 20.000000 0 // dietwo
+63 15 15.000000 1 // draw
+78 20 15.000000 1 // duck
+98 11 15.000000 1 // duckwalk
+109 16 15.000000 0 // duckjump
+125 15 5.000000 1 // duckidle
+140 16 5.000000 1 // idle
+156 16 15.000000 0 // jump
+172 15 15.000000 0 // painone
+187 17 15.000000 0 // paintwo
+204 5 15.000000 0 // shoot
+209 21 15.000000 1 // taunt
+230 21 40.000000 1 // run
+251 21 40.000000 1 // runbackwards
+272 21 40.000000 1 // strafeleft
+293 21 40.000000 1 // straferight
+314 2 15.000000 0 // deadone
+316 2 15.000000 0 // deadtwo
+318 21 40.000000 1 // forwardright
+339 21 40.000000 1 // forwardleft
+360 21 40.000000 1 // backright
+381 21 40.000000 1 // backleft
+402 21 20.000000 0 // melee
\ No newline at end of file
diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 3426c4c..a8a7522 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -188,6 +188,7 @@ void player_setupanimsformodel()
     self.anim_forwardleft = '20 1 1';
     self.anim_backright = '21 1 1';
     self.anim_backleft  = '22 1 1';
+    self.anim_melee = '23 1 1';
     animparseerror = FALSE;
     animfilename = strcat(self.model, ".animinfo");
     animfile = fopen(animfilename, FILE_READ);
@@ -214,6 +215,7 @@ void player_setupanimsformodel()
         self.anim_forwardleft  = animparseline(animfile);
         self.anim_backright    = animparseline(animfile);
         self.anim_backleft     = animparseline(animfile);
+        self.anim_melee           = animparseline(animfile);
         fclose(animfile);

         // derived anims
diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc
index f954378..1ac1f78 100644
--- a/qcsrc/server/cl_weaponsystem.qc
+++ b/qcsrc/server/cl_weaponsystem.qc
@@ -1258,6 +1258,9 @@ void weapon_thinkf(float fr, float t, void() func)
     if (!self.crouch) // shoot anim stands up, this looks bad
     {
         local vector anim;
+        if(self.weapon == WEP_SHOTGUN && self.BUTTON_ATCK2)
+            anim = self.anim_melee;
+        else
         anim = self.anim_shoot;
         anim_z = anim_y / (t + sys_frametime);
         setanim(self, anim, FALSE, TRUE, TRUE);
diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 2090c22..f6ddad2 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -148,6 +148,7 @@ float maxclients;
 .vector anim_forwardleft; // player running forward and left
 .vector anim_backright; // player running backward and right
 .vector anim_backleft; // player running back and left
+.vector anim_melee; // player doing the melee action

 // weapon animation vectors:
 .vector anim_fire1;
diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 6f82fa1..00f0470 100644
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -10,7 +10,7 @@ Jakob "tZork" Markström Gröhn
 **Coordinators

 *Art
-Diabolik a.k.a Dib
+Sahil "DiaboliK" Singhal

 *2D Art / Web
 Tyler "-z-" Mulligan (web / game)
@@ -23,6 +23,10 @@ morphed
 LJFHutch
 Pearce "theShadow" Michal

+*Animation
+Sahil "DiaboliK" Singhal
+nifrek
+
 *Level Design
 FruitieX
 MirceaKitsune

History

#1 Updated by DiaboliK about 3 years ago

This has been tested by myself so far. They work on all models and now all models have lods as well.

#2 Updated by merlijn about 3 years ago

  • Status changed from New to Closed

Tested and looks awesome - merged and thanks!

Also available in: Atom PDF