]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 1e0c412)
Fix an inconsistency with jumppad LOD skins
authorMario <mario@smbclan.net>
Tue, 16 Oct 2018 19:29:29 +0000 (05:29 +1000)
committerMario <mario@smbclan.net>
Tue, 16 Oct 2018 19:29:29 +0000 (05:29 +1000)
models/xonotic_jumppad01/launchpad2lod_orange.tga [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/launchpad2lod_orange_glow.tga [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_4.skin patch | blob | history
models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_5.skin [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_4.skin patch | blob | history
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_5.skin [new file with mode: 0644] patch | blob

diff --git a/models/xonotic_jumppad01/launchpad2lod_orange.tga b/models/xonotic_jumppad01/launchpad2lod_orange.tga
new file mode 100644 (file)
index 0000000..f196cbd
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_orange.tga differ
diff --git a/models/xonotic_jumppad01/launchpad2lod_orange_glow.tga b/models/xonotic_jumppad01/launchpad2lod_orange_glow.tga
new file mode 100644 (file)
index 0000000..857ce34
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_orange_glow.tga differ
diff --git a/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_4.skin b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_4.skin
index 6855e0fa47d60038e7dc3515b6d1b89ec989ebc8..3cc126c8e2dd5af9fd95629a5ba835472b589666 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_4.skin
+++ b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_4.skin
@@ -1 +1 @@
-mesh,models/xonotic_jumppad01/jumppad2lod_purple
+mesh,models/xonotic_jumppad01/jumppad2lod_orange
diff --git a/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_5.skin b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_5.skin
new file mode 100644 (file)
index 0000000..6855e0f
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_5.skin
@@ -0,0 +1 @@
+mesh,models/xonotic_jumppad01/jumppad2lod_purple
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_4.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_4.skin
index 56cbeba431972e112b3dade3e23485803fb9af7b..89d808e4de23b69d496db8a02d9e696ee1930b11 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_4.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_4.skin
@@ -1,2 +1,2 @@
-mesh,models/xonotic_jumppad01/launchpad2lod_purple
-mesh2,models/xonotic_jumppad01/launchpad2lod_purple
+mesh,models/xonotic_jumppad01/launchpad2lod_orange
+mesh2,models/xonotic_jumppad01/launchpad2lod_orange
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_5.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_5.skin
new file mode 100644 (file)
index 0000000..56cbeba
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_5.skin
@@ -0,0 +1,2 @@
+mesh,models/xonotic_jumppad01/launchpad2lod_purple
+mesh2,models/xonotic_jumppad01/launchpad2lod_purple