]> de.git.xonotic.org Git - xonotic/mediasource.git/commitdiff
Merge branch 'LegendaryGuard/rename-v_shotgun-to-v_arc' into 'master'
authorterencehill <piuntn@gmail.com>
Thu, 7 Apr 2022 12:45:48 +0000 (12:45 +0000)
committerterencehill <piuntn@gmail.com>
Thu, 7 Apr 2022 12:45:48 +0000 (12:45 +0000)
Rename shotgun models to arc

Closes #18

See merge request xonotic/mediasource!23

models/weapons/g_weapons/g_arc.blend [new file with mode: 0644]
models/weapons/g_weapons/g_shotgun.blend [deleted file]
models/weapons/h_weapons/blend/h_arc.blend [new file with mode: 0644]
models/weapons/h_weapons/blend/h_shotgun.blend [deleted file]
models/weapons/v_weapons/v_arc.blend [new file with mode: 0644]
models/weapons/v_weapons/v_shotgun.blend [deleted file]

diff --git a/models/weapons/g_weapons/g_arc.blend b/models/weapons/g_weapons/g_arc.blend
new file mode 100644 (file)
index 0000000..bb43354
Binary files /dev/null and b/models/weapons/g_weapons/g_arc.blend differ
diff --git a/models/weapons/g_weapons/g_shotgun.blend b/models/weapons/g_weapons/g_shotgun.blend
deleted file mode 100644 (file)
index bb43354..0000000
Binary files a/models/weapons/g_weapons/g_shotgun.blend and /dev/null differ
diff --git a/models/weapons/h_weapons/blend/h_arc.blend b/models/weapons/h_weapons/blend/h_arc.blend
new file mode 100644 (file)
index 0000000..8cad239
Binary files /dev/null and b/models/weapons/h_weapons/blend/h_arc.blend differ
diff --git a/models/weapons/h_weapons/blend/h_shotgun.blend b/models/weapons/h_weapons/blend/h_shotgun.blend
deleted file mode 100644 (file)
index 8cad239..0000000
Binary files a/models/weapons/h_weapons/blend/h_shotgun.blend and /dev/null differ
diff --git a/models/weapons/v_weapons/v_arc.blend b/models/weapons/v_weapons/v_arc.blend
new file mode 100644 (file)
index 0000000..58b63fc
Binary files /dev/null and b/models/weapons/v_weapons/v_arc.blend differ
diff --git a/models/weapons/v_weapons/v_shotgun.blend b/models/weapons/v_weapons/v_shotgun.blend
deleted file mode 100644 (file)
index 58b63fc..0000000
Binary files a/models/weapons/v_weapons/v_shotgun.blend and /dev/null differ