]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/terencehill/weapon_stay_fix'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 31 Aug 2011 13:47:53 +0000 (15:47 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 31 Aug 2011 13:47:53 +0000 (15:47 +0200)
179 files changed:
balanceXonotic.cfg
defaultXonotic.cfg
gfx/menu/default/background.tga [deleted file]
gfx/menu/default/background_ingame.tga [deleted file]
gfx/menu/default/background_l2.tga [deleted file]
gfx/menu/default/bigbutton_c.tga [deleted file]
gfx/menu/default/bigbutton_d.tga [deleted file]
gfx/menu/default/bigbutton_f.tga [deleted file]
gfx/menu/default/bigbutton_n.tga [deleted file]
gfx/menu/default/bigbuttongray_c.tga [deleted file]
gfx/menu/default/bigbuttongray_d.tga [deleted file]
gfx/menu/default/bigbuttongray_f.tga [deleted file]
gfx/menu/default/bigbuttongray_n.tga [deleted file]
gfx/menu/default/border.tga [deleted file]
gfx/menu/default/button_c.tga [deleted file]
gfx/menu/default/button_d.tga [deleted file]
gfx/menu/default/button_f.tga [deleted file]
gfx/menu/default/button_n.tga [deleted file]
gfx/menu/default/buttongray_c.tga [deleted file]
gfx/menu/default/buttongray_d.tga [deleted file]
gfx/menu/default/buttongray_f.tga [deleted file]
gfx/menu/default/buttongray_n.tga [deleted file]
gfx/menu/default/charmap.tga [deleted file]
gfx/menu/default/charmapbutton.tga [deleted file]
gfx/menu/default/checkbox_c0.tga [deleted file]
gfx/menu/default/checkbox_c1.tga [deleted file]
gfx/menu/default/checkbox_d0.tga [deleted file]
gfx/menu/default/checkbox_d1.tga [deleted file]
gfx/menu/default/checkbox_f0.tga [deleted file]
gfx/menu/default/checkbox_f1.tga [deleted file]
gfx/menu/default/checkbox_n0.tga [deleted file]
gfx/menu/default/checkbox_n1.tga [deleted file]
gfx/menu/default/checkmark.tga [deleted file]
gfx/menu/default/closebutton_c.tga [deleted file]
gfx/menu/default/closebutton_f.tga [deleted file]
gfx/menu/default/closebutton_n.tga [deleted file]
gfx/menu/default/color.tga [deleted file]
gfx/menu/default/colorbutton_c.tga [deleted file]
gfx/menu/default/colorbutton_f.tga [deleted file]
gfx/menu/default/colorbutton_n.tga [deleted file]
gfx/menu/default/colorpicker.tga [deleted file]
gfx/menu/default/colorpicker_m.tga [deleted file]
gfx/menu/default/colorpicker_selected.tga [deleted file]
gfx/menu/default/crosshairbutton_c.tga [deleted file]
gfx/menu/default/crosshairbutton_d.tga [deleted file]
gfx/menu/default/crosshairbutton_f.tga [deleted file]
gfx/menu/default/crosshairbutton_n.tga [deleted file]
gfx/menu/default/cursor.tga [deleted file]
gfx/menu/default/cursor_move.tga [deleted file]
gfx/menu/default/cursor_resize.tga [deleted file]
gfx/menu/default/cursor_resize2.tga [deleted file]
gfx/menu/default/icon_aeslevel0.tga [deleted file]
gfx/menu/default/icon_aeslevel1.tga [deleted file]
gfx/menu/default/icon_aeslevel2.tga [deleted file]
gfx/menu/default/icon_aeslevel3.tga [deleted file]
gfx/menu/default/icon_aeslevel4.tga [deleted file]
gfx/menu/default/icon_aeslevel5.tga [deleted file]
gfx/menu/default/icon_ipv4.tga [deleted file]
gfx/menu/default/icon_ipv6.tga [deleted file]
gfx/menu/default/icon_pure0.tga [deleted file]
gfx/menu/default/icon_pure1.tga [deleted file]
gfx/menu/default/inputbox_f.tga [deleted file]
gfx/menu/default/inputbox_n.tga [deleted file]
gfx/menu/default/radiobutton_c0.tga [deleted file]
gfx/menu/default/radiobutton_c1.tga [deleted file]
gfx/menu/default/radiobutton_d0.tga [deleted file]
gfx/menu/default/radiobutton_d1.tga [deleted file]
gfx/menu/default/radiobutton_f0.tga [deleted file]
gfx/menu/default/radiobutton_f1.tga [deleted file]
gfx/menu/default/radiobutton_n0.tga [deleted file]
gfx/menu/default/radiobutton_n1.tga [deleted file]
gfx/menu/default/scrollbar_c.tga [deleted file]
gfx/menu/default/scrollbar_f.tga [deleted file]
gfx/menu/default/scrollbar_n.tga [deleted file]
gfx/menu/default/scrollbar_s.tga [deleted file]
gfx/menu/default/skinpreview.jpg [deleted file]
gfx/menu/default/skinvalues.txt [deleted file]
gfx/menu/default/slider_c.tga [deleted file]
gfx/menu/default/slider_d.tga [deleted file]
gfx/menu/default/slider_f.tga [deleted file]
gfx/menu/default/slider_n.tga [deleted file]
gfx/menu/default/slider_s.tga [deleted file]
gfx/menu/default/tooltip.tga [deleted file]
gfx/menu/wickedx/background.tga [new file with mode: 0644]
gfx/menu/wickedx/background_ingame.tga [new file with mode: 0644]
gfx/menu/wickedx/background_l2.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbutton_c.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbutton_d.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbutton_f.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbutton_n.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbuttongray_c.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbuttongray_d.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbuttongray_f.tga [new file with mode: 0644]
gfx/menu/wickedx/bigbuttongray_n.tga [new file with mode: 0644]
gfx/menu/wickedx/border.tga [new file with mode: 0644]
gfx/menu/wickedx/button_c.tga [new file with mode: 0644]
gfx/menu/wickedx/button_d.tga [new file with mode: 0644]
gfx/menu/wickedx/button_f.tga [new file with mode: 0644]
gfx/menu/wickedx/button_n.tga [new file with mode: 0644]
gfx/menu/wickedx/buttongray_c.tga [new file with mode: 0644]
gfx/menu/wickedx/buttongray_d.tga [new file with mode: 0644]
gfx/menu/wickedx/buttongray_f.tga [new file with mode: 0644]
gfx/menu/wickedx/buttongray_n.tga [new file with mode: 0644]
gfx/menu/wickedx/charmap.tga [new file with mode: 0755]
gfx/menu/wickedx/charmapbutton.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_c0.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_c1.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_d0.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_d1.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_f0.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_f1.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_n0.tga [new file with mode: 0644]
gfx/menu/wickedx/checkbox_n1.tga [new file with mode: 0644]
gfx/menu/wickedx/checkmark.tga [new file with mode: 0644]
gfx/menu/wickedx/closebutton_c.tga [new file with mode: 0644]
gfx/menu/wickedx/closebutton_f.tga [new file with mode: 0644]
gfx/menu/wickedx/closebutton_n.tga [new file with mode: 0644]
gfx/menu/wickedx/color.tga [new file with mode: 0755]
gfx/menu/wickedx/colorbutton_c.tga [new file with mode: 0644]
gfx/menu/wickedx/colorbutton_f.tga [new file with mode: 0644]
gfx/menu/wickedx/colorbutton_n.tga [new file with mode: 0755]
gfx/menu/wickedx/colorpicker.tga [new file with mode: 0755]
gfx/menu/wickedx/colorpicker_m.tga [new file with mode: 0755]
gfx/menu/wickedx/colorpicker_selected.tga [new file with mode: 0644]
gfx/menu/wickedx/crosshairbutton_c.tga [new file with mode: 0644]
gfx/menu/wickedx/crosshairbutton_d.tga [new file with mode: 0755]
gfx/menu/wickedx/crosshairbutton_f.tga [new file with mode: 0644]
gfx/menu/wickedx/crosshairbutton_n.tga [new file with mode: 0755]
gfx/menu/wickedx/cursor.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_move.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_resize.tga [new file with mode: 0644]
gfx/menu/wickedx/cursor_resize2.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_aeslevel0.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_aeslevel1.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_aeslevel2.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_aeslevel3.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_aeslevel4.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_aeslevel5.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_ipv4.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_ipv6.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_pure0.tga [new file with mode: 0644]
gfx/menu/wickedx/icon_pure1.tga [new file with mode: 0644]
gfx/menu/wickedx/inputbox_f.tga [new file with mode: 0644]
gfx/menu/wickedx/inputbox_n.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_c0.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_c1.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_d0.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_d1.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_f0.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_f1.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_n0.tga [new file with mode: 0644]
gfx/menu/wickedx/radiobutton_n1.tga [new file with mode: 0644]
gfx/menu/wickedx/scrollbar_c.tga [new file with mode: 0644]
gfx/menu/wickedx/scrollbar_f.tga [new file with mode: 0644]
gfx/menu/wickedx/scrollbar_n.tga [new file with mode: 0644]
gfx/menu/wickedx/scrollbar_s.tga [new file with mode: 0644]
gfx/menu/wickedx/skinpreview.jpg [new file with mode: 0755]
gfx/menu/wickedx/skinvalues.txt [new file with mode: 0755]
gfx/menu/wickedx/slider_c.tga [new file with mode: 0644]
gfx/menu/wickedx/slider_d.tga [new file with mode: 0644]
gfx/menu/wickedx/slider_f.tga [new file with mode: 0644]
gfx/menu/wickedx/slider_n.tga [new file with mode: 0644]
gfx/menu/wickedx/slider_s.tga [new file with mode: 0644]
gfx/menu/wickedx/tooltip.tga [new file with mode: 0644]
input-demoseeking.cfg
menu.dat.es.po
models/casing_bronze.iqm [new file with mode: 0644]
models/casing_bronze.mdl [deleted file]
models/casing_bronze.tga [new file with mode: 0644]
models/casing_bronze_gloss.tga [new file with mode: 0644]
models/casing_bronze_norm.tga [new file with mode: 0644]
models/casing_bronze_reflect.tga [new file with mode: 0644]
qcsrc/client/casings.qc
qcsrc/menu/menu.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/waypoints.qc
qcsrc/server/cl_client.qc
scripts/casings.shader [new file with mode: 0644]
xonotic-credits.txt

