From: Mario Date: Fri, 24 Jun 2016 01:07:52 +0000 (+1000) Subject: Restore a legacy branch (not currently working) X-Git-Tag: xonotic-v0.8.2~700^2~118^2~1 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=1df52861c202eb40e699caf06ff66a309f20b6b5;p=xonotic%2Fxonotic-data.pk3dir.git Restore a legacy branch (not currently working) --- diff --git a/models/weapons/g_fireball.md3 b/models/weapons/g_fireball.md3 index c95342672..b1463090f 100644 Binary files a/models/weapons/g_fireball.md3 and b/models/weapons/g_fireball.md3 differ diff --git a/models/weapons/h_fireball.iqm b/models/weapons/h_fireball.iqm index 40a6b06a8..3a9db00ce 100644 Binary files a/models/weapons/h_fireball.iqm and b/models/weapons/h_fireball.iqm differ diff --git a/models/weapons/v_fireball.md3 b/models/weapons/v_fireball.md3 index a5e847c37..18fbf7489 100644 Binary files a/models/weapons/v_fireball.md3 and b/models/weapons/v_fireball.md3 differ diff --git a/scripts/fireball.shader b/scripts/fireball.shader index 822be77f7..8df3e2a55 100644 --- a/scripts/fireball.shader +++ b/scripts/fireball.shader @@ -1,10 +1,7 @@ -fireball +fireball_plasma { - { - map textures/fireball - tcgen environment - } - { - map $lightmap - } + { + map textures/fireball_plasma.tga + tcMod scroll 0.03 0.001 + } } diff --git a/textures/fireball.tga b/textures/fireball.tga index 53b47a192..6900c40cb 100644 Binary files a/textures/fireball.tga and b/textures/fireball.tga differ diff --git a/textures/fireball_gloss.tga b/textures/fireball_gloss.tga index 8cd8b25bd..eaf50d0a2 100644 Binary files a/textures/fireball_gloss.tga and b/textures/fireball_gloss.tga differ diff --git a/textures/fireball_glow.tga b/textures/fireball_glow.tga index c949f92a4..358784d8f 100644 Binary files a/textures/fireball_glow.tga and b/textures/fireball_glow.tga differ diff --git a/textures/fireball_norm.tga b/textures/fireball_norm.tga new file mode 100644 index 000000000..b0bd3f93c Binary files /dev/null and b/textures/fireball_norm.tga differ diff --git a/textures/fireball_pants.tga b/textures/fireball_pants.tga new file mode 100644 index 000000000..2fbc09a4e Binary files /dev/null and b/textures/fireball_pants.tga differ diff --git a/textures/fireball_shirt.tga b/textures/fireball_shirt.tga new file mode 100644 index 000000000..3d9391683 Binary files /dev/null and b/textures/fireball_shirt.tga differ