Merge remote branch 'origin/fruitiex/jumppadlod'

diff --git a/models/xonotic_jumppad01/jumppad2lod_blue.tga b/models/xonotic_jumppad01/jumppad2lod_blue.tga
new file mode 100644 (file)
index 0000000..428364e
Binary files /dev/null and b/models/xonotic_jumppad01/jumppad2lod_blue.tga differ

diff --git a/models/xonotic_jumppad01/jumppad2lod_red.tga b/models/xonotic_jumppad01/jumppad2lod_red.tga
new file mode 100644 (file)
index 0000000..cc32939
Binary files /dev/null and b/models/xonotic_jumppad01/jumppad2lod_red.tga differ

diff --git a/models/xonotic_jumppad01/launchpad2lod_blue.tga b/models/xonotic_jumppad01/launchpad2lod_blue.tga
new file mode 100644 (file)
index 0000000..006689b
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_blue.tga differ

diff --git a/models/xonotic_jumppad01/launchpad2lod_red.tga b/models/xonotic_jumppad01/launchpad2lod_red.tga
new file mode 100644 (file)
index 0000000..4bfc667
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_red.tga differ

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3 b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3
new file mode 100644 (file)
index 0000000..3f8b3b8
Binary files /dev/null and b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3 differ

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_0.skin b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_0.skin
new file mode 100644 (file)
index 0000000..fe0b242
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_0.skin
@@ -0,0 +1 @@
+mesh,models/xonotic_jumppad01/jumppad2lod_red

diff --git a/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_1.skin b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_1.skin
new file mode 100644 (file)
index 0000000..17bc683
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_jumppad01_lod1.md3_1.skin
@@ -0,0 +1 @@
+mesh,models/xonotic_jumppad01/jumppad2lod_blue

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3 b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3
new file mode 100644 (file)
index 0000000..0d9d859
Binary files /dev/null and b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3 differ

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
new file mode 100644 (file)
index 0000000..616d31a
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
@@ -0,0 +1 @@
+mesh2,models/xonotic_jumppad01/launchpad2lod_red

diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
new file mode 100644 (file)
index 0000000..290120b
--- /dev/null
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
@@ -0,0 +1 @@
+mesh2,models/xonotic_jumppad01/launchpad2lod_blue