index 864ead2ccedc87746f05987589d0e8cc82c76fa3..0c46451f4a2a1b1929d8a03104f11a4a228e2047 100644 (file)
@@ -654,8 +654,8 @@ set g_balance_hlac_reload_time 2
 set g_balance_rifle_bursttime 0
 set g_balance_rifle_primary_tracer 1
 set g_balance_rifle_primary_shots 1
-set g_balance_rifle_primary_damage 30
-set g_balance_rifle_primary_headshotaddeddamage 30
+set g_balance_rifle_primary_damage 40
+set g_balance_rifle_primary_headshotaddeddamage 40
 set g_balance_rifle_primary_spread 0
 set g_balance_rifle_primary_force 100
 set g_balance_rifle_primary_speed 40000
@@ -671,8 +671,8 @@ set g_balance_rifle_secondary_reload 0
 set g_balance_rifle_secondary_tracer 0
 set g_balance_rifle_secondary_shots 4
 set g_balance_rifle_secondary_damage 10
-set g_balance_rifle_secondary_headshotaddeddamage 10
-set g_balance_rifle_secondary_spread 0.02
+set g_balance_rifle_secondary_headshotaddeddamage 20
+set g_balance_rifle_secondary_spread 0.04
 set g_balance_rifle_secondary_force 50
 set g_balance_rifle_secondary_speed 20000
 set g_balance_rifle_secondary_lifetime 5
index e9d5b285bd05c74d083b9128b7d7b04d95d844e1..631731f78f7ce8987850924b19c3f1f5c4df8831 100644 (file)
@@ -808,6 +808,7 @@ set g_arena_powerups 0      "enables powerups (superhealth, strength and shield), whi
 set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round."
 set g_ca_point_limit 10 "point limit 10 is standard for clan arena"
 set g_ca_point_leadlimit 0
+set g_ca_spectate_enemies 0 "Allow spectating enemy player by dead player during clan arena games."
 set g_ca_warmup 10 "how long the players will have time to run around the map before the round starts"
 
 // onslaught
