Merge branch 'mirceakitsune/shotgun_cannon' into 'master'

Merge branch mirceakitsune/shotgun_cannon (M merge request)

The original model was merged with a colour swap as the Arc weapon model.

See merge request !9

diff --git a/models/weapons/g_weapons/g_shotgun.blend b/models/weapons/g_weapons/g_shotgun.blend
new file mode 100644 (file)
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 (file)
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 b28a26620427674bfe8788d6bd883e8cfad09928..58b63fc9919ec5c98c7f0de1d6f932c6488ce125 100644 (file)
Binary files a/models/weapons/v_weapons/v_shotgun.blend and b/models/weapons/v_weapons/v_shotgun.blend differ