diff --git a/baseq3r/gfx/2d/menucar01.tga b/baseq3r/gfx/2d/menucar01.tga index 805686b3..5c3941ee 100644 Binary files a/baseq3r/gfx/2d/menucar01.tga and b/baseq3r/gfx/2d/menucar01.tga differ diff --git a/baseq3r/gfx/2d/menucar02.tga b/baseq3r/gfx/2d/menucar02.tga index f751d59a..7d10ffde 100644 Binary files a/baseq3r/gfx/2d/menucar02.tga and b/baseq3r/gfx/2d/menucar02.tga differ diff --git a/baseq3r/gfx/2d/menucar03.tga b/baseq3r/gfx/2d/menucar03.tga index fdb0e4c5..54f64c09 100644 Binary files a/baseq3r/gfx/2d/menucar03.tga and b/baseq3r/gfx/2d/menucar03.tga differ diff --git a/baseq3r/gfx/2d/menucar04.tga b/baseq3r/gfx/2d/menucar04.tga index bbaf2a47..40b2abf3 100644 Binary files a/baseq3r/gfx/2d/menucar04.tga and b/baseq3r/gfx/2d/menucar04.tga differ diff --git a/baseq3r/gfx/2d/menucar05.tga b/baseq3r/gfx/2d/menucar05.tga index 618f9aa9..64ce014a 100644 Binary files a/baseq3r/gfx/2d/menucar05.tga and b/baseq3r/gfx/2d/menucar05.tga differ diff --git a/baseq3r/gfx/2d/menucar06.tga b/baseq3r/gfx/2d/menucar06.tga new file mode 100644 index 00000000..605f06d6 Binary files /dev/null and b/baseq3r/gfx/2d/menucar06.tga differ diff --git a/baseq3r/gfx/2d/menucar07.tga b/baseq3r/gfx/2d/menucar07.tga new file mode 100644 index 00000000..dfd46e8a Binary files /dev/null and b/baseq3r/gfx/2d/menucar07.tga differ diff --git a/baseq3r/gfx/2d/menucar08.tga b/baseq3r/gfx/2d/menucar08.tga new file mode 100644 index 00000000..00bb736b Binary files /dev/null and b/baseq3r/gfx/2d/menucar08.tga differ diff --git a/baseq3r/gfx/2d/menucar09.tga b/baseq3r/gfx/2d/menucar09.tga new file mode 100644 index 00000000..91280d13 Binary files /dev/null and b/baseq3r/gfx/2d/menucar09.tga differ diff --git a/baseq3r/icons/iconf_blu1.tga b/baseq3r/icons/iconf_blu1.tga index 0f061b57..494d75dd 100644 Binary files a/baseq3r/icons/iconf_blu1.tga and b/baseq3r/icons/iconf_blu1.tga differ diff --git a/baseq3r/icons/iconf_blu2.tga b/baseq3r/icons/iconf_blu2.tga index 9f56e514..a61952d1 100644 Binary files a/baseq3r/icons/iconf_blu2.tga and b/baseq3r/icons/iconf_blu2.tga differ diff --git a/baseq3r/icons/iconf_blu3.tga b/baseq3r/icons/iconf_blu3.tga index 63422dcc..570c6b2e 100644 Binary files a/baseq3r/icons/iconf_blu3.tga and b/baseq3r/icons/iconf_blu3.tga differ diff --git a/baseq3r/icons/iconf_neutral1.tga b/baseq3r/icons/iconf_neutral1.tga index d1290a5a..4c83d8ee 100644 Binary files a/baseq3r/icons/iconf_neutral1.tga and b/baseq3r/icons/iconf_neutral1.tga differ diff --git a/baseq3r/icons/iconf_red1.tga b/baseq3r/icons/iconf_red1.tga index e38d3f76..73852342 100644 Binary files a/baseq3r/icons/iconf_red1.tga and b/baseq3r/icons/iconf_red1.tga differ diff --git a/baseq3r/icons/iconf_red2.tga b/baseq3r/icons/iconf_red2.tga index 37101220..bc26e684 100644 Binary files a/baseq3r/icons/iconf_red2.tga and b/baseq3r/icons/iconf_red2.tga differ diff --git a/baseq3r/icons/iconf_red3.tga b/baseq3r/icons/iconf_red3.tga index 13e69f7a..5fcfbd1c 100644 Binary files a/baseq3r/icons/iconf_red3.tga and b/baseq3r/icons/iconf_red3.tga differ diff --git a/baseq3r/menu/tab/name.tga b/baseq3r/menu/tab/name.tga index b584638f..43a2a2ed 100644 Binary files a/baseq3r/menu/tab/name.tga and b/baseq3r/menu/tab/name.tga differ diff --git a/baseq3r/menu/tab/ping.tga b/baseq3r/menu/tab/ping.tga index 1190cb9a..305019dd 100644 Binary files a/baseq3r/menu/tab/ping.tga and b/baseq3r/menu/tab/ping.tga differ diff --git a/baseq3r/menu/tab/score.tga b/baseq3r/menu/tab/score.tga index 7aa97228..bf0d35cb 100644 Binary files a/baseq3r/menu/tab/score.tga and b/baseq3r/menu/tab/score.tga differ diff --git a/baseq3r/menu/tab/time.tga b/baseq3r/menu/tab/time.tga index b986b721..f58e5b10 100644 Binary files a/baseq3r/menu/tab/time.tga and b/baseq3r/menu/tab/time.tga differ diff --git a/baseq3r/models/debris/glass_1.md3 b/baseq3r/models/debris/glass_1.md3 index bcdbe213..37e506cc 100644 Binary files a/baseq3r/models/debris/glass_1.md3 and b/baseq3r/models/debris/glass_1.md3 differ diff --git a/baseq3r/models/debris/glass_1_large.md3 b/baseq3r/models/debris/glass_1_large.md3 index e2dedfac..fa2fdf86 100644 Binary files a/baseq3r/models/debris/glass_1_large.md3 and b/baseq3r/models/debris/glass_1_large.md3 differ diff --git a/baseq3r/models/debris/glass_2.md3 b/baseq3r/models/debris/glass_2.md3 index ddf6ac54..8835a3ac 100644 Binary files a/baseq3r/models/debris/glass_2.md3 and b/baseq3r/models/debris/glass_2.md3 differ diff --git a/baseq3r/models/debris/glass_2_large.md3 b/baseq3r/models/debris/glass_2_large.md3 index f47acabb..107c0558 100644 Binary files a/baseq3r/models/debris/glass_2_large.md3 and b/baseq3r/models/debris/glass_2_large.md3 differ diff --git a/baseq3r/models/debris/glass_3.md3 b/baseq3r/models/debris/glass_3.md3 index 19d26b87..f2b32d56 100644 Binary files a/baseq3r/models/debris/glass_3.md3 and b/baseq3r/models/debris/glass_3.md3 differ diff --git a/baseq3r/models/debris/glass_3_large.md3 b/baseq3r/models/debris/glass_3_large.md3 index cfb62315..a1109480 100644 Binary files a/baseq3r/models/debris/glass_3_large.md3 and b/baseq3r/models/debris/glass_3_large.md3 differ diff --git a/baseq3r/models/debris/glass_4.md3 b/baseq3r/models/debris/glass_4.md3 index b12c48a0..8d2a5dab 100644 Binary files a/baseq3r/models/debris/glass_4.md3 and b/baseq3r/models/debris/glass_4.md3 differ diff --git a/baseq3r/models/debris/glass_4_large.md3 b/baseq3r/models/debris/glass_4_large.md3 index 205b9825..97f897c5 100644 Binary files a/baseq3r/models/debris/glass_4_large.md3 and b/baseq3r/models/debris/glass_4_large.md3 differ diff --git a/baseq3r/models/debris/glass_5.md3 b/baseq3r/models/debris/glass_5.md3 index 6d0f5d83..b0ebf6c4 100644 Binary files a/baseq3r/models/debris/glass_5.md3 and b/baseq3r/models/debris/glass_5.md3 differ diff --git a/baseq3r/models/debris/glass_5_large.md3 b/baseq3r/models/debris/glass_5_large.md3 index 91c30dbb..f2875fb4 100644 Binary files a/baseq3r/models/debris/glass_5_large.md3 and b/baseq3r/models/debris/glass_5_large.md3 differ diff --git a/baseq3r/scripts/ctf.shader b/baseq3r/scripts/ctf.shader index 10e3501c..beaf8c90 100644 --- a/baseq3r/scripts/ctf.shader +++ b/baseq3r/scripts/ctf.shader @@ -1214,4 +1214,58 @@ models/flags/flagsphere tcGen environment blendfunc GL_ONE GL_ONE } -} \ No newline at end of file +} + +// ------------------------------------------------------------ +// 51.flags (y_flag) +// ------------------------------------------------------------ + +models/flags/y_flag +{ + cull disable + deformVertexes wave 80 sin 2 8 0 3 + deformVertexes wave 20 square 0 2 0.5 0.2 + { + map textures/sfx/proto_zzztyellow.tga + rgbGen identity + tcMod turb 1 1 0.5 0.3 + tcGen environment + } + { + map models/flags/y_flag.tga + rgbGen lightingDiffuse + alphaFunc GE128 + } + { + map textures/effects/flagenv.tga + blendfunc gl_dst_color gl_src_color + tcGen environment + } +} + +// ------------------------------------------------------------ +// 52.flags (g_flag) +// ------------------------------------------------------------ + +models/flags/g_flag +{ + cull disable + deformVertexes wave 80 sin 2 8 0 3 + deformVertexes wave 20 square 0 2 0.5 0.2 + { + map textures/sfx/proto_zzztgreen.tga + rgbGen identity + tcMod turb 1 1 0.5 0.3 + tcGen environment + } + { + map models/flags/g_flag.tga + rgbGen lightingDiffuse + alphaFunc GE128 + } + { + map textures/effects/flagenv.tga + blendfunc gl_dst_color gl_src_color + tcGen environment + } +} diff --git a/baseq3r/sound/weapons/flamer/fl_expl.ogg b/baseq3r/sound/weapons/flamer/fl_expl.ogg new file mode 100644 index 00000000..9a86f925 Binary files /dev/null and b/baseq3r/sound/weapons/flamer/fl_expl.ogg differ diff --git a/baseq3r/sprites/balloon3.tga b/baseq3r/sprites/balloon3.tga index dae83324..2e231e0b 100644 Binary files a/baseq3r/sprites/balloon3.tga and b/baseq3r/sprites/balloon3.tga differ diff --git a/baseq3r/sprites/balloon4.tga b/baseq3r/sprites/balloon4.tga index 85d2bbc9..b13ceff3 100644 Binary files a/baseq3r/sprites/balloon4.tga and b/baseq3r/sprites/balloon4.tga differ diff --git a/baseq3r/textures/sfx/fire_ctfgreen.jpg b/baseq3r/textures/sfx/fire_ctfgreen.jpg new file mode 100644 index 00000000..618b7a07 Binary files /dev/null and b/baseq3r/textures/sfx/fire_ctfgreen.jpg differ diff --git a/baseq3r/textures/sfx/firegorre2.jpg b/baseq3r/textures/sfx/firegorre2.jpg new file mode 100644 index 00000000..f0e5c7e5 Binary files /dev/null and b/baseq3r/textures/sfx/firegorre2.jpg differ diff --git a/baseq3r/textures/sfx/proto_zzztgreen.jpg b/baseq3r/textures/sfx/proto_zzztgreen.jpg new file mode 100644 index 00000000..abf9b2c7 Binary files /dev/null and b/baseq3r/textures/sfx/proto_zzztgreen.jpg differ diff --git a/baseq3r/textures/sfx/proto_zzztyellow.jpg b/baseq3r/textures/sfx/proto_zzztyellow.jpg new file mode 100644 index 00000000..0f23476d Binary files /dev/null and b/baseq3r/textures/sfx/proto_zzztyellow.jpg differ