diff --git a/gfx/menu/default/background.tga b/gfx/menu/default/background.tga
deleted file mode 100644 (file)
index d785d64..0000000
Binary files a/gfx/menu/default/background.tga and /dev/null differ
diff --git a/gfx/menu/default/background_ingame.tga b/gfx/menu/default/background_ingame.tga
deleted file mode 100644 (file)
index 2532d17..0000000
Binary files a/gfx/menu/default/background_ingame.tga and /dev/null differ
diff --git a/gfx/menu/default/background_l2.tga b/gfx/menu/default/background_l2.tga
deleted file mode 100644 (file)
index 2532d17..0000000
Binary files a/gfx/menu/default/background_l2.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbutton_c.tga b/gfx/menu/default/bigbutton_c.tga
deleted file mode 100644 (file)
index a8bf8ad..0000000
Binary files a/gfx/menu/default/bigbutton_c.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbutton_d.tga b/gfx/menu/default/bigbutton_d.tga
deleted file mode 100644 (file)
index f6a832b..0000000
Binary files a/gfx/menu/default/bigbutton_d.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbutton_f.tga b/gfx/menu/default/bigbutton_f.tga
deleted file mode 100644 (file)
index c4cda96..0000000
Binary files a/gfx/menu/default/bigbutton_f.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbutton_n.tga b/gfx/menu/default/bigbutton_n.tga
deleted file mode 100644 (file)
index d54d5d5..0000000
Binary files a/gfx/menu/default/bigbutton_n.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbuttongray_c.tga b/gfx/menu/default/bigbuttongray_c.tga
deleted file mode 100644 (file)
index 38e9653..0000000
Binary files a/gfx/menu/default/bigbuttongray_c.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbuttongray_d.tga b/gfx/menu/default/bigbuttongray_d.tga
deleted file mode 100644 (file)
index 959ef93..0000000
Binary files a/gfx/menu/default/bigbuttongray_d.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbuttongray_f.tga b/gfx/menu/default/bigbuttongray_f.tga
deleted file mode 100644 (file)
index 55ff591..0000000
Binary files a/gfx/menu/default/bigbuttongray_f.tga and /dev/null differ
diff --git a/gfx/menu/default/bigbuttongray_n.tga b/gfx/menu/default/bigbuttongray_n.tga
deleted file mode 100644 (file)
index edff6d6..0000000
Binary files a/gfx/menu/default/bigbuttongray_n.tga and /dev/null differ
diff --git a/gfx/menu/default/border.tga b/gfx/menu/default/border.tga
deleted file mode 100644 (file)
index d435e60..0000000
Binary files a/gfx/menu/default/border.tga and /dev/null differ
diff --git a/gfx/menu/default/button_c.tga b/gfx/menu/default/button_c.tga
deleted file mode 100644 (file)
index 745ee7c..0000000
Binary files a/gfx/menu/default/button_c.tga and /dev/null differ
diff --git a/gfx/menu/default/button_d.tga b/gfx/menu/default/button_d.tga
deleted file mode 100644 (file)
index 6639525..0000000
Binary files a/gfx/menu/default/button_d.tga and /dev/null differ
diff --git a/gfx/menu/default/button_f.tga b/gfx/menu/default/button_f.tga
deleted file mode 100644 (file)
index 817d849..0000000
Binary files a/gfx/menu/default/button_f.tga and /dev/null differ
diff --git a/gfx/menu/default/button_n.tga b/gfx/menu/default/button_n.tga
deleted file mode 100644 (file)
index 643360e..0000000
Binary files a/gfx/menu/default/button_n.tga and /dev/null differ
diff --git a/gfx/menu/default/buttongray_c.tga b/gfx/menu/default/buttongray_c.tga
deleted file mode 100644 (file)
index 032ea91..0000000
Binary files a/gfx/menu/default/buttongray_c.tga and /dev/null differ
diff --git a/gfx/menu/default/buttongray_d.tga b/gfx/menu/default/buttongray_d.tga
deleted file mode 100644 (file)
index 55f1e62..0000000
Binary files a/gfx/menu/default/buttongray_d.tga and /dev/null differ
diff --git a/gfx/menu/default/buttongray_f.tga b/gfx/menu/default/buttongray_f.tga
deleted file mode 100644 (file)
index 5ed3a7d..0000000
Binary files a/gfx/menu/default/buttongray_f.tga and /dev/null differ
diff --git a/gfx/menu/default/buttongray_n.tga b/gfx/menu/default/buttongray_n.tga
deleted file mode 100644 (file)
index 6ba22b5..0000000
Binary files a/gfx/menu/default/buttongray_n.tga and /dev/null differ
diff --git a/gfx/menu/default/charmap.tga b/gfx/menu/default/charmap.tga
deleted file mode 100755 (executable)
index d8ed1d5..0000000
Binary files a/gfx/menu/default/charmap.tga and /dev/null differ
diff --git a/gfx/menu/default/charmapbutton.tga b/gfx/menu/default/charmapbutton.tga
deleted file mode 100644 (file)
index 54fe07e..0000000
Binary files a/gfx/menu/default/charmapbutton.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_c0.tga b/gfx/menu/default/checkbox_c0.tga
deleted file mode 100644 (file)
index aafd089..0000000
Binary files a/gfx/menu/default/checkbox_c0.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_c1.tga b/gfx/menu/default/checkbox_c1.tga
deleted file mode 100644 (file)
index 4e517e2..0000000
Binary files a/gfx/menu/default/checkbox_c1.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_d0.tga b/gfx/menu/default/checkbox_d0.tga
deleted file mode 100644 (file)
index 40efe7a..0000000
Binary files a/gfx/menu/default/checkbox_d0.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_d1.tga b/gfx/menu/default/checkbox_d1.tga
deleted file mode 100644 (file)
index bba6824..0000000
Binary files a/gfx/menu/default/checkbox_d1.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_f0.tga b/gfx/menu/default/checkbox_f0.tga
deleted file mode 100644 (file)
index aafd089..0000000
Binary files a/gfx/menu/default/checkbox_f0.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_f1.tga b/gfx/menu/default/checkbox_f1.tga
deleted file mode 100644 (file)
index 4e517e2..0000000
Binary files a/gfx/menu/default/checkbox_f1.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_n0.tga b/gfx/menu/default/checkbox_n0.tga
deleted file mode 100644 (file)
index aafd089..0000000
Binary files a/gfx/menu/default/checkbox_n0.tga and /dev/null differ
diff --git a/gfx/menu/default/checkbox_n1.tga b/gfx/menu/default/checkbox_n1.tga
deleted file mode 100644 (file)
index 4e517e2..0000000
Binary files a/gfx/menu/default/checkbox_n1.tga and /dev/null differ
diff --git a/gfx/menu/default/checkmark.tga b/gfx/menu/default/checkmark.tga
deleted file mode 100644 (file)
index cf34dde..0000000
Binary files a/gfx/menu/default/checkmark.tga and /dev/null differ
diff --git a/gfx/menu/default/closebutton_c.tga b/gfx/menu/default/closebutton_c.tga
deleted file mode 100644 (file)
index 56488ec..0000000
Binary files a/gfx/menu/default/closebutton_c.tga and /dev/null differ
diff --git a/gfx/menu/default/closebutton_f.tga b/gfx/menu/default/closebutton_f.tga
deleted file mode 100644 (file)
index 7338573..0000000
Binary files a/gfx/menu/default/closebutton_f.tga and /dev/null differ
diff --git a/gfx/menu/default/closebutton_n.tga b/gfx/menu/default/closebutton_n.tga
deleted file mode 100644 (file)
index e4b6058..0000000
Binary files a/gfx/menu/default/closebutton_n.tga and /dev/null differ
diff --git a/gfx/menu/default/color.tga b/gfx/menu/default/color.tga
deleted file mode 100755 (executable)
index 5189ab4..0000000
Binary files a/gfx/menu/default/color.tga and /dev/null differ
diff --git a/gfx/menu/default/colorbutton_c.tga b/gfx/menu/default/colorbutton_c.tga
deleted file mode 100644 (file)
index 1c294f7..0000000
Binary files a/gfx/menu/default/colorbutton_c.tga and /dev/null differ
diff --git a/gfx/menu/default/colorbutton_f.tga b/gfx/menu/default/colorbutton_f.tga
deleted file mode 100644 (file)
index 0031c35..0000000
Binary files a/gfx/menu/default/colorbutton_f.tga and /dev/null differ
diff --git a/gfx/menu/default/colorbutton_n.tga b/gfx/menu/default/colorbutton_n.tga
deleted file mode 100755 (executable)
index 7fec859..0000000
Binary files a/gfx/menu/default/colorbutton_n.tga and /dev/null differ
diff --git a/gfx/menu/default/colorpicker.tga b/gfx/menu/default/colorpicker.tga
deleted file mode 100755 (executable)
index 6f9845b..0000000
Binary files a/gfx/menu/default/colorpicker.tga and /dev/null differ
diff --git a/gfx/menu/default/colorpicker_m.tga b/gfx/menu/default/colorpicker_m.tga
deleted file mode 100755 (executable)
index 79b0e83..0000000
Binary files a/gfx/menu/default/colorpicker_m.tga and /dev/null differ
diff --git a/gfx/menu/default/colorpicker_selected.tga b/gfx/menu/default/colorpicker_selected.tga
deleted file mode 100644 (file)
index 605e932..0000000
Binary files a/gfx/menu/default/colorpicker_selected.tga and /dev/null differ
diff --git a/gfx/menu/default/crosshairbutton_c.tga b/gfx/menu/default/crosshairbutton_c.tga
deleted file mode 100644 (file)
index 1c294f7..0000000
Binary files a/gfx/menu/default/crosshairbutton_c.tga and /dev/null differ
diff --git a/gfx/menu/default/crosshairbutton_d.tga b/gfx/menu/default/crosshairbutton_d.tga
deleted file mode 100755 (executable)
index 110faa1..0000000
Binary files a/gfx/menu/default/crosshairbutton_d.tga and /dev/null differ
diff --git a/gfx/menu/default/crosshairbutton_f.tga b/gfx/menu/default/crosshairbutton_f.tga
deleted file mode 100644 (file)
index 0031c35..0000000
Binary files a/gfx/menu/default/crosshairbutton_f.tga and /dev/null differ
diff --git a/gfx/menu/default/crosshairbutton_n.tga b/gfx/menu/default/crosshairbutton_n.tga
deleted file mode 100755 (executable)
index ac94535..0000000
Binary files a/gfx/menu/default/crosshairbutton_n.tga and /dev/null differ
diff --git a/gfx/menu/default/cursor.tga b/gfx/menu/default/cursor.tga
deleted file mode 100644 (file)
index 0a2e295..0000000
Binary files a/gfx/menu/default/cursor.tga and /dev/null differ
diff --git a/gfx/menu/default/cursor_move.tga b/gfx/menu/default/cursor_move.tga
deleted file mode 100644 (file)
index 0264316..0000000
Binary files a/gfx/menu/default/cursor_move.tga and /dev/null differ
diff --git a/gfx/menu/default/cursor_resize.tga b/gfx/menu/default/cursor_resize.tga
deleted file mode 100644 (file)
index 475e224..0000000
Binary files a/gfx/menu/default/cursor_resize.tga and /dev/null differ
diff --git a/gfx/menu/default/cursor_resize2.tga b/gfx/menu/default/cursor_resize2.tga
deleted file mode 100644 (file)
index 6c97fb8..0000000
Binary files a/gfx/menu/default/cursor_resize2.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_aeslevel0.tga b/gfx/menu/default/icon_aeslevel0.tga
deleted file mode 100644 (file)
index 5c9e66a..0000000
Binary files a/gfx/menu/default/icon_aeslevel0.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_aeslevel1.tga b/gfx/menu/default/icon_aeslevel1.tga
deleted file mode 100644 (file)
index 7103e55..0000000
Binary files a/gfx/menu/default/icon_aeslevel1.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_aeslevel2.tga b/gfx/menu/default/icon_aeslevel2.tga
deleted file mode 100644 (file)
index 793b457..0000000
Binary files a/gfx/menu/default/icon_aeslevel2.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_aeslevel3.tga b/gfx/menu/default/icon_aeslevel3.tga
deleted file mode 100644 (file)
index ec2f15b..0000000
Binary files a/gfx/menu/default/icon_aeslevel3.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_aeslevel4.tga b/gfx/menu/default/icon_aeslevel4.tga
deleted file mode 100644 (file)
index 8f7f466..0000000
Binary files a/gfx/menu/default/icon_aeslevel4.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_aeslevel5.tga b/gfx/menu/default/icon_aeslevel5.tga
deleted file mode 100644 (file)
index 8662b13..0000000
Binary files a/gfx/menu/default/icon_aeslevel5.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_ipv4.tga b/gfx/menu/default/icon_ipv4.tga
deleted file mode 100644 (file)
index a0484f4..0000000
Binary files a/gfx/menu/default/icon_ipv4.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_ipv6.tga b/gfx/menu/default/icon_ipv6.tga
deleted file mode 100644 (file)
index d3fdc03..0000000
Binary files a/gfx/menu/default/icon_ipv6.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_pure0.tga b/gfx/menu/default/icon_pure0.tga
deleted file mode 100644 (file)
index 5c9e66a..0000000
Binary files a/gfx/menu/default/icon_pure0.tga and /dev/null differ
diff --git a/gfx/menu/default/icon_pure1.tga b/gfx/menu/default/icon_pure1.tga
deleted file mode 100644 (file)
index 62980d2..0000000
Binary files a/gfx/menu/default/icon_pure1.tga and /dev/null differ
diff --git a/gfx/menu/default/inputbox_f.tga b/gfx/menu/default/inputbox_f.tga
deleted file mode 100644 (file)
index 6b5bd20..0000000
Binary files a/gfx/menu/default/inputbox_f.tga and /dev/null differ
diff --git a/gfx/menu/default/inputbox_n.tga b/gfx/menu/default/inputbox_n.tga
deleted file mode 100644 (file)
index ad169c2..0000000
Binary files a/gfx/menu/default/inputbox_n.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_c0.tga b/gfx/menu/default/radiobutton_c0.tga
deleted file mode 100644 (file)
index 68ed15e..0000000
Binary files a/gfx/menu/default/radiobutton_c0.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_c1.tga b/gfx/menu/default/radiobutton_c1.tga
deleted file mode 100644 (file)
index 68ed15e..0000000
Binary files a/gfx/menu/default/radiobutton_c1.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_d0.tga b/gfx/menu/default/radiobutton_d0.tga
deleted file mode 100644 (file)
index f935318..0000000
Binary files a/gfx/menu/default/radiobutton_d0.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_d1.tga b/gfx/menu/default/radiobutton_d1.tga
deleted file mode 100644 (file)
index 1bcc41d..0000000
Binary files a/gfx/menu/default/radiobutton_d1.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_f0.tga b/gfx/menu/default/radiobutton_f0.tga
deleted file mode 100644 (file)
index 237e09b..0000000
Binary files a/gfx/menu/default/radiobutton_f0.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_f1.tga b/gfx/menu/default/radiobutton_f1.tga
deleted file mode 100644 (file)
index 68ed15e..0000000
Binary files a/gfx/menu/default/radiobutton_f1.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_n0.tga b/gfx/menu/default/radiobutton_n0.tga
deleted file mode 100644 (file)
index 55dae24..0000000
Binary files a/gfx/menu/default/radiobutton_n0.tga and /dev/null differ
diff --git a/gfx/menu/default/radiobutton_n1.tga b/gfx/menu/default/radiobutton_n1.tga
deleted file mode 100644 (file)
index 68ed15e..0000000
Binary files a/gfx/menu/default/radiobutton_n1.tga and /dev/null differ
diff --git a/gfx/menu/default/scrollbar_c.tga b/gfx/menu/default/scrollbar_c.tga
deleted file mode 100644 (file)
index eb4326d..0000000
Binary files a/gfx/menu/default/scrollbar_c.tga and /dev/null differ
diff --git a/gfx/menu/default/scrollbar_f.tga b/gfx/menu/default/scrollbar_f.tga
deleted file mode 100644 (file)
index eb4326d..0000000
Binary files a/gfx/menu/default/scrollbar_f.tga and /dev/null differ
diff --git a/gfx/menu/default/scrollbar_n.tga b/gfx/menu/default/scrollbar_n.tga
deleted file mode 100644 (file)
index eb4326d..0000000
Binary files a/gfx/menu/default/scrollbar_n.tga and /dev/null differ
diff --git a/gfx/menu/default/scrollbar_s.tga b/gfx/menu/default/scrollbar_s.tga
deleted file mode 100644 (file)
index c7d4700..0000000
Binary files a/gfx/menu/default/scrollbar_s.tga and /dev/null differ
diff --git a/gfx/menu/default/skinpreview.jpg b/gfx/menu/default/skinpreview.jpg
deleted file mode 100755 (executable)
index 9b8e393..0000000
Binary files a/gfx/menu/default/skinpreview.jpg and /dev/null differ
diff --git a/gfx/menu/default/skinvalues.txt b/gfx/menu/default/skinvalues.txt
deleted file mode 100755 (executable)
index b2b0a97..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-title Default // "WickedX"
-author sev
-
-// Colors: 'Red Green Blue'
-// Suffixes: Clicked (_c), Disabled (_d), Focused (_f), Normal (_n)
-
-// Background layer scaling:
-//   Crop (c), Letterbox (l), Height (h), Width (w), Stretch (s)
-// Background layer positioning:
-//   Top Left (7), Top Center (8) Top Right (9)
-//   Middle Left (4), Middle Center (5) Middle Right (6)
-//   Bottom Left (1), Bottom Center (2) Bottom Right (3)
-// ALIGN_BACKGROUND(_INGAME) spspsp, s=Scale p=Position
-
-//------------------------------------------------------------------------------
-// Structure (e.g. positions, sizes, margins)
-//------------------------------------------------------------------------------
-// item: color picker
-//   uses "colorpicker" images
-MARGIN_COLORPICKER              '0 0 0'
-
-// item: dialog
-//   uses "border" images
-//   uses "closebutton" images
-MARGIN_TOP                      8
-MARGIN_BOTTOM                   8
-MARGIN_LEFT                     8
-MARGIN_RIGHT                    8
-MARGIN_COLUMNS                  4
-MARGIN_ROWS                     4
-HEIGHT_DIALOGBORDER             1
-
-// font sizes (used for everything)
-FONTSIZE_NORMAL                 12
-HEIGHT_NORMAL                   1.5
-FONTSIZE_TITLE                  16
-HEIGHT_TITLE                    1.5
-HEIGHT_ZOOMEDTITLE              -1
-
-// general 
-//   uses "background" images
-//   uses "background_ingame" images
-ALIGN_BACKGROUND                h5h5
-ALIGN_BACKGROUND_INGAME         h5
-ALPHA_BACKGROUND_INGAME         1
-ALPHA_DISABLED                  0.2
-ALPHA_BEHIND                    0.5
-ALPHA_TEXT                      0.7
-
-// mouse
-//   uses "cursor" images
-SIZE_CURSOR                     '32 32 0'
-OFFSET_CURSOR                   '0 0 0'
-ALPHA_CURSOR_INTRO              0
-
-// nexposee positions of windows (they are the scale transformation
-// centers, NOT the actual positions of the windows!)
-POSITION_DIALOG_MULTIPLAYER     '0.8 0.4 0'
-POSITION_DIALOG_SINGLEPLAYER    '0.2 0.4 0'
-POSITION_DIALOG_SETTINGS        '0.5 0.95 0'
-POSITION_DIALOG_CREDITS         '-0.05 1.2 0'
-POSITION_DIALOG_QUIT            '1.05 1.2 0'
-
-// tooltips
-//   uses "tooltip" images
-MARGIN_TOOLTIP                  '8 8 0'
-BORDER_TOOLTIP                  '16 16 0'
-FONTSIZE_TOOLTIP                12
-ALPHA_TOOLTIP                   0.7
-WIDTH_TOOLTIP                   0.3
-AVOID_TOOLTIP                   '8 8 0'
-
-//------------------------------------------------------------------------------
-// Colors (e.g. font colors, field colors)
-//------------------------------------------------------------------------------
-// item: campaign
-ALPHA_CAMPAIGN_SELECTABLE       0.8
-COLOR_CAMPAIGN_SELECTABLE       '1 1 1'
-ALPHA_CAMPAIGN_CURRENT          1
-COLOR_CAMPAIGN_CURRENT          '1 1 1'
-ALPHA_CAMPAIGN_FUTURE           0.2
-COLOR_CAMPAIGN_FUTURE           '1 1 1'
-ALPHA_CAMPAIGN_DESCRIPTION      0.7
-
-// item: credits list
-COLOR_CREDITS_TITLE             '0.875 0.375 0'
-ALPHA_CREDITS_TITLE             1
-COLOR_CREDITS_FUNCTION          '0 0.1875 0.4375'
-ALPHA_CREDITS_FUNCTION          0.5
-COLOR_CREDITS_PERSON            '0 0.375 0.75'
-ALPHA_CREDITS_PERSON            0.875
-ROWS_CREDITS                    20
-WIDTH_CREDITS                   0.5
-
-// item: cvar list
-ALPHA_CVARLIST_SAVED            1
-ALPHA_CVARLIST_TEMPORARY        0.7    
-COLOR_CVARLIST_CHANGED          '0 0.375 0.75' 
-COLOR_CVARLIST_REVERTBUTTON     '1 0 0'
-COLOR_CVARLIST_UNCHANGED        '1 1 1'
-
-// item: list box
-COLOR_LISTBOX_SELECTED          '0.875 0.375 0'
-ALPHA_LISTBOX_SELECTED          1
-COLOR_LISTBOX_WAITING           '1 1 1'
-ALPHA_LISTBOX_WAITING           0.5
-
-// item: map list
-COLOR_MAPLIST_TITLE             '1 1 1'
-COLOR_MAPLIST_AUTHOR            '0 0.375 0.75'
-COLOR_MAPLIST_INCLUDEDBG        '0 0.1875 0.4375'
-ALPHA_MAPLIST_INCLUDEDFG        1
-ALPHA_MAPLIST_INCLUDEDBG        0.375
-ALPHA_MAPLIST_NOTINCLUDEDFG     0.25
-
-// item: nexposee
-ALPHAS_MAINMENU                 '0.8 0.9 1'
-
-// item: player model
-COLOR_MODELTITLE                '1 1 1'
-ALPHA_MODELTITLE                1
-
-// item: server info
-COLOR_SERVERINFO_NAME           '1 1 1'
-COLOR_SERVERINFO_IP             '0.875 0.375 0'
-
-// item: server list
-ALPHA_SERVERLIST_FULL           0.4
-ALPHA_SERVERLIST_EMPTY          0.7
-COLOR_SERVERLIST_LOWPING        '0 1 0'
-COLOR_SERVERLIST_MEDPING        '1 0.75 0'
-COLOR_SERVERLIST_HIGHPING       '1 0 0'
-ALPHA_SERVERLIST_HIGHPING       0.4
-ALPHA_SERVERLIST_FAVORITE       0.8
-COLOR_SERVERLIST_FAVORITE       '1 1 1'
-
-// item: skin list
-COLOR_SKINLIST_TITLE            '1 1 1'
-COLOR_SKINLIST_AUTHOR           '0 0.375 0.75'
-
-//------------------------------------------------------------------------------
-// Images (colors multiplied to images)
-//------------------------------------------------------------------------------
-// item: button
-//   uses "button" images
-//   uses "buttongray" images
-//   uses "bigbutton" images
-//   uses "bigbuttongray" images
-COLOR_BUTTON_N                  '1 1 1'
-COLOR_BUTTON_C                  '1 1 1'
-COLOR_BUTTON_F                  '1 1 1'
-COLOR_BUTTON_D                  '1 1 1'
-
-// item: checkbox
-//   uses "checkbox" images
-COLOR_CHECKBOX_N                '1 1 1'
-COLOR_CHECKBOX_C                '0.5 0.75 1'
-COLOR_CHECKBOX_F                '0.5 0.75 1'
-COLOR_CHECKBOX_D                '1 1 1'
-
-// item: crosshair button
-//   uses "crosshairbutton" images
-
-// dialog background colors
-//   uses "border" images
-COLOR_DIALOG_MULTIPLAYER        '1 1 1'
-COLOR_DIALOG_SETTINGS           '1 1 1'
-COLOR_DIALOG_TEAMSELECT         '1 1 1'
-COLOR_DIALOG_QUIT               '1 1 1'
-COLOR_DIALOG_ADVANCED           '1 1 1'
-COLOR_DIALOG_MUTATORS           '1 1 1'
-COLOR_DIALOG_MAPINFO            '1 1 1'
-COLOR_DIALOG_USERBIND           '1 1 1'
-COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
-COLOR_DIALOG_CREDITS            '1 1 1'
-COLOR_DIALOG_WEAPONS            '1 1 1'
-COLOR_DIALOG_WAYPOINTS          '1 1 1'
-COLOR_DIALOG_SERVERINFO         '1 1 1'
-COLOR_DIALOG_CVARS              '1 0 0'
-
-// item: input box
-//   uses "inputbox" images
-COLOR_INPUTBOX_N                '1 1 1'
-COLOR_INPUTBOX_F                '1 1 1'
-MARGIN_INPUTBOX_CHARS           1
-
-// item: key grabber
-COLOR_KEYGRABBER_TITLES         '1 1 1'
-ALPHA_KEYGRABBER_TITLES         1
-COLOR_KEYGRABBER_KEYS           '1 1 1'
-ALPHA_KEYGRABBER_KEYS           0.7
-
-// item: player color button
-//   uses "colorbutton" images
-//   uses "color" images
-
-// item: player name editor
-//   uses "charmap" images
-//   uses "charmapbutton" images
-
-// item: radio button
-//   uses "radiobutton" images
-COLOR_RADIOBUTTON_N             '1 1 1'
-COLOR_RADIOBUTTON_C             '1 1 1'
-COLOR_RADIOBUTTON_F             '1 1 1'
-COLOR_RADIOBUTTON_D             '1 1 1'
-
-// item: scrollbar
-//   uses "scrollbar" images
-COLOR_SCROLLBAR_N               '1 1 1'
-COLOR_SCROLLBAR_C               '0.5 0.75 1'
-COLOR_SCROLLBAR_F               '0.5 0.75 1'
-COLOR_SCROLLBAR_S               '0.25 0.25 0.25'
-WIDTH_SCROLLBAR                 16
-
-// item: slider
-//   uses "slider" images
-COLOR_SLIDER_N                  '1 1 1'
-COLOR_SLIDER_C                  '0.5 0.75 1'
-COLOR_SLIDER_F                  '0.5 0.75 1'
-COLOR_SLIDER_D                  '1 1 1'
-COLOR_SLIDER_S                  '0.25 0.25 0.25'
-WIDTH_SLIDERTEXT                0.333333333333
-TOLERANCE_SLIDER                '0.2 2 0'
diff --git a/gfx/menu/default/slider_c.tga b/gfx/menu/default/slider_c.tga
deleted file mode 100644 (file)
index 42e3e98..0000000
Binary files a/gfx/menu/default/slider_c.tga and /dev/null differ
diff --git a/gfx/menu/default/slider_d.tga b/gfx/menu/default/slider_d.tga
deleted file mode 100644 (file)
index 87ccbe5..0000000
Binary files a/gfx/menu/default/slider_d.tga and /dev/null differ
diff --git a/gfx/menu/default/slider_f.tga b/gfx/menu/default/slider_f.tga
deleted file mode 100644 (file)
index 42e3e98..0000000
Binary files a/gfx/menu/default/slider_f.tga and /dev/null differ
diff --git a/gfx/menu/default/slider_n.tga b/gfx/menu/default/slider_n.tga
deleted file mode 100644 (file)
index 42e3e98..0000000
Binary files a/gfx/menu/default/slider_n.tga and /dev/null differ
diff --git a/gfx/menu/default/slider_s.tga b/gfx/menu/default/slider_s.tga
deleted file mode 100644 (file)
index 954c90c..0000000
Binary files a/gfx/menu/default/slider_s.tga and /dev/null differ
diff --git a/gfx/menu/default/tooltip.tga b/gfx/menu/default/tooltip.tga
deleted file mode 100644 (file)
index 1dc5679..0000000
Binary files a/gfx/menu/default/tooltip.tga and /dev/null differ
diff --git a/gfx/menu/wickedx/background.tga b/gfx/menu/wickedx/background.tga
new file mode 100644 (file)
index 0000000..d785d64
Binary files /dev/null and b/gfx/menu/wickedx/background.tga differ
diff --git a/gfx/menu/wickedx/background_ingame.tga b/gfx/menu/wickedx/background_ingame.tga
new file mode 100644 (file)
index 0000000..2532d17
Binary files /dev/null and b/gfx/menu/wickedx/background_ingame.tga differ
diff --git a/gfx/menu/wickedx/background_l2.tga b/gfx/menu/wickedx/background_l2.tga
new file mode 100644 (file)
index 0000000..2532d17
Binary files /dev/null and b/gfx/menu/wickedx/background_l2.tga differ
diff --git a/gfx/menu/wickedx/bigbutton_c.tga b/gfx/menu/wickedx/bigbutton_c.tga
new file mode 100644 (file)
index 0000000..a8bf8ad
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_c.tga differ
diff --git a/gfx/menu/wickedx/bigbutton_d.tga b/gfx/menu/wickedx/bigbutton_d.tga
new file mode 100644 (file)
index 0000000..f6a832b
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_d.tga differ
diff --git a/gfx/menu/wickedx/bigbutton_f.tga b/gfx/menu/wickedx/bigbutton_f.tga
new file mode 100644 (file)
index 0000000..c4cda96
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_f.tga differ
diff --git a/gfx/menu/wickedx/bigbutton_n.tga b/gfx/menu/wickedx/bigbutton_n.tga
new file mode 100644 (file)
index 0000000..d54d5d5
Binary files /dev/null and b/gfx/menu/wickedx/bigbutton_n.tga differ
diff --git a/gfx/menu/wickedx/bigbuttongray_c.tga b/gfx/menu/wickedx/bigbuttongray_c.tga
new file mode 100644 (file)
index 0000000..38e9653
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_c.tga differ
diff --git a/gfx/menu/wickedx/bigbuttongray_d.tga b/gfx/menu/wickedx/bigbuttongray_d.tga
new file mode 100644 (file)
index 0000000..959ef93
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_d.tga differ
diff --git a/gfx/menu/wickedx/bigbuttongray_f.tga b/gfx/menu/wickedx/bigbuttongray_f.tga
new file mode 100644 (file)
index 0000000..55ff591
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_f.tga differ
diff --git a/gfx/menu/wickedx/bigbuttongray_n.tga b/gfx/menu/wickedx/bigbuttongray_n.tga
new file mode 100644 (file)
index 0000000..edff6d6
Binary files /dev/null and b/gfx/menu/wickedx/bigbuttongray_n.tga differ
diff --git a/gfx/menu/wickedx/border.tga b/gfx/menu/wickedx/border.tga
new file mode 100644 (file)
index 0000000..d435e60
Binary files /dev/null and b/gfx/menu/wickedx/border.tga differ
diff --git a/gfx/menu/wickedx/button_c.tga b/gfx/menu/wickedx/button_c.tga
new file mode 100644 (file)
index 0000000..745ee7c
Binary files /dev/null and b/gfx/menu/wickedx/button_c.tga differ
diff --git a/gfx/menu/wickedx/button_d.tga b/gfx/menu/wickedx/button_d.tga
new file mode 100644 (file)
index 0000000..6639525
Binary files /dev/null and b/gfx/menu/wickedx/button_d.tga differ
diff --git a/gfx/menu/wickedx/button_f.tga b/gfx/menu/wickedx/button_f.tga
new file mode 100644 (file)
index 0000000..817d849
Binary files /dev/null and b/gfx/menu/wickedx/button_f.tga differ
diff --git a/gfx/menu/wickedx/button_n.tga b/gfx/menu/wickedx/button_n.tga
new file mode 100644 (file)
index 0000000..643360e
Binary files /dev/null and b/gfx/menu/wickedx/button_n.tga differ
diff --git a/gfx/menu/wickedx/buttongray_c.tga b/gfx/menu/wickedx/buttongray_c.tga
new file mode 100644 (file)
index 0000000..032ea91
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_c.tga differ
diff --git a/gfx/menu/wickedx/buttongray_d.tga b/gfx/menu/wickedx/buttongray_d.tga
new file mode 100644 (file)
index 0000000..55f1e62
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_d.tga differ
diff --git a/gfx/menu/wickedx/buttongray_f.tga b/gfx/menu/wickedx/buttongray_f.tga
new file mode 100644 (file)
index 0000000..5ed3a7d
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_f.tga differ
diff --git a/gfx/menu/wickedx/buttongray_n.tga b/gfx/menu/wickedx/buttongray_n.tga
new file mode 100644 (file)
index 0000000..6ba22b5
Binary files /dev/null and b/gfx/menu/wickedx/buttongray_n.tga differ
diff --git a/gfx/menu/wickedx/charmap.tga b/gfx/menu/wickedx/charmap.tga
new file mode 100755 (executable)
index 0000000..d8ed1d5
Binary files /dev/null and b/gfx/menu/wickedx/charmap.tga differ
diff --git a/gfx/menu/wickedx/charmapbutton.tga b/gfx/menu/wickedx/charmapbutton.tga
new file mode 100644 (file)
index 0000000..54fe07e
Binary files /dev/null and b/gfx/menu/wickedx/charmapbutton.tga differ
diff --git a/gfx/menu/wickedx/checkbox_c0.tga b/gfx/menu/wickedx/checkbox_c0.tga
new file mode 100644 (file)
index 0000000..aafd089
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_c0.tga differ
diff --git a/gfx/menu/wickedx/checkbox_c1.tga b/gfx/menu/wickedx/checkbox_c1.tga
new file mode 100644 (file)
index 0000000..4e517e2
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_c1.tga differ
diff --git a/gfx/menu/wickedx/checkbox_d0.tga b/gfx/menu/wickedx/checkbox_d0.tga
new file mode 100644 (file)
index 0000000..40efe7a
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_d0.tga differ
diff --git a/gfx/menu/wickedx/checkbox_d1.tga b/gfx/menu/wickedx/checkbox_d1.tga
new file mode 100644 (file)
index 0000000..bba6824
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_d1.tga differ
diff --git a/gfx/menu/wickedx/checkbox_f0.tga b/gfx/menu/wickedx/checkbox_f0.tga
new file mode 100644 (file)
index 0000000..aafd089
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_f0.tga differ
diff --git a/gfx/menu/wickedx/checkbox_f1.tga b/gfx/menu/wickedx/checkbox_f1.tga
new file mode 100644 (file)
index 0000000..4e517e2
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_f1.tga differ
diff --git a/gfx/menu/wickedx/checkbox_n0.tga b/gfx/menu/wickedx/checkbox_n0.tga
new file mode 100644 (file)
index 0000000..aafd089
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_n0.tga differ
diff --git a/gfx/menu/wickedx/checkbox_n1.tga b/gfx/menu/wickedx/checkbox_n1.tga
new file mode 100644 (file)
index 0000000..4e517e2
Binary files /dev/null and b/gfx/menu/wickedx/checkbox_n1.tga differ
diff --git a/gfx/menu/wickedx/checkmark.tga b/gfx/menu/wickedx/checkmark.tga
new file mode 100644 (file)
index 0000000..cf34dde
Binary files /dev/null and b/gfx/menu/wickedx/checkmark.tga differ
diff --git a/gfx/menu/wickedx/closebutton_c.tga b/gfx/menu/wickedx/closebutton_c.tga
new file mode 100644 (file)
index 0000000..56488ec
Binary files /dev/null and b/gfx/menu/wickedx/closebutton_c.tga differ
diff --git a/gfx/menu/wickedx/closebutton_f.tga b/gfx/menu/wickedx/closebutton_f.tga
new file mode 100644 (file)
index 0000000..7338573
Binary files /dev/null and b/gfx/menu/wickedx/closebutton_f.tga differ
diff --git a/gfx/menu/wickedx/closebutton_n.tga b/gfx/menu/wickedx/closebutton_n.tga
new file mode 100644 (file)
index 0000000..e4b6058
Binary files /dev/null and b/gfx/menu/wickedx/closebutton_n.tga differ
diff --git a/gfx/menu/wickedx/color.tga b/gfx/menu/wickedx/color.tga
new file mode 100755 (executable)
index 0000000..5189ab4
Binary files /dev/null and b/gfx/menu/wickedx/color.tga differ
diff --git a/gfx/menu/wickedx/colorbutton_c.tga b/gfx/menu/wickedx/colorbutton_c.tga
new file mode 100644 (file)
index 0000000..1c294f7
Binary files /dev/null and b/gfx/menu/wickedx/colorbutton_c.tga differ
diff --git a/gfx/menu/wickedx/colorbutton_f.tga b/gfx/menu/wickedx/colorbutton_f.tga
new file mode 100644 (file)
index 0000000..0031c35
Binary files /dev/null and b/gfx/menu/wickedx/colorbutton_f.tga differ
diff --git a/gfx/menu/wickedx/colorbutton_n.tga b/gfx/menu/wickedx/colorbutton_n.tga
new file mode 100755 (executable)
index 0000000..7fec859
Binary files /dev/null and b/gfx/menu/wickedx/colorbutton_n.tga differ
diff --git a/gfx/menu/wickedx/colorpicker.tga b/gfx/menu/wickedx/colorpicker.tga
new file mode 100755 (executable)
index 0000000..6f9845b
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker.tga differ
diff --git a/gfx/menu/wickedx/colorpicker_m.tga b/gfx/menu/wickedx/colorpicker_m.tga
new file mode 100755 (executable)
index 0000000..79b0e83
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker_m.tga differ
diff --git a/gfx/menu/wickedx/colorpicker_selected.tga b/gfx/menu/wickedx/colorpicker_selected.tga
new file mode 100644 (file)
index 0000000..605e932
Binary files /dev/null and b/gfx/menu/wickedx/colorpicker_selected.tga differ
diff --git a/gfx/menu/wickedx/crosshairbutton_c.tga b/gfx/menu/wickedx/crosshairbutton_c.tga
new file mode 100644 (file)
index 0000000..1c294f7
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_c.tga differ
diff --git a/gfx/menu/wickedx/crosshairbutton_d.tga b/gfx/menu/wickedx/crosshairbutton_d.tga
new file mode 100755 (executable)
index 0000000..110faa1
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_d.tga differ
diff --git a/gfx/menu/wickedx/crosshairbutton_f.tga b/gfx/menu/wickedx/crosshairbutton_f.tga
new file mode 100644 (file)
index 0000000..0031c35
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_f.tga differ
diff --git a/gfx/menu/wickedx/crosshairbutton_n.tga b/gfx/menu/wickedx/crosshairbutton_n.tga
new file mode 100755 (executable)
index 0000000..ac94535
Binary files /dev/null and b/gfx/menu/wickedx/crosshairbutton_n.tga differ
diff --git a/gfx/menu/wickedx/cursor.tga b/gfx/menu/wickedx/cursor.tga
new file mode 100644 (file)
index 0000000..0a2e295
Binary files /dev/null and b/gfx/menu/wickedx/cursor.tga differ
diff --git a/gfx/menu/wickedx/cursor_move.tga b/gfx/menu/wickedx/cursor_move.tga
new file mode 100644 (file)
index 0000000..0264316
Binary files /dev/null and b/gfx/menu/wickedx/cursor_move.tga differ
diff --git a/gfx/menu/wickedx/cursor_resize.tga b/gfx/menu/wickedx/cursor_resize.tga
new file mode 100644 (file)
index 0000000..475e224
Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize.tga differ
diff --git a/gfx/menu/wickedx/cursor_resize2.tga b/gfx/menu/wickedx/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..6c97fb8
Binary files /dev/null and b/gfx/menu/wickedx/cursor_resize2.tga differ
diff --git a/gfx/menu/wickedx/icon_aeslevel0.tga b/gfx/menu/wickedx/icon_aeslevel0.tga
new file mode 100644 (file)
index 0000000..5c9e66a
Binary files /dev/null and b/gfx/menu/wickedx/icon_aeslevel0.tga differ
diff --git a/gfx/menu/wickedx/icon_aeslevel1.tga b/gfx/menu/wickedx/icon_aeslevel1.tga
new file mode 100644 (file)
index 0000000..7103e55
Binary files /dev/null and b/gfx/menu/wickedx/icon_aeslevel1.tga differ
diff --git a/gfx/menu/wickedx/icon_aeslevel2.tga b/gfx/menu/wickedx/icon_aeslevel2.tga
new file mode 100644 (file)
index 0000000..793b457
Binary files /dev/null and b/gfx/menu/wickedx/icon_aeslevel2.tga differ
diff --git a/gfx/menu/wickedx/icon_aeslevel3.tga b/gfx/menu/wickedx/icon_aeslevel3.tga
new file mode 100644 (file)
index 0000000..ec2f15b
Binary files /dev/null and b/gfx/menu/wickedx/icon_aeslevel3.tga differ
diff --git a/gfx/menu/wickedx/icon_aeslevel4.tga b/gfx/menu/wickedx/icon_aeslevel4.tga
new file mode 100644 (file)
index 0000000..8f7f466
Binary files /dev/null and b/gfx/menu/wickedx/icon_aeslevel4.tga differ
diff --git a/gfx/menu/wickedx/icon_aeslevel5.tga b/gfx/menu/wickedx/icon_aeslevel5.tga
new file mode 100644 (file)
index 0000000..8662b13
Binary files /dev/null and b/gfx/menu/wickedx/icon_aeslevel5.tga differ
diff --git a/gfx/menu/wickedx/icon_ipv4.tga b/gfx/menu/wickedx/icon_ipv4.tga
new file mode 100644 (file)
index 0000000..a0484f4
Binary files /dev/null and b/gfx/menu/wickedx/icon_ipv4.tga differ
diff --git a/gfx/menu/wickedx/icon_ipv6.tga b/gfx/menu/wickedx/icon_ipv6.tga
new file mode 100644 (file)
index 0000000..d3fdc03
Binary files /dev/null and b/gfx/menu/wickedx/icon_ipv6.tga differ
diff --git a/gfx/menu/wickedx/icon_pure0.tga b/gfx/menu/wickedx/icon_pure0.tga
new file mode 100644 (file)
index 0000000..5c9e66a
Binary files /dev/null and b/gfx/menu/wickedx/icon_pure0.tga differ
diff --git a/gfx/menu/wickedx/icon_pure1.tga b/gfx/menu/wickedx/icon_pure1.tga
new file mode 100644 (file)
index 0000000..62980d2
Binary files /dev/null and b/gfx/menu/wickedx/icon_pure1.tga differ
diff --git a/gfx/menu/wickedx/inputbox_f.tga b/gfx/menu/wickedx/inputbox_f.tga
new file mode 100644 (file)
index 0000000..6b5bd20
Binary files /dev/null and b/gfx/menu/wickedx/inputbox_f.tga differ
diff --git a/gfx/menu/wickedx/inputbox_n.tga b/gfx/menu/wickedx/inputbox_n.tga
new file mode 100644 (file)
index 0000000..ad169c2
Binary files /dev/null and b/gfx/menu/wickedx/inputbox_n.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_c0.tga b/gfx/menu/wickedx/radiobutton_c0.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_c0.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_c1.tga b/gfx/menu/wickedx/radiobutton_c1.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_c1.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_d0.tga b/gfx/menu/wickedx/radiobutton_d0.tga
new file mode 100644 (file)
index 0000000..f935318
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_d0.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_d1.tga b/gfx/menu/wickedx/radiobutton_d1.tga
new file mode 100644 (file)
index 0000000..1bcc41d
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_d1.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_f0.tga b/gfx/menu/wickedx/radiobutton_f0.tga
new file mode 100644 (file)
index 0000000..237e09b
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_f0.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_f1.tga b/gfx/menu/wickedx/radiobutton_f1.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_f1.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_n0.tga b/gfx/menu/wickedx/radiobutton_n0.tga
new file mode 100644 (file)
index 0000000..55dae24
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_n0.tga differ
diff --git a/gfx/menu/wickedx/radiobutton_n1.tga b/gfx/menu/wickedx/radiobutton_n1.tga
new file mode 100644 (file)
index 0000000..68ed15e
Binary files /dev/null and b/gfx/menu/wickedx/radiobutton_n1.tga differ
diff --git a/gfx/menu/wickedx/scrollbar_c.tga b/gfx/menu/wickedx/scrollbar_c.tga
new file mode 100644 (file)
index 0000000..eb4326d
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_c.tga differ
diff --git a/gfx/menu/wickedx/scrollbar_f.tga b/gfx/menu/wickedx/scrollbar_f.tga
new file mode 100644 (file)
index 0000000..eb4326d
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_f.tga differ
diff --git a/gfx/menu/wickedx/scrollbar_n.tga b/gfx/menu/wickedx/scrollbar_n.tga
new file mode 100644 (file)
index 0000000..eb4326d
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_n.tga differ
diff --git a/gfx/menu/wickedx/scrollbar_s.tga b/gfx/menu/wickedx/scrollbar_s.tga
new file mode 100644 (file)
index 0000000..c7d4700
Binary files /dev/null and b/gfx/menu/wickedx/scrollbar_s.tga differ
diff --git a/gfx/menu/wickedx/skinpreview.jpg b/gfx/menu/wickedx/skinpreview.jpg
new file mode 100755 (executable)
index 0000000..9b8e393
Binary files /dev/null and b/gfx/menu/wickedx/skinpreview.jpg differ
diff --git a/gfx/menu/wickedx/skinvalues.txt b/gfx/menu/wickedx/skinvalues.txt
new file mode 100755 (executable)
index 0000000..b2b0a97
--- /dev/null
@@ -0,0 +1,224 @@
+title Default // "WickedX"
+author sev
+
+// Colors: 'Red Green Blue'
+// Suffixes: Clicked (_c), Disabled (_d), Focused (_f), Normal (_n)
+
+// Background layer scaling:
+//   Crop (c), Letterbox (l), Height (h), Width (w), Stretch (s)
+// Background layer positioning:
+//   Top Left (7), Top Center (8) Top Right (9)
+//   Middle Left (4), Middle Center (5) Middle Right (6)
+//   Bottom Left (1), Bottom Center (2) Bottom Right (3)
+// ALIGN_BACKGROUND(_INGAME) spspsp, s=Scale p=Position
+
+//------------------------------------------------------------------------------
+// Structure (e.g. positions, sizes, margins)
+//------------------------------------------------------------------------------
+// item: color picker
+//   uses "colorpicker" images
+MARGIN_COLORPICKER              '0 0 0'
+
+// item: dialog
+//   uses "border" images
+//   uses "closebutton" images
+MARGIN_TOP                      8
+MARGIN_BOTTOM                   8
+MARGIN_LEFT                     8
+MARGIN_RIGHT                    8
+MARGIN_COLUMNS                  4
+MARGIN_ROWS                     4
+HEIGHT_DIALOGBORDER             1
+
+// font sizes (used for everything)
+FONTSIZE_NORMAL                 12
+HEIGHT_NORMAL                   1.5
+FONTSIZE_TITLE                  16
+HEIGHT_TITLE                    1.5
+HEIGHT_ZOOMEDTITLE              -1
+
+// general 
+//   uses "background" images
+//   uses "background_ingame" images
+ALIGN_BACKGROUND                h5h5
+ALIGN_BACKGROUND_INGAME         h5
+ALPHA_BACKGROUND_INGAME         1
+ALPHA_DISABLED                  0.2
+ALPHA_BEHIND                    0.5
+ALPHA_TEXT                      0.7
+
+// mouse
+//   uses "cursor" images
+SIZE_CURSOR                     '32 32 0'
+OFFSET_CURSOR                   '0 0 0'
+ALPHA_CURSOR_INTRO              0
+
+// nexposee positions of windows (they are the scale transformation
+// centers, NOT the actual positions of the windows!)
+POSITION_DIALOG_MULTIPLAYER     '0.8 0.4 0'
+POSITION_DIALOG_SINGLEPLAYER    '0.2 0.4 0'
+POSITION_DIALOG_SETTINGS        '0.5 0.95 0'
+POSITION_DIALOG_CREDITS         '-0.05 1.2 0'
+POSITION_DIALOG_QUIT            '1.05 1.2 0'
+
+// tooltips
+//   uses "tooltip" images
+MARGIN_TOOLTIP                  '8 8 0'
+BORDER_TOOLTIP                  '16 16 0'
+FONTSIZE_TOOLTIP                12
+ALPHA_TOOLTIP                   0.7
+WIDTH_TOOLTIP                   0.3
+AVOID_TOOLTIP                   '8 8 0'
+
+//------------------------------------------------------------------------------
+// Colors (e.g. font colors, field colors)
+//------------------------------------------------------------------------------
+// item: campaign
+ALPHA_CAMPAIGN_SELECTABLE       0.8
+COLOR_CAMPAIGN_SELECTABLE       '1 1 1'
+ALPHA_CAMPAIGN_CURRENT          1
+COLOR_CAMPAIGN_CURRENT          '1 1 1'
+ALPHA_CAMPAIGN_FUTURE           0.2
+COLOR_CAMPAIGN_FUTURE           '1 1 1'
+ALPHA_CAMPAIGN_DESCRIPTION      0.7
+
+// item: credits list
+COLOR_CREDITS_TITLE             '0.875 0.375 0'
+ALPHA_CREDITS_TITLE             1
+COLOR_CREDITS_FUNCTION          '0 0.1875 0.4375'
+ALPHA_CREDITS_FUNCTION          0.5
+COLOR_CREDITS_PERSON            '0 0.375 0.75'
+ALPHA_CREDITS_PERSON            0.875
+ROWS_CREDITS                    20
+WIDTH_CREDITS                   0.5
+
+// item: cvar list
+ALPHA_CVARLIST_SAVED            1
+ALPHA_CVARLIST_TEMPORARY        0.7    
+COLOR_CVARLIST_CHANGED          '0 0.375 0.75' 
+COLOR_CVARLIST_REVERTBUTTON     '1 0 0'
+COLOR_CVARLIST_UNCHANGED        '1 1 1'
+
+// item: list box
+COLOR_LISTBOX_SELECTED          '0.875 0.375 0'
+ALPHA_LISTBOX_SELECTED          1
+COLOR_LISTBOX_WAITING           '1 1 1'
+ALPHA_LISTBOX_WAITING           0.5
+
+// item: map list
+COLOR_MAPLIST_TITLE             '1 1 1'
+COLOR_MAPLIST_AUTHOR            '0 0.375 0.75'
+COLOR_MAPLIST_INCLUDEDBG        '0 0.1875 0.4375'
+ALPHA_MAPLIST_INCLUDEDFG        1
+ALPHA_MAPLIST_INCLUDEDBG        0.375
+ALPHA_MAPLIST_NOTINCLUDEDFG     0.25
+
+// item: nexposee
+ALPHAS_MAINMENU                 '0.8 0.9 1'
+
+// item: player model
+COLOR_MODELTITLE                '1 1 1'
+ALPHA_MODELTITLE                1
+
+// item: server info
+COLOR_SERVERINFO_NAME           '1 1 1'
+COLOR_SERVERINFO_IP             '0.875 0.375 0'
+
+// item: server list
+ALPHA_SERVERLIST_FULL           0.4
+ALPHA_SERVERLIST_EMPTY          0.7
+COLOR_SERVERLIST_LOWPING        '0 1 0'
+COLOR_SERVERLIST_MEDPING        '1 0.75 0'
+COLOR_SERVERLIST_HIGHPING       '1 0 0'
+ALPHA_SERVERLIST_HIGHPING       0.4
+ALPHA_SERVERLIST_FAVORITE       0.8
+COLOR_SERVERLIST_FAVORITE       '1 1 1'
+
+// item: skin list
+COLOR_SKINLIST_TITLE            '1 1 1'
+COLOR_SKINLIST_AUTHOR           '0 0.375 0.75'
+
+//------------------------------------------------------------------------------
+// Images (colors multiplied to images)
+//------------------------------------------------------------------------------
+// item: button
+//   uses "button" images
+//   uses "buttongray" images
+//   uses "bigbutton" images
+//   uses "bigbuttongray" images
+COLOR_BUTTON_N                  '1 1 1'
+COLOR_BUTTON_C                  '1 1 1'
+COLOR_BUTTON_F                  '1 1 1'
+COLOR_BUTTON_D                  '1 1 1'
+
+// item: checkbox
+//   uses "checkbox" images
+COLOR_CHECKBOX_N                '1 1 1'
+COLOR_CHECKBOX_C                '0.5 0.75 1'
+COLOR_CHECKBOX_F                '0.5 0.75 1'
+COLOR_CHECKBOX_D                '1 1 1'
+
+// item: crosshair button
+//   uses "crosshairbutton" images
+
+// dialog background colors
+//   uses "border" images
+COLOR_DIALOG_MULTIPLAYER        '1 1 1'
+COLOR_DIALOG_SETTINGS           '1 1 1'
+COLOR_DIALOG_TEAMSELECT         '1 1 1'
+COLOR_DIALOG_QUIT               '1 1 1'
+COLOR_DIALOG_ADVANCED           '1 1 1'
+COLOR_DIALOG_MUTATORS           '1 1 1'
+COLOR_DIALOG_MAPINFO            '1 1 1'
+COLOR_DIALOG_USERBIND           '1 1 1'
+COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
+COLOR_DIALOG_CREDITS            '1 1 1'
+COLOR_DIALOG_WEAPONS            '1 1 1'
+COLOR_DIALOG_WAYPOINTS          '1 1 1'
+COLOR_DIALOG_SERVERINFO         '1 1 1'
+COLOR_DIALOG_CVARS              '1 0 0'
+
+// item: input box
+//   uses "inputbox" images
+COLOR_INPUTBOX_N                '1 1 1'
+COLOR_INPUTBOX_F                '1 1 1'
+MARGIN_INPUTBOX_CHARS           1
+
+// item: key grabber
+COLOR_KEYGRABBER_TITLES         '1 1 1'
+ALPHA_KEYGRABBER_TITLES         1
+COLOR_KEYGRABBER_KEYS           '1 1 1'
+ALPHA_KEYGRABBER_KEYS           0.7
+
+// item: player color button
+//   uses "colorbutton" images
+//   uses "color" images
+
+// item: player name editor
+//   uses "charmap" images
+//   uses "charmapbutton" images
+
+// item: radio button
+//   uses "radiobutton" images
+COLOR_RADIOBUTTON_N             '1 1 1'
+COLOR_RADIOBUTTON_C             '1 1 1'
+COLOR_RADIOBUTTON_F             '1 1 1'
+COLOR_RADIOBUTTON_D             '1 1 1'
+
+// item: scrollbar
+//   uses "scrollbar" images
+COLOR_SCROLLBAR_N               '1 1 1'
+COLOR_SCROLLBAR_C               '0.5 0.75 1'
+COLOR_SCROLLBAR_F               '0.5 0.75 1'
+COLOR_SCROLLBAR_S               '0.25 0.25 0.25'
+WIDTH_SCROLLBAR                 16
+
+// item: slider
+//   uses "slider" images
+COLOR_SLIDER_N                  '1 1 1'
+COLOR_SLIDER_C                  '0.5 0.75 1'
+COLOR_SLIDER_F                  '0.5 0.75 1'
+COLOR_SLIDER_D                  '1 1 1'
+COLOR_SLIDER_S                  '0.25 0.25 0.25'
+WIDTH_SLIDERTEXT                0.333333333333
+TOLERANCE_SLIDER                '0.2 2 0'
diff --git a/gfx/menu/wickedx/slider_c.tga b/gfx/menu/wickedx/slider_c.tga
new file mode 100644 (file)
index 0000000..42e3e98
Binary files /dev/null and b/gfx/menu/wickedx/slider_c.tga differ
diff --git a/gfx/menu/wickedx/slider_d.tga b/gfx/menu/wickedx/slider_d.tga
new file mode 100644 (file)
index 0000000..87ccbe5
Binary files /dev/null and b/gfx/menu/wickedx/slider_d.tga differ
diff --git a/gfx/menu/wickedx/slider_f.tga b/gfx/menu/wickedx/slider_f.tga
new file mode 100644 (file)
index 0000000..42e3e98
Binary files /dev/null and b/gfx/menu/wickedx/slider_f.tga differ
diff --git a/gfx/menu/wickedx/slider_n.tga b/gfx/menu/wickedx/slider_n.tga
new file mode 100644 (file)
index 0000000..42e3e98
Binary files /dev/null and b/gfx/menu/wickedx/slider_n.tga differ
diff --git a/gfx/menu/wickedx/slider_s.tga b/gfx/menu/wickedx/slider_s.tga
new file mode 100644 (file)
index 0000000..954c90c
Binary files /dev/null and b/gfx/menu/wickedx/slider_s.tga differ
diff --git a/gfx/menu/wickedx/tooltip.tga b/gfx/menu/wickedx/tooltip.tga
new file mode 100644 (file)
index 0000000..1dc5679
Binary files /dev/null and b/gfx/menu/wickedx/tooltip.tga differ
index 45df74f223564da7c19369f7158363dd6ca1f681..e069ad94add8fd64353b0f3e185a4e62f819f7da 100644 (file)
@@ -13,7 +13,7 @@ alias _seekdemo_3_0 "playdemo \"$_demo_name\"; _seekdemo_4; defer 10 _seekdemo_9
 alias _seekdemo_3_1 "_seekdemo_7"
 alias _seekdemo_4 "set _demo_good 0; cl_cmd rpn /_demo_good 1 def; _seekdemo_5"
 alias _seekdemo_5 "_seekdemo_6_$_demo_good"
