From: nifrek Date: Thu, 17 May 2012 17:07:24 +0000 (-0400) Subject: Add shaders for all items, add placeholder models and icons for most items X-Git-Tag: xonotic-v0.7.0~312^2~41 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f6d1aa2bb2a2026299341daff4a634ff4b2b7c0;p=xonotic%2Fxonotic-data.pk3dir.git Add shaders for all items, add placeholder models and icons for most items --- diff --git a/models/items/a_bullets_simple.iqm b/models/items/a_bullets_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/a_bullets_simple.iqm differ diff --git a/models/items/a_bullets_simple.iqm_0.skin b/models/items/a_bullets_simple.iqm_0.skin new file mode 100644 index 000000000..475769545 --- /dev/null +++ b/models/items/a_bullets_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,a_bullets_simple \ No newline at end of file diff --git a/models/items/a_bullets_simple.tga b/models/items/a_bullets_simple.tga new file mode 100644 index 000000000..111a32a7b Binary files /dev/null and b/models/items/a_bullets_simple.tga differ diff --git a/models/items/a_cells_simple.iqm b/models/items/a_cells_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/a_cells_simple.iqm differ diff --git a/models/items/a_cells_simple.iqm_0.skin b/models/items/a_cells_simple.iqm_0.skin new file mode 100644 index 000000000..1651991fd --- /dev/null +++ b/models/items/a_cells_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,a_cells_simple \ No newline at end of file diff --git a/models/items/a_cells_simple.tga b/models/items/a_cells_simple.tga new file mode 100644 index 000000000..0f7f1df96 Binary files /dev/null and b/models/items/a_cells_simple.tga differ diff --git a/models/items/a_rockets_simple.iqm b/models/items/a_rockets_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/a_rockets_simple.iqm differ diff --git a/models/items/a_rockets_simple.iqm_0.skin b/models/items/a_rockets_simple.iqm_0.skin new file mode 100644 index 000000000..5b2333cc7 --- /dev/null +++ b/models/items/a_rockets_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,a_rockets_simple \ No newline at end of file diff --git a/models/items/a_rockets_simple.tga b/models/items/a_rockets_simple.tga new file mode 100644 index 000000000..3d8646be1 Binary files /dev/null and b/models/items/a_rockets_simple.tga differ diff --git a/models/items/a_shells_simple.iqm b/models/items/a_shells_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/a_shells_simple.iqm differ diff --git a/models/items/a_shells_simple.iqm_0.skin b/models/items/a_shells_simple.iqm_0.skin new file mode 100644 index 000000000..e3dc44f1f --- /dev/null +++ b/models/items/a_shells_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,a_shells_simple \ No newline at end of file diff --git a/models/items/a_shells_simple.tga b/models/items/a_shells_simple.tga new file mode 100644 index 000000000..a357f5090 Binary files /dev/null and b/models/items/a_shells_simple.tga differ diff --git a/models/items/g_h100_simple.iqm b/models/items/g_h100_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/g_h100_simple.iqm differ diff --git a/models/items/g_h100_simple.iqm_0.skin b/models/items/g_h100_simple.iqm_0.skin new file mode 100644 index 000000000..f8acadd09 --- /dev/null +++ b/models/items/g_h100_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_h100_simple \ No newline at end of file diff --git a/models/items/g_h100_simple.tga b/models/items/g_h100_simple.tga new file mode 100644 index 000000000..08b780a3e Binary files /dev/null and b/models/items/g_h100_simple.tga differ diff --git a/models/items/g_h1_simple.iqm b/models/items/g_h1_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/g_h1_simple.iqm differ diff --git a/models/items/g_h1_simple.iqm_0.skin b/models/items/g_h1_simple.iqm_0.skin new file mode 100644 index 000000000..9532805c6 --- /dev/null +++ b/models/items/g_h1_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_h1_simple \ No newline at end of file diff --git a/models/items/g_h1_simple.tga b/models/items/g_h1_simple.tga new file mode 100644 index 000000000..d8bbbc70f Binary files /dev/null and b/models/items/g_h1_simple.tga differ diff --git a/models/items/g_h25_simple.iqm b/models/items/g_h25_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/g_h25_simple.iqm differ diff --git a/models/items/g_h25_simple.iqm_0.skin b/models/items/g_h25_simple.iqm_0.skin new file mode 100644 index 000000000..0f33bc755 --- /dev/null +++ b/models/items/g_h25_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_h25_simple \ No newline at end of file diff --git a/models/items/g_h25_simple.tga b/models/items/g_h25_simple.tga new file mode 100644 index 000000000..63593cc87 Binary files /dev/null and b/models/items/g_h25_simple.tga differ diff --git a/models/items/g_h50_simple.iqm b/models/items/g_h50_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/g_h50_simple.iqm differ diff --git a/models/items/g_h50_simple.iqm_0.skin b/models/items/g_h50_simple.iqm_0.skin new file mode 100644 index 000000000..b83054192 --- /dev/null +++ b/models/items/g_h50_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_h50_simple \ No newline at end of file diff --git a/models/items/g_h50_simple.tga b/models/items/g_h50_simple.tga new file mode 100644 index 000000000..a8cbad982 Binary files /dev/null and b/models/items/g_h50_simple.tga differ diff --git a/models/items/g_invincible_simple.iqm b/models/items/g_invincible_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/g_invincible_simple.iqm differ diff --git a/models/items/g_invincible_simple.iqm_0.skin b/models/items/g_invincible_simple.iqm_0.skin new file mode 100644 index 000000000..6522c885d --- /dev/null +++ b/models/items/g_invincible_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_invincible_simple \ No newline at end of file diff --git a/models/items/g_invincible_simple.tga b/models/items/g_invincible_simple.tga new file mode 100644 index 000000000..76cb4142f Binary files /dev/null and b/models/items/g_invincible_simple.tga differ diff --git a/models/items/g_strength_simple.iqm b/models/items/g_strength_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/g_strength_simple.iqm differ diff --git a/models/items/g_strength_simple.iqm_0.skin b/models/items/g_strength_simple.iqm_0.skin new file mode 100644 index 000000000..bcdad79fa --- /dev/null +++ b/models/items/g_strength_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_strength_simple \ No newline at end of file diff --git a/models/items/g_strength_simple.tga b/models/items/g_strength_simple.tga new file mode 100644 index 000000000..09aa45c1a Binary files /dev/null and b/models/items/g_strength_simple.tga differ diff --git a/models/items/item_armor_big_simple.iqm b/models/items/item_armor_big_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/item_armor_big_simple.iqm differ diff --git a/models/items/item_armor_big_simple.iqm_0.skin b/models/items/item_armor_big_simple.iqm_0.skin new file mode 100644 index 000000000..ab88a068e --- /dev/null +++ b/models/items/item_armor_big_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,item_armor_big_simple \ No newline at end of file diff --git a/models/items/item_armor_big_simple.tga b/models/items/item_armor_big_simple.tga new file mode 100644 index 000000000..7bbd5b4d8 Binary files /dev/null and b/models/items/item_armor_big_simple.tga differ diff --git a/models/items/item_armor_large_simple.iqm b/models/items/item_armor_large_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/item_armor_large_simple.iqm differ diff --git a/models/items/item_armor_large_simple.iqm_0.skin b/models/items/item_armor_large_simple.iqm_0.skin new file mode 100644 index 000000000..4ae65f397 --- /dev/null +++ b/models/items/item_armor_large_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,item_armor_large_simple \ No newline at end of file diff --git a/models/items/item_armor_large_simple.tga b/models/items/item_armor_large_simple.tga new file mode 100644 index 000000000..80db5aba3 Binary files /dev/null and b/models/items/item_armor_large_simple.tga differ diff --git a/models/items/item_armor_medium_simple.iqm b/models/items/item_armor_medium_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/item_armor_medium_simple.iqm differ diff --git a/models/items/item_armor_medium_simple.iqm_0.skin b/models/items/item_armor_medium_simple.iqm_0.skin new file mode 100644 index 000000000..8f258c141 --- /dev/null +++ b/models/items/item_armor_medium_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,item_armor_medium_simple \ No newline at end of file diff --git a/models/items/item_armor_medium_simple.tga b/models/items/item_armor_medium_simple.tga new file mode 100644 index 000000000..ed3ce1f81 Binary files /dev/null and b/models/items/item_armor_medium_simple.tga differ diff --git a/models/items/item_armor_small_simple.iqm b/models/items/item_armor_small_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/items/item_armor_small_simple.iqm differ diff --git a/models/items/item_armor_small_simple.iqm_0.skin b/models/items/item_armor_small_simple.iqm_0.skin new file mode 100644 index 000000000..50bbb53d4 --- /dev/null +++ b/models/items/item_armor_small_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,item_armor_small_simple \ No newline at end of file diff --git a/models/items/item_armor_small_simple.tga b/models/items/item_armor_small_simple.tga new file mode 100644 index 000000000..d8a0f91f0 Binary files /dev/null and b/models/items/item_armor_small_simple.tga differ diff --git a/models/weapons/g_crylink_simple.iqm b/models/weapons/g_crylink_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_crylink_simple.iqm differ diff --git a/models/weapons/g_crylink_simple.iqm_0.skin b/models/weapons/g_crylink_simple.iqm_0.skin new file mode 100644 index 000000000..e86b8b2b8 --- /dev/null +++ b/models/weapons/g_crylink_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_crylink_simple \ No newline at end of file diff --git a/models/weapons/g_crylink_simple.tga b/models/weapons/g_crylink_simple.tga new file mode 100644 index 000000000..f4054b7be Binary files /dev/null and b/models/weapons/g_crylink_simple.tga differ diff --git a/models/weapons/g_electro_simple.iqm b/models/weapons/g_electro_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_electro_simple.iqm differ diff --git a/models/weapons/g_electro_simple.iqm_0.skin b/models/weapons/g_electro_simple.iqm_0.skin new file mode 100644 index 000000000..0ae8f4afd --- /dev/null +++ b/models/weapons/g_electro_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_electro_simple \ No newline at end of file diff --git a/models/weapons/g_electro_simple.tga b/models/weapons/g_electro_simple.tga new file mode 100644 index 000000000..b523c722e Binary files /dev/null and b/models/weapons/g_electro_simple.tga differ diff --git a/models/weapons/g_gl_simple.iqm b/models/weapons/g_gl_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_gl_simple.iqm differ diff --git a/models/weapons/g_gl_simple.iqm_0.skin b/models/weapons/g_gl_simple.iqm_0.skin new file mode 100644 index 000000000..cbb574dff --- /dev/null +++ b/models/weapons/g_gl_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_gl_simple \ No newline at end of file diff --git a/models/weapons/g_gl_simple.tga b/models/weapons/g_gl_simple.tga new file mode 100644 index 000000000..e138aa42e Binary files /dev/null and b/models/weapons/g_gl_simple.tga differ diff --git a/models/weapons/g_hagar_simple.iqm b/models/weapons/g_hagar_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_hagar_simple.iqm differ diff --git a/models/weapons/g_hagar_simple.iqm_0.skin b/models/weapons/g_hagar_simple.iqm_0.skin new file mode 100644 index 000000000..2eb9f3076 --- /dev/null +++ b/models/weapons/g_hagar_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_hagar_simple \ No newline at end of file diff --git a/models/weapons/g_hagar_simple.tga b/models/weapons/g_hagar_simple.tga new file mode 100644 index 000000000..4c82e4bee Binary files /dev/null and b/models/weapons/g_hagar_simple.tga differ diff --git a/models/weapons/g_nex_simple.iqm b/models/weapons/g_nex_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_nex_simple.iqm differ diff --git a/models/weapons/g_nex_simple.iqm_0.skin b/models/weapons/g_nex_simple.iqm_0.skin new file mode 100644 index 000000000..55a8cc4dd --- /dev/null +++ b/models/weapons/g_nex_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_nex_simple \ No newline at end of file diff --git a/models/weapons/g_nex_simple.tga b/models/weapons/g_nex_simple.tga new file mode 100644 index 000000000..27c984f8a Binary files /dev/null and b/models/weapons/g_nex_simple.tga differ diff --git a/models/weapons/g_rl_simple.iqm b/models/weapons/g_rl_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_rl_simple.iqm differ diff --git a/models/weapons/g_rl_simple.iqm_0.skin b/models/weapons/g_rl_simple.iqm_0.skin new file mode 100644 index 000000000..bcb054edc --- /dev/null +++ b/models/weapons/g_rl_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_rl_simple \ No newline at end of file diff --git a/models/weapons/g_rl_simple.tga b/models/weapons/g_rl_simple.tga new file mode 100644 index 000000000..d65fa8788 Binary files /dev/null and b/models/weapons/g_rl_simple.tga differ diff --git a/models/weapons/g_shotgun_simple.iqm b/models/weapons/g_shotgun_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_shotgun_simple.iqm differ diff --git a/models/weapons/g_shotgun_simple.iqm_0.skin b/models/weapons/g_shotgun_simple.iqm_0.skin new file mode 100644 index 000000000..3721ffc99 --- /dev/null +++ b/models/weapons/g_shotgun_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_shotgun_simple \ No newline at end of file diff --git a/models/weapons/g_shotgun_simple.tga b/models/weapons/g_shotgun_simple.tga new file mode 100644 index 000000000..37da2f862 Binary files /dev/null and b/models/weapons/g_shotgun_simple.tga differ diff --git a/models/weapons/g_uzi_simple.iqm b/models/weapons/g_uzi_simple.iqm new file mode 100644 index 000000000..a5cc3e602 Binary files /dev/null and b/models/weapons/g_uzi_simple.iqm differ diff --git a/models/weapons/g_uzi_simple.iqm_0.skin b/models/weapons/g_uzi_simple.iqm_0.skin new file mode 100644 index 000000000..043974b34 --- /dev/null +++ b/models/weapons/g_uzi_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_uzi_simple \ No newline at end of file diff --git a/models/weapons/g_uzi_simple.tga b/models/weapons/g_uzi_simple.tga new file mode 100644 index 000000000..d9b5df404 Binary files /dev/null and b/models/weapons/g_uzi_simple.tga differ diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader new file mode 100644 index 000000000..abaab423e --- /dev/null +++ b/scripts/simpleitems.shader @@ -0,0 +1,407 @@ +////////// AMMO ////////// + +a_cells_simple // cells +{ + deformVertexes autosprite + cull none + { + map models/items/a_cells_simple + blendfunc blend + nopicmip + } +} + +a_rockets_simple // rockets +{ + deformVertexes autosprite + cull none + { + map models/items/a_rockets_simple + blendfunc blend + nopicmip + } +} + +a_bullets_simple // bullets +{ + deformVertexes autosprite + cull none + { + map models/items/a_bullets_simple + blendfunc blend + nopicmip + } +} + +a_shells_simple // shells +{ + deformVertexes autosprite + cull none + { + map models/items/a_shells_simple + blendfunc blend + nopicmip + } +} + +////////// WEAPONS ////////// + +g_crylink_simple // crylink +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_crylink_simple + blendfunc blend + nopicmip + } +} + +g_electro_simple // electro +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_electro_simple + blendfunc blend + nopicmip + } +} + +g_nex_simple // nex +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_nex_simple + blendfunc blend + nopicmip + } +} + +g_hagar_simple // hagar +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_hagar_simple + blendfunc blend + nopicmip + } +} + +g_gl_simple // mortar +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_gl_simple + blendfunc blend + nopicmip + } +} + +g_rl_simple // rocket launcher +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_rl_simple + blendfunc blend + nopicmip + } +} + +g_shotgun_simple // shotgun +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_shotgun_simple + blendfunc blend + nopicmip + } +} + +g_uzi_simple // machine gun +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_uzi_simple + blendfunc blend + nopicmip + } +} + +g_uzi_simple // machine gun +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_uzi_simple + blendfunc blend + nopicmip + } +} + +g_campingrifle_simple // sniper rifle +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_campingrifle_simple + blendfunc blend + nopicmip + } +} + +g_fireball_simple // fireball +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_fireball_simple + blendfunc blend + nopicmip + } +} + +g_hlac_simple // HLAC +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_hlac_simple + blendfunc blend + nopicmip + } +} + +g_hookgun_simple // hook gun +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_hookgun_simple + blendfunc blend + nopicmip + } +} + +g_laser_simple // laser +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_laser_simple + blendfunc blend + nopicmip + } +} + +g_minelayer_simple // minelayer +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_minelayer_simple + blendfunc blend + nopicmip + } +} + +g_minstanex_simple // minstanex +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_minstanex_simple + blendfunc blend + nopicmip + } +} + +g_porto_simple // portolauncher +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_porto_simple + blendfunc blend + nopicmip + } +} + +g_seeker_simple // tag seeker +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_seeker_simple + blendfunc blend + nopicmip + } +} + +g_tuba_simple // tuba +{ + deformVertexes autosprite + cull none + { + map models/weapons/g_tuba_simple + blendfunc blend + nopicmip + } +} + +////////// ARMOR + HEALTH ITEMS ////////// + +///// ARMOR ///// + +item_armor_small_simple // 5a +{ + deformVertexes autosprite + cull none + { + map models/items/item_armor_small_simple + blendfunc blend + nopicmip + } +} + +item_armor_medium_simple // 25a +{ + deformVertexes autosprite + cull none + { + map models/items/item_armor_medium_simple + blendfunc blend + nopicmip + } +} + +item_armor_big_simple // 50a +{ + deformVertexes autosprite + cull none + { + map models/items/item_armor_big_simple + blendfunc blend + nopicmip + } +} + +item_armor_large_simple // 100a +{ + deformVertexes autosprite + cull none + { + map models/items/item_armor_large_simple + blendfunc blend + nopicmip + } +} + +///// HEALTH ///// + +g_h1_simple // 5hp +{ + deformVertexes autosprite + cull none + { + map models/items/g_h1_simple + blendfunc blend + nopicmip + } +} + +g_h25_simple // 25hp +{ + deformVertexes autosprite + cull none + { + map models/items/g_h25_simple + blendfunc blend + nopicmip + } +} + +g_h50_simple // 50hp +{ + deformVertexes autosprite + cull none + { + map models/items/g_h50_simple + blendfunc blend + nopicmip + } +} + +g_h100_simple // 100hp +{ + deformVertexes autosprite + cull none + { + map models/items/g_h100_simple + blendfunc blend + nopicmip + } +} + +////////// POWERUPS ////////// + +g_strength_simple // strength +{ + deformVertexes autosprite + cull none + { + map models/items/g_strength_simple + blendfunc blend + nopicmip + } +} + +g_invincible_simple // shield +{ + deformVertexes autosprite + cull none + { + map models/items/g_invincible_simple + blendfunc blend + nopicmip + } +} + +g_jetpack_simple // jetpack +{ + deformVertexes autosprite + cull none + { + map models/items/g_jetpack_simple + blendfunc blend + nopicmip + } +} + +g_fuel_simple // fuel for jetpack +{ + deformVertexes autosprite + cull none + { + map models/items/g_fuel_simple + blendfunc blend + nopicmip + } +} + +g_fuelregen_simple // fuel regen powerup +{ + deformVertexes autosprite + cull none + { + map models/items/g_fuelregen_simple + blendfunc blend + nopicmip + } +} \ No newline at end of file diff --git a/scripts/weapons.shader b/scripts/weapons.shader index a0d3c584c..a6dcfaab8 100644 --- a/scripts/weapons.shader +++ b/scripts/weapons.shader @@ -103,15 +103,3 @@ minelayer rgbgen lightingDiffuse } } - -crylink_simple -{ - deformVertexes autosprite - cull none - { - map models/weapons/crylink_simple - blendfunc blend - //rgbgen lightingDiffuse - - } -} \ No newline at end of file