]> 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 (from parent 1: 159ed06)
Merge commit 'ceb1f044b89ba79c6f5f431cd43ebcfa431486eb' (C.Brutail's launchpad fixes)
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 16 Nov 2010 08:45:36 +0000 (09:45 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 16 Nov 2010 08:45:37 +0000 (09:45 +0100)
models/xonotic_jumppad01/jumppad2lod_blue_glow.tga [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/jumppad2lod_red_glow.tga [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/launchpad2lod_blue.tga patch | blob | history
models/xonotic_jumppad01/launchpad2lod_blue_glow.tga [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/launchpad2lod_red.tga patch | blob | history
models/xonotic_jumppad01/launchpad2lod_red_glow.tga [new file with mode: 0644] patch | blob
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin patch | blob | history
models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin patch | blob | history

diff --git a/models/xonotic_jumppad01/jumppad2lod_blue_glow.tga b/models/xonotic_jumppad01/jumppad2lod_blue_glow.tga
new file mode 100644 (file)
index 0000000..2417f34
Binary files /dev/null and b/models/xonotic_jumppad01/jumppad2lod_blue_glow.tga differ
diff --git a/models/xonotic_jumppad01/jumppad2lod_red_glow.tga b/models/xonotic_jumppad01/jumppad2lod_red_glow.tga
new file mode 100644 (file)
index 0000000..9a83ff3
Binary files /dev/null and b/models/xonotic_jumppad01/jumppad2lod_red_glow.tga differ
diff --git a/models/xonotic_jumppad01/launchpad2lod_blue.tga b/models/xonotic_jumppad01/launchpad2lod_blue.tga
index 006689b2656d3b932c805977268bb480174fcd32..4dd3cce3a0fccdd596f79f519e2722e268384766 100644 (file)
Binary files a/models/xonotic_jumppad01/launchpad2lod_blue.tga and b/models/xonotic_jumppad01/launchpad2lod_blue.tga differ
diff --git a/models/xonotic_jumppad01/launchpad2lod_blue_glow.tga b/models/xonotic_jumppad01/launchpad2lod_blue_glow.tga
new file mode 100644 (file)
index 0000000..781668e
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_blue_glow.tga differ
diff --git a/models/xonotic_jumppad01/launchpad2lod_red.tga b/models/xonotic_jumppad01/launchpad2lod_red.tga
index 4bfc667afdee7a6054722c5e61407710cad95f40..f98671786784d7a63a990d0fd85725fee83c6a77 100644 (file)
Binary files a/models/xonotic_jumppad01/launchpad2lod_red.tga and b/models/xonotic_jumppad01/launchpad2lod_red.tga differ
diff --git a/models/xonotic_jumppad01/launchpad2lod_red_glow.tga b/models/xonotic_jumppad01/launchpad2lod_red_glow.tga
new file mode 100644 (file)
index 0000000..94e7ed2
Binary files /dev/null and b/models/xonotic_jumppad01/launchpad2lod_red_glow.tga differ
diff --git a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
index 616d31a4379468a7868f88a738dfa6e3aa7919e7..18ae4dca85a97e3659a56d00660975c290d0e84b 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_0.skin
@@ -1 +1,2 @@
+mesh,models/xonotic_jumppad01/launchpad2lod_red
 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
index 290120ba7282611d6e34d2938587fe860b96077f..3abdf50a497a36d56afe7c1a294acf7a3352395a 100644 (file)
--- a/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
+++ b/models/xonotic_jumppad01/xonotic_launchpad01_lod1.md3_1.skin
@@ -1 +1,2 @@
+mesh,models/xonotic_jumppad01/launchpad2lod_blue
 mesh2,models/xonotic_jumppad01/launchpad2lod_blue