-alias _seekdemo_6_0 "defer 0.001 _seekdemo_4"
+alias _seekdemo_6_0 "defer 0.02 _seekdemo_4"
 alias _seekdemo_6_1 "defer clear; _seekdemo_7"
 alias _seekdemo_7 "set _demo_time_step 2; cl_cmd rpn _demo_time time gt /_demo_time_step exch def; _seekdemo_8"
 alias _seekdemo_8 "_seekdemo_9_$_demo_time_step"
index c8c8217a0195de32b06e82e3fa1d8ec6059fd4e3..45447d009273a1ea79df00475b5beb0e608eb086 100644 (file)
@@ -44,7 +44,7 @@ msgstr ""
 
 #: qcsrc/menu/item/gecko.c:49
 msgid "Browser not initialized!"
-msgstr "Navegador no inicializado!"
+msgstr "¡Navegador no inicializado!"
 
 #: qcsrc/menu/item/label.c:63
 #, c-format
@@ -841,7 +841,7 @@ msgstr "Seleccionar ninguno"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:119
 msgid "Start Multiplayer!"
-msgstr "Comenzar Multijugador!"
+msgstr "¡Comenzar Multijugador!"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create.c:154
 msgid "Capture limit:"
@@ -873,11 +873,11 @@ msgstr "Configuración del juego:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:28
 msgid "Allow spectating"
