antc13 c690e1fb53 Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets ...

# Conflicts:
#	Models/Effects/CylinderShot.mesh
#	Models/Effects/CylinderShot.mtrl

2016-02-10 21:18:28 +01:00

..

CylinderShot.mesh

New Cylinder/Sphere Shot

2016-02-10 21:14:44 +01:00

CylinderShot.mtrl

New Cylinder/Sphere Shot

2016-02-10 21:14:44 +01:00

JumpEffectHexagon.mesh

New exports

2016-02-08 15:50:52 +01:00

JumpEffectHexagon.mtrl

New exports

2016-02-08 15:50:52 +01:00