Skip to content
This repository has been archived by the owner on Oct 29, 2021. It is now read-only.

Commit

Permalink
Merge pull request #28 from kfredfox/master
Browse files Browse the repository at this point in the history 
Mac10 remake
  • Loading branch information
@david-wm-sanders
david-wm-sanders authored Apr 29, 2021
2 parents 05e29f5 + a9ce5dd commit aa95e57
Show file tree
Hide file tree
Showing 13 changed files with 318 additions and 293 deletions.
240 changes: 129 additions & 111 deletions models/Mac10.xml
View file

Large diffs are not rendered by default.

144 changes: 0 additions & 144 deletions models/Mac10_bayonet.xml
View file

This file was deleted.

155 changes: 155 additions & 0 deletions models/mac10sd.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
<model>
<voxels>
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="1" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="0" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-15" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-14" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-13" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="1" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="2" z="1" />
<voxel a="1.0" b="0.9294" g="0.9294" r="0.9294" x="-11" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-13" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-14" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-11" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-8" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-12" y="2" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-6" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-6" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-6" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-4" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-5" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-4" z="3" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-6" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-4" z="3" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-5" z="3" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-13" y="5" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-7" y="2" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-5" z="3" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-12" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-15" y="3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-17" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="3" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="0" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="2" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-7" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-8" y="3" z="1" />
<voxel a="1.0" b="0.9294" g="0.9294" r="0.9294" x="-9" y="3" z="1" />
<voxel a="1.0" b="0.9294" g="0.9294" r="0.9294" x="-10" y="3" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="-1" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="-1" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-16" y="1" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-7" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-11" y="0" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-2" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-2" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-4" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-4" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-5" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-5" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-3" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-3" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-3" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-3" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-4" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-4" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-4" z="-1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-4" z="-1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-5" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-5" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-9" y="-5" z="-1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-5" z="-1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-4" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-5" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-6" z="0" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-10" y="-6" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-7" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-15" y="5" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-8" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-12" y="1" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-8" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-11" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-12" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-13" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-14" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-15" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-15" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-14" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-13" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-12" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-11" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-9" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-8" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-7" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-15" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-14" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-13" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-12" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-11" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-10" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="3" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="4" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="5" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="5" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="3" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="4" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-6" y="5" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-5" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-4" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-3" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-2" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-1" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-5" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-4" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-3" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-2" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="-1" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="4" z="1" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="0" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="1" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="2" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="3" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="1" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="0" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="1" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="2" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="3" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="1" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="2" z="2" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="2" z="0" />
<voxel a="1.0" b="0.2196" g="0.3137" r="0.302" x="4" y="3" z="2" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-16" y="3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-18" y="3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-16" y="2" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-17" y="2" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-19" y="3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-18" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-20" y="3" z="1" />
<voxel a="1.0" b="0.1451" g="0.1569" r="0.1765" x="-19" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-21" y="3" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-20" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-22" y="3" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-21" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-22" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-23" y="3" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-23" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-24" y="3" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-24" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-25" y="3" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-25" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-26" y="2" z="1" />
<voxel a="1.0" b="0.1255" g="0.1333" r="0.149" x="-26" y="3" z="1" />
</voxels>
<skeleton />
<skeletonVoxelBindings />
</model>
Binary file modified sounds/Mac10_shot.wav
View file
Binary file not shown.
Binary file added sounds/mac10sd_shot.wav
View file
Binary file not shown.
Binary file modified textures/hud_Mac10.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed textures/hud_Mac10_bayonet.png
View file
Binary file not shown.
Binary file added textures/hud_mac10_30rnd.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added textures/hud_mac10sd.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added textures/hud_mac10sd_30rnd.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit aa95e57

Please sign in to comment.