-msgstr "Permitir espectador"
+msgstr "Permitir espectadores"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:31
 msgid "Spawn shield:"
-msgstr "Proteccion del colocado:"
+msgstr "Tiempo de protección al resucitar:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c:36
 msgid "Game speed:"
@@ -1023,7 +1023,7 @@ msgstr "NIX"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:74
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:205
 msgid "Rocket Flying"
-msgstr "Vuelo de cohete"
+msgstr "Volar con Cohetes"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:78
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:264
@@ -1047,7 +1047,7 @@ msgstr "Gancho"
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:86
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:173
 msgid "Midair"
-msgstr "aire"
+msgstr "No saltes"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:88
 #: qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c:176
@@ -1167,7 +1167,7 @@ msgstr "Información..."
 #: qcsrc/menu/xonotic/dialog_multiplayer_join.c:72
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c:317
 msgid "Join!"
-msgstr "Ingresar!"
+msgstr "¡Ingresar!"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c:5
 msgid "Server Information"
@@ -1287,7 +1287,7 @@ msgstr "Campo de visión:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:92
 msgid "View bobbing:"
-msgstr "Ver flotando:"
+msgstr "Vista flotante:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:96
 msgid "Zoom factor:"
@@ -1312,11 +1312,11 @@ msgstr "Por arma"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:130
 msgid "Crosshair size:"
