Merge in xonotic/xonotic-data.pk3dir.git: morphed/laserfix
git-manager created issue #1093 (closed) on 2012-03-02T20:29:32Z:
Purpose of the branch:
fix centered mode for laser
Repository: xonotic/xonotic-data.pk3dir.git Commit: 9bf6ba1f Branch: morphed/laserfix
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '9bf6ba1fc66de6b8fe2e8c2a6d1f6f5384720eed'..'origin/morphed/laserfix'
# 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/morphed/laserfix'
# 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 'morphed/laserfix'
Diffstat:
models/weapons/h_laser.iqm | Bin 10992 -> 426172 bytes
models/weapons/h_laser.iqm.framegroups | 14 ++++++++++----
scripts/weapons.shader | 10 ++++++++++
3 files changed, 20 insertions(+), 4 deletions(-)
Revision log:
commit 9bf6ba1fc66de6b8fe2e8c2a6d1f6f5384720eed
Author: Morphed
Commit: Morphed
I remade first person laser animations and its now centered when player wants it
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
index 25fefca..f2ef536 100644
Binary files a/models/weapons/h_laser.iqm and b/models/weapons/h_laser.iqm differ
diff —git a/models/weapons/h_laser.iqm.framegroups b/models/weapons/h_laser.iqm.framegroups
index 0a59625..5b1ac99 100644
— a/models/weapons/h_laser.iqm.framegroups
**+ b/models/weapons/h_laser.iqm.framegroups
@ -1,4 +1,10
@
~~1 8 20 0 // fire
~~9 5 20 0 // fire2
~~15 200 20 1 // idle
~~215 40 20 0 // reload
*/*
*Generated framegroups file for h_laser
*Used by DarkPlaces to simulate frame groups in DPM models.
**/
*
*1 16 30 0 // h_laser mgafire
*17 16 30 0 // h_laser mgafire
*33 101 5 1 // h_laser mgaidle
*134 61 30 1 // h_laser mgareload
*195 61 30 1 // h_laser mgamelee
diff —git a/scripts/weapons.shader b/scripts/weapons.shader
index 5a2532e..dfbbd5e 100644
— a/scripts/weapons.shader
**+ b/scripts/weapons.shader
@ -65,6 +65,16
@ rl
models/weapons/laser
{
dpreflectcube cubemaps/default/sky
- dpoffsetmapping - 0.25 match8 128
- {
- map models/weapons/laser.tga
- rgbgen lightingDiffuse
- } *} *laser *{
- dpreflectcube cubemaps/default/sky
- dpoffsetmapping - 0.25 match8 128 { map models/weapons/laser.tga rgbgen lightingDiffuse