Merge in xonotic/mediasource.git: nifrek/playermodels_sources
git-manager created issue #974 on 2012-01-06T14:32:35Z:
Purpose of the branch:
Up to date player models source. If you're wondering why the deletions, it's simply that Ignis variations (regular/masked/halfmasked) are in the same .blend as the only difference is the head (which is a seperate object), so you just select which head you want when exporting. Same for Seraphina (regular/masked). Also added some notes for IQM exporting.
Repository: xonotic/mediasource.git Commit: 19fc6886 Branch: nifrek/playermodels_sources
Merge commands:
cd mediasource
git checkout master
git reset --hard origin/master
git pull && git diff '19fc68867d0c69c1c0633b4c74d1416f0c497e7a'..'origin/nifrek/playermodels_sources'
# 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/nifrek/playermodels_sources'
# 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 'nifrek/playermodels_sources'
Diffstat:
models/player/IQMexporting_notes.txt | 8 ++++++++
models/player/erebus.blend | Bin 3016236 -> 3454456 bytes
models/player/gak.blend | Bin 3816060 -> 3371072 bytes
models/player/gakarmored.blend | Bin 3790544 -> 3406540 bytes
models/player/gakmasked.blend | Bin 3758044 -> 3374040 bytes
models/player/ignis-all.blend | Bin 0 -> 3957724 bytes
models/player/ignis.blend | Bin 3280364 -> 0 bytes
models/player/ignishalfmasked.blend | Bin 3223536 -> 0 bytes
models/player/ignismasked.blend | Bin 3032568 -> 0 bytes
models/player/megaerebus.blend | Bin 5223208 -> 3549264 bytes
models/player/nyx.blend | Bin 3464076 -> 3446156 bytes
models/player/pyria.blend | Bin 3106792 -> 2925124 bytes
models/player/seraphina-all.blend | Bin 0 -> 3608428 bytes
models/player/seraphina.blend | Bin 3480584 -> 0 bytes
models/player/seraphinamasked.blend | Bin 3358060 -> 0 bytes
models/player/umbra.blend | Bin 2916740 -> 2735072 bytes
16 files changed, 8 insertions(+), 0 deletions(-)
Revision log:
commit 19fc68867d0c69c1c0633b4c74d1416f0c497e7a
Author: nifrek
Commit: nifrek
add some notes for IQM exporting
commit b1b51a7e961b23a9e574af51d07c99e2273f5bf5
Author: nifrek
Commit: nifrek
oops, remove duplicates
commit 16659eb675e500aac58977949d7276ff013d21bc
Author: nifrek
Commit: nifrek
playermodels sources, ignis variations are in the same .blend, same for seraphina, just select the head you want when exporting
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/models/player/IQMexporting\_notes.txt b/models/player/IQMexporting\_notes.txt
new file mode 100644
index 0000000..53a04fc
— /dev/null
**+ b/models/player/IQMexporting\_notes.txt
@ -0,0 +1,8
@
*Last updated January 6th, 2012 by nifrek.
*PLEASE UPDATE THIS FILE IF YOU ADD/REMOVE/RENAME ANIMATIONS.
*
*Here is the list of all current animations that you can paste directly in Blender IQM export dialog in “Animations” box:
*
*dieone,dietwo,draw,duck,duckwalk,duckjump,duckidle,idle,jump,fly,painone,paintwo,shoot,taunt,run,runbackwards,strafeleft,straferight,deadone,deadtwo,forwardright,forwardleft,backright,backleft,melee,duckwalkbackwards,duckstrafeleft,duckstraferight,duckforwardright,duckwalkforwardleft,duckbackwardright,duckbackwardleft
*
+Note that “fly” is appended to “jump” thru .framegroups as one long jump animation, if you omit to export it, you will need to fix frame numbers in .framegroups
No newline at end of file
diff —git a/models/player/erebus.blend b/models/player/erebus.blend
index eb462db..70d1b85 100644
Binary files a/models/player/erebus.blend and b/models/player/erebus.blend differ
diff —git a/models/player/gak.blend b/models/player/gak.blend
index 7455418..e0c2e96 100644
Binary files a/models/player/gak.blend and b/models/player/gak.blend differ
diff —git a/models/player/gakarmored.blend b/models/player/gakarmored.blend
index cab5a6d..4f0dc14 100644
Binary files a/models/player/gakarmored.blend and b/models/player/gakarmored.blend differ
diff —git a/models/player/gakmasked.blend b/models/player/gakmasked.blend
index ba1a44a..9879d28 100644
Binary files a/models/player/gakmasked.blend and b/models/player/gakmasked.blend differ
diff —git a/models/player/ignis-all.blend b/models/player/ignis-all.blend
new file mode 100644
index 0000000..50130ba
Binary files /dev/null and b/models/player/ignis-all.blend differ
diff —git a/models/player/ignis.blend b/models/player/ignis.blend
deleted file mode 100644
index c2d7b3a..0000000
Binary files a/models/player/ignis.blend and /dev/null differ
diff —git a/models/player/ignishalfmasked.blend b/models/player/ignishalfmasked.blend
deleted file mode 100644
index 0fbeeb3..0000000
Binary files a/models/player/ignishalfmasked.blend and /dev/null differ
diff —git a/models/player/ignismasked.blend b/models/player/ignismasked.blend
deleted file mode 100644
index 6733bf5..0000000
Binary files a/models/player/ignismasked.blend and /dev/null differ
diff —git a/models/player/megaerebus.blend b/models/player/megaerebus.blend
index 19436e8..24d438c 100644
Binary files a/models/player/megaerebus.blend and b/models/player/megaerebus.blend differ
diff —git a/models/player/nyx.blend b/models/player/nyx.blend
index f705769..e268e84 100644
Binary files a/models/player/nyx.blend and b/models/player/nyx.blend differ
diff —git a/models/player/pyria.blend b/models/player/pyria.blend
index 4f60e2b..9946a12 100644
Binary files a/models/player/pyria.blend and b/models/player/pyria.blend differ
diff —git a/models/player/seraphina-all.blend b/models/player/seraphina-all.blend
new file mode 100644
index 0000000..d80e7ea
Binary files /dev/null and b/models/player/seraphina-all.blend differ
diff —git a/models/player/seraphina.blend b/models/player/seraphina.blend
deleted file mode 100644
index ae5d5fa..0000000
Binary files a/models/player/seraphina.blend and /dev/null differ
diff —git a/models/player/seraphinamasked.blend b/models/player/seraphinamasked.blend
deleted file mode 100644
index 01b2478..0000000
Binary files a/models/player/seraphinamasked.blend and /dev/null differ
diff —git a/models/player/umbra.blend b/models/player/umbra.blend
index 7a09d38..ab5a010 100644
Binary files a/models/player/umbra.blend and b/models/player/umbra.blend differ