-msgstr "Tamaño da mira:"
+msgstr "Tamaño de mira:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:134
 msgid "Crosshair alpha:"
-msgstr "Transparencia da mira:"
+msgstr "Transparencia de mira:"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c:138
 msgid "Crosshair color:"
@@ -1413,7 +1413,7 @@ msgstr "Daño colateral:"
 #: qcsrc/menu/xonotic/dialog_settings_misc.c:41
 #: qcsrc/menu/xonotic/dialog_settings_video.c:109
 msgid "Apply immediately"
-msgstr "Aplicar imediatamente"
+msgstr "Aplicar inmediatamente"
 
 #: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c:5
 msgid "Waypoints"
@@ -2266,11 +2266,11 @@ msgstr "Jugador"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.c:59
 msgid "Instant action! (random map with bots)"
-msgstr "Accion instantanea! (Mapa aleatorio con bots)"
+msgstr "¡Accion instantanea! (Mapa aleatorio con bots)"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer.c:80
 msgid "Start Singleplayer!"
-msgstr "Comenzar!"
+msgstr "¡Comenzar!"
 
 #: qcsrc/menu/xonotic/dialog_singleplayer_winner.c:4
 msgid "Winner"
@@ -2306,7 +2306,7 @@ msgstr "espectador"
 
 #: qcsrc/menu/xonotic/mainwindow.c:35 qcsrc/menu/xonotic/mainwindow.c:38
 msgid "Do not press this button again!"
