Merge in xonotic/mediasource.git: mirceakitsune/shotgun_cannon
git-manager created issue #837 on 2011-11-26T22:28:17Z:
Purpose of the branch:
Source for mirceakitsune/shotgun_cannon, http://dev.xonotic.org/issues/836
I completed the shotgun cannon today, and added all the detail I could. As far as I can tell, this model is of good quality and should match the standards a weapon model would require. Screenshots and a video of it can be seen in this post: http://forums.xonotic.org/showthread.php?tid=69&pid=31772#pid31772
If there are any cons to this model, I would appreciate it if people could point out what needs be changed instead of rejecting it because "it doesn't fit in and it looks like a hairdrier". I believe this model fits Xonotic very well, is appropriate for a shotgun (not another weapon) and it looks much better than the old shotgun. It's also been too long since we haven't had a new weapon model IMHO. Also, please note I edited and finalized the model and texture after the author posted the original WIP, so I can only do minor chances at this point.
Repository: xonotic/mediasource.git Commit: c8069f92 Branch: mirceakitsune/shotgun_cannon
Merge commands:
cd mediasource
git checkout master
git reset --hard origin/master
git pull && git diff 'c8069f92c5246b2c2ef9c06c90c22e5ccb98d68d'..'origin/mirceakitsune/shotgun_cannon'
# 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/mirceakitsune/shotgun_cannon'
# 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 'mirceakitsune/shotgun_cannon'
Diffstat:
models/weapons/g_weapons/g_shotgun.blend | Bin 0 -> 564020 bytes
models/weapons/modelsource-shotgun.zip | Bin 25951 -> 0 bytes
models/weapons/v_weapons/v_shotgun.blend | Bin 420688 -> 482060 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
Revision log:
commit c8069f92c5246b2c2ef9c06c90c22e5ccb98d68d
Author: MirceaKitsune
Commit: MirceaKitsune
Delete modelsource-shotgun, as it addresses the old shotgun
commit 67cb9770e8b503990e44c383bb610384f60dfaf5
Author: MirceaKitsune
Commit: MirceaKitsune
Keep the h_shotgun from the previous model, as it only contains the proper animations
commit 3dacb02d86681766ce78fec36d00395b540103e7
Author: MirceaKitsune
Commit: MirceaKitsune
Correct a small UV mapping problem on the mesh
commit 25c6222eab84445db52b2d5c369babab94d64c97
Author: MirceaKitsune
Commit: MirceaKitsune
Update the shotgun sources to Blender 2.5 and re-export the md3's. This also fixes cubemap reflections and gets them working at last.
commit 174a829d2adc937ed7b48418c4f13eb95bc95669
Merge: 4d088d7 bf001fc
Author: MirceaKitsune
Commit: MirceaKitsune
Merge branch 'master' into mirceakitsune/shotgun_cannon
commit 4d088d7f5d0ca350a1b0cb0602718a6a08f0c3e6
Author: ssinghal
Commit: ssinghal
Give shotgun cannon a better position/rig
commit 3b3fd551083c08fb26c38b6425a653628f169c63
Author: MirceaKitsune
Commit: MirceaKitsune
Better UV mapping in some areas
commit 5fd7a18ad455c0ee202ea2771ae4f1cea5dd8f23
Author: MirceaKitsune
Commit: MirceaKitsune
Sources for the Shotgun Cannon model
User agreed to the GPLv2+.
Diff:
diff --git a/models/weapons/g_weapons/g_shotgun.blend b/models/weapons/g_weapons/g_shotgun.blend
new file mode 100644
index 0000000..bb43354
Binary files /dev/null and b/models/weapons/g_weapons/g_shotgun.blend differ
diff --git a/models/weapons/modelsource-shotgun.zip b/models/weapons/modelsource-shotgun.zip
deleted file mode 100644
index 5169219..0000000
Binary files a/models/weapons/modelsource-shotgun.zip and /dev/null differ
diff --git a/models/weapons/v_weapons/v_shotgun.blend b/models/weapons/v_weapons/v_shotgun.blend
index b28a266..58b63fc 100644
Binary files a/models/weapons/v_weapons/v_shotgun.blend and b/models/weapons/v_weapons/v_shotgun.blend differ