-msgstr "No vuelva a presionar este boton!"
+msgstr "¡No vuelva a presionar este boton!"
 
 #: qcsrc/menu/xonotic/maplist.c:278
 msgid ""
@@ -2433,7 +2433,7 @@ msgstr "^1%s TEST BUILD"
 #: qcsrc/menu/xonotic/util.qc:432
 #, c-format
 msgid "Update to %s now!"
-msgstr "Actualizar para %s ahora!"
+msgstr "¡Actualizar para %s ahora!"
 
 #: qcsrc/menu/xonotic/util.qc:501
 msgid ""
diff --git a/models/casing_bronze.iqm b/models/casing_bronze.iqm
new file mode 100644 (file)
index 0000000..e48e20a
Binary files /dev/null and b/models/casing_bronze.iqm differ
diff --git a/models/casing_bronze.mdl b/models/casing_bronze.mdl
deleted file mode 100644 (file)
index 54cb526..0000000
Binary files a/models/casing_bronze.mdl and /dev/null differ
diff --git a/models/casing_bronze.tga b/models/casing_bronze.tga
new file mode 100644 (file)
index 0000000..af11786
Binary files /dev/null and b/models/casing_bronze.tga differ
diff --git a/models/casing_bronze_gloss.tga b/models/casing_bronze_gloss.tga
new file mode 100644 (file)
index 0000000..9c06707
Binary files /dev/null and b/models/casing_bronze_gloss.tga differ
diff --git a/models/casing_bronze_norm.tga b/models/casing_bronze_norm.tga
new file mode 100644 (file)
index 0000000..77d85bf
Binary files /dev/null and b/models/casing_bronze_norm.tga differ
diff --git a/models/casing_bronze_reflect.tga b/models/casing_bronze_reflect.tga
new file mode 100644 (file)
index 0000000..9c06707
Binary files /dev/null and b/models/casing_bronze_reflect.tga differ
index d809c79802b2b5e4effa7fecef4e48aff5441e1f..269f93087d77a7b996e001cdaa29d77715865d3d 100644 (file)
@@ -107,7 +107,7 @@ void Ent_Casing(float isNew)
                                casing.cnt = time + autocvar_cl_casings_shell_time;
                                break;
                        default:
-                               setmodel(casing, "models/casing_bronze.mdl");
+                               setmodel(casing, "models/casing_bronze.iqm");
                                casing.cnt = time + autocvar_cl_casings_bronze_time;
                                break;
                }
@@ -123,7 +123,7 @@ void Ent_Casing(float isNew)
 void Casings_Precache()
 {
        precache_model("models/casing_shell.mdl");
-       precache_model("models/casing_bronze.mdl");
+       precache_model("models/casing_bronze.iqm");
        precache_sound("weapons/brass1.wav");
        precache_sound("weapons/brass2.wav");
        precache_sound("weapons/brass3.wav");
index 3e45e416492ce6eab51eb631c85d4554f6adf746..edaea12312a7b61cc1dc7e4ac039f24a73cbc5ea 100644 (file)
@@ -129,6 +129,10 @@ void() m_init_delayed =
                draw_currentSkin = "gfx/menu/default";
                fh = fopen(language_filename(strcat(draw_currentSkin, "/skinvalues.txt")), FILE_READ);
        }
+       if(fh < 0)
+       {
+               error("cannot load any menu skin\n");
+       }
        draw_currentSkin = strzone(draw_currentSkin);
        while((s = fgets(fh)))
        {
index ff99823330df8ac13212d5d79facd93fc7b3f5a3..492f017832d9f20d363fe706487d7c64fa793033 100644 (file)
@@ -712,6 +712,7 @@ float autocvar_g_ca_damage2score_multiplier;
 float autocvar_g_ca_point_leadlimit;
 float autocvar_g_ca_point_limit;
 float autocvar_g_ca_round_timelimit;
+float autocvar_g_ca_spectate_enemies;
 float autocvar_g_ca_warmup;
 float autocvar_g_campaign;
 float autocvar_g_campaign_forceteam;
index 076e969685e2c30fde561aeaddec6eab7e090420..c48545e5aa2c922e60a7503b6c4103a4f8842221 100644 (file)
@@ -411,10 +411,10 @@ float waypoint_load_links()
 
                        if(!found)
                        {
-                               // can't find that waypoint
-                               fclose(file);
-                               return FALSE;
+                               dprint("waypoint_load_links: couldn't find 'from' waypoint at ", vtos(wp_from.origin),"\n");
+                               continue;
                        }
+
                }
 
                // Search "to" waypoint
@@ -433,9 +433,8 @@ float waypoint_load_links()
 
                if(!found)
                {
-                       // can't find that waypoint
-                       fclose(file);
-                       return FALSE;
+                       dprint("waypoint_load_links: couldn't find 'to' waypoint at ", vtos(wp_to.origin),"\n");
+                       continue;
                }
 
                ++c;
index f3d34bb47531dcef705aa032d86a40fb8fae9db2..26d37400fd6449a9935c51b0b579d2fada848dbf 100644 (file)
@@ -739,6 +739,13 @@ void PutObserverInServer (void)
                else
                        self.frags = FRAGS_LMS_LOSER;
        }
+       else if(g_ca)
+       {
+               if(self.caplayer)
+                       self.frags = FRAGS_LMS_LOSER;
+               else
+                       self.frags = FRAGS_SPECTATOR;
+       }
        else
                self.frags = FRAGS_SPECTATOR;
 }
@@ -2359,12 +2366,41 @@ float SpectateUpdate() {
        return 1;
 }
 
-float SpectateNext() {
-       other = find(self.enemy, classname, "player");
 
-       if (!other)
+// Returns next available player to spectate if g_ca_spectate_enemies == 0
+entity CA_SpectateNext(entity start) {
+       if (start.team == self.team) {
+               return start;
+       }
+       
+       other = start;
+       // continue from current player
+       while(other && other.team != self.team) {
                other = find(other, classname, "player");
+       }
+       
+       if (!other) {
+               // restart from begining
+               other = find(other, classname, "player");
+               while(other && other.team != self.team) {
+                       other = find(other, classname, "player");
+               }
+       }
+       
+       return other;
+}
 
+float SpectateNext() {
+       other = find(self.enemy, classname, "player");
+       if (g_ca && !autocvar_g_ca_spectate_enemies && self.caplayer) {
+               // CA and ca players when spectating enemies is forbidden
+               other = CA_SpectateNext(other);
+       } else {
+               // other modes and ca spectators or spectating enemies is allowed
+               if (!other)
+                       other = find(other, classname, "player");
+       }
+       
        if (other)
                self.enemy = other;
 
diff --git a/scripts/casings.shader b/scripts/casings.shader
new file mode 100644 (file)
index 0000000..9286c43
--- /dev/null
@@ -0,0 +1,15 @@
+models/casing_bronze
+{
+       dpglossintensitymod  2
+       dpglossexponentmod  4
+       dpreflectcube env/exomorph/exomorph
+       {
+               map models/casing_bronze.tga
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
index 5c48a627fcc8cf9236befc389507fcb2f5ac9873..8f2ddab6c9ad842b1d5578a6b1d4c9b48abadb1e 100644 (file)
@@ -5,7 +5,7 @@ Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
 Samual "Ares" Lenks
-mand1nga
+Saulo "mand1nga" Gil
 Jakob "tZork" Markström Gröhn
 
 **Coordinators
@@ -62,7 +62,7 @@ by Forest "LordHavoc" Hale
 **Translators
 
 *Dutch
-freefang
+Alexander "freefang" van Dam
 PinkRobot
 
 *German
@@ -115,15 +115,15 @@ Kristian "morfar" Johansson
 kuniuthefrogg
 magorian
 Maik "SavageX" Merten
-Mick Rippon
 Marvin "Mirio" Beck
+Mick Rippon
 MrBougo
 parasti
 Paul Scott
 PlasmaSheep
 Przemysław "atheros" Grzywacz
 Ruszkai "C.Brutail" Ákos
-Sc0rp
+{SC0RP} - Ian "ID" Dorrell
 Severin "sev" Meyer
 SoulKeeper_p
 Stephan "esteel" Stahl