Update Luma menu theme. New checkbox, radiobutton, colorbutton. Also some cleanup

diff --git a/gfx/menu/luma/checkbox_c0.tga b/gfx/menu/luma/checkbox_c0.tga
index 2351258155fc680ae69c0ca2c6cac01e62a645a7..f8e6960cc260e7d0a339625bd51c7d2c57d24e78 100644 (file)
Binary files a/gfx/menu/luma/checkbox_c0.tga and b/gfx/menu/luma/checkbox_c0.tga differ

diff --git a/gfx/menu/luma/checkbox_c1.tga b/gfx/menu/luma/checkbox_c1.tga
index cf88e35f19035c78506fb63506c144e4e0570d81..32d2f6d7b59f65039a9aebfd60c8f0768144b0ad 100644 (file)
Binary files a/gfx/menu/luma/checkbox_c1.tga and b/gfx/menu/luma/checkbox_c1.tga differ

diff --git a/gfx/menu/luma/checkbox_d0.tga b/gfx/menu/luma/checkbox_d0.tga
index f310e72aaf66dd831773853c7f94f062fcfc289f..b059ab64c4a2112538367009cf88971d339bb18d 100644 (file)
Binary files a/gfx/menu/luma/checkbox_d0.tga and b/gfx/menu/luma/checkbox_d0.tga differ

diff --git a/gfx/menu/luma/checkbox_d1.tga b/gfx/menu/luma/checkbox_d1.tga
index fbc49abd4de850c4aadf1f79dbf698ef0061eeae..e38b9629ceb145fbb77cb06e1c17df96b3556ee5 100644 (file)
Binary files a/gfx/menu/luma/checkbox_d1.tga and b/gfx/menu/luma/checkbox_d1.tga differ

diff --git a/gfx/menu/luma/checkbox_f0.tga b/gfx/menu/luma/checkbox_f0.tga
index b85f2fef91b9847d7981cf3c2708ddd8c4f391ce..5201675e6778e8c2c6f7b473b620df3a53e351dc 100644 (file)
Binary files a/gfx/menu/luma/checkbox_f0.tga and b/gfx/menu/luma/checkbox_f0.tga differ

diff --git a/gfx/menu/luma/checkbox_f1.tga b/gfx/menu/luma/checkbox_f1.tga
index ccb6a6ca60ba2e9ff5bf7d854ec4710e90541fb1..116b29c80d90deb1cc820b3bcf720642334ffc44 100644 (file)
Binary files a/gfx/menu/luma/checkbox_f1.tga and b/gfx/menu/luma/checkbox_f1.tga differ

diff --git a/gfx/menu/luma/checkbox_n0.tga b/gfx/menu/luma/checkbox_n0.tga
index 7fb1e26dfb1ca483f2a8f7f22a551d4b86399493..9786dc84ed431a56db68ed4fc4343c7e1630ea33 100644 (file)
Binary files a/gfx/menu/luma/checkbox_n0.tga and b/gfx/menu/luma/checkbox_n0.tga differ

diff --git a/gfx/menu/luma/checkbox_n1.tga b/gfx/menu/luma/checkbox_n1.tga
index 0f949b453d1efeb615867ae226c1d60d10d588e9..427d3ce421dffb55ae2c2af3f69d5dcdb0df88cc 100644 (file)
Binary files a/gfx/menu/luma/checkbox_n1.tga and b/gfx/menu/luma/checkbox_n1.tga differ

diff --git a/gfx/menu/luma/color.tga b/gfx/menu/luma/color.tga
deleted file mode 100644 (file)
index d9ccf78..0000000
Binary files a/gfx/menu/luma/color.tga and /dev/null differ

diff --git a/gfx/menu/luma/colorbutton_c.tga b/gfx/menu/luma/colorbutton_c.tga
index 9d8f120bc1d32889773ed3db32524840bd9093f6..5f1fc2bcd79eeb072bd996daa9104290e65fd9d6 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_c.tga and b/gfx/menu/luma/colorbutton_c.tga differ

diff --git a/gfx/menu/luma/colorbutton_f.tga b/gfx/menu/luma/colorbutton_f.tga
index 890354e1ff500ff92eb561f7962ce109112b25f6..0ca0d9b6b8a26e0d440611fbdd965835febfc2a4 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_f.tga and b/gfx/menu/luma/colorbutton_f.tga differ

diff --git a/gfx/menu/luma/colorbutton_n.tga b/gfx/menu/luma/colorbutton_n.tga
index d3b74ab34035eba3e363f224b877c796c9bb3a85..26e6da5bff0ba5a2a0b590a6220a71456e2c4bb5 100644 (file)
Binary files a/gfx/menu/luma/colorbutton_n.tga and b/gfx/menu/luma/colorbutton_n.tga differ

diff --git a/gfx/menu/luma/crosshairbutton_c.tga b/gfx/menu/luma/crosshairbutton_c.tga
index d258735b4801a66ea9670b559a95ee2089a0b5c5..ecfd0a86e0c953d257a710a3d41528ebdf32c53d 100644 (file)
Binary files a/gfx/menu/luma/crosshairbutton_c.tga and b/gfx/menu/luma/crosshairbutton_c.tga differ

diff --git a/gfx/menu/luma/crosshairbutton_f.tga b/gfx/menu/luma/crosshairbutton_f.tga
index cc3cff6ab5606313d88bab490b70c47afbe2e9da..604a935bc9d05b92c617d5c283f7bd3d1ad95537 100644 (file)
Binary files a/gfx/menu/luma/crosshairbutton_f.tga and b/gfx/menu/luma/crosshairbutton_f.tga differ

diff --git a/gfx/menu/luma/gametype_as.tga b/gfx/menu/luma/gametype_as.tga
index c5241bc131a67183e3b4663bc8de6d35229fdf7b..85eda570f90efc1ef44b0e3e3a9cf66dc5d48d80 100644 (file)
Binary files a/gfx/menu/luma/gametype_as.tga and b/gfx/menu/luma/gametype_as.tga differ

diff --git a/gfx/menu/luma/gametype_ca.tga b/gfx/menu/luma/gametype_ca.tga
index ebf22982d2ad8ce3893d3babe9e9bff1512f0295..668b57e047cb480521ba6c97746b50f2bc96796c 100644 (file)
Binary files a/gfx/menu/luma/gametype_ca.tga and b/gfx/menu/luma/gametype_ca.tga differ

diff --git a/gfx/menu/luma/gametype_ctf.tga b/gfx/menu/luma/gametype_ctf.tga
index 61c897e548c5d371ed4e1df35c9aeab292cb3bf8..7eb0c8e171a76c6b913780672e81f2727a550a78 100644 (file)
Binary files a/gfx/menu/luma/gametype_ctf.tga and b/gfx/menu/luma/gametype_ctf.tga differ

diff --git a/gfx/menu/luma/gametype_cts.tga b/gfx/menu/luma/gametype_cts.tga
index c524b96035b67223de1d253c806ac52584eda247..235da2f1665f25a8f50602d7f737671099de5372 100644 (file)
Binary files a/gfx/menu/luma/gametype_cts.tga and b/gfx/menu/luma/gametype_cts.tga differ

diff --git a/gfx/menu/luma/gametype_dm.tga b/gfx/menu/luma/gametype_dm.tga
index 605486b7e9432cedef369a423fb92ef659d8e137..0ce1d16fa52e9b57888acacd40b5f5f615ac3b84 100644 (file)
Binary files a/gfx/menu/luma/gametype_dm.tga and b/gfx/menu/luma/gametype_dm.tga differ

diff --git a/gfx/menu/luma/gametype_dom.tga b/gfx/menu/luma/gametype_dom.tga
index f4f76ac7c74bb6ae930d1d53930a15235225f695..fcaa2f3ab239ec57f9607104c0bf3613630763f5 100644 (file)
Binary files a/gfx/menu/luma/gametype_dom.tga and b/gfx/menu/luma/gametype_dom.tga differ

diff --git a/gfx/menu/luma/gametype_duel.tga b/gfx/menu/luma/gametype_duel.tga
index a77b8de4ee24d27bd4128821b40204df5512a868..88163164c564a0658723cfcec0c262176865b839 100644 (file)
Binary files a/gfx/menu/luma/gametype_duel.tga and b/gfx/menu/luma/gametype_duel.tga differ

diff --git a/gfx/menu/luma/gametype_ft.tga b/gfx/menu/luma/gametype_ft.tga
index a26f9f7824e60870ae04eb77718eb476c4876c29..515a3f870050417bf67baeb5dc9c0543b61ece69 100644 (file)
Binary files a/gfx/menu/luma/gametype_ft.tga and b/gfx/menu/luma/gametype_ft.tga differ

diff --git a/gfx/menu/luma/gametype_inf.tga b/gfx/menu/luma/gametype_inf.tga
index 874632e13a4cca06f87b0e5b2c416e6613748ea8..bcbbd6c3cf797a3779e9bfbc26719251011c1f37 100644 (file)
Binary files a/gfx/menu/luma/gametype_inf.tga and b/gfx/menu/luma/gametype_inf.tga differ

diff --git a/gfx/menu/luma/gametype_jb.tga b/gfx/menu/luma/gametype_jb.tga
index f122dc59b10ec38cbd77545501caa62df13653a9..7971be376f9928cfd6d225ae7291c912d2e601d5 100644 (file)
Binary files a/gfx/menu/luma/gametype_jb.tga and b/gfx/menu/luma/gametype_jb.tga differ

diff --git a/gfx/menu/luma/gametype_ka.tga b/gfx/menu/luma/gametype_ka.tga
index 8fb387f494be6b125f488fd9e5887a475ce5747f..b4c30c967a7a4387ac211759c5cbddedb9d2722b 100644 (file)
Binary files a/gfx/menu/luma/gametype_ka.tga and b/gfx/menu/luma/gametype_ka.tga differ

diff --git a/gfx/menu/luma/gametype_kh.tga b/gfx/menu/luma/gametype_kh.tga
index 198c55474f74a317a46dcd8706c4297bdc8f4526..bdca280501a6f26d0e3371fd1bd7be6edecdc2ca 100644 (file)
Binary files a/gfx/menu/luma/gametype_kh.tga and b/gfx/menu/luma/gametype_kh.tga differ

diff --git a/gfx/menu/luma/gametype_lms.tga b/gfx/menu/luma/gametype_lms.tga
index d69af28561d26ced137246b8b4c33edf8df01a84..33e2be70d4fffaf88f80fc8ce9f2c88820010912 100644 (file)
Binary files a/gfx/menu/luma/gametype_lms.tga and b/gfx/menu/luma/gametype_lms.tga differ

diff --git a/gfx/menu/luma/gametype_nb.tga b/gfx/menu/luma/gametype_nb.tga
index 4cd3862048a0aa9f59366e12feff0c4c793295cd..9bfb5adc4c65222fe7cf9a1ed2a917aed28de718 100644 (file)
Binary files a/gfx/menu/luma/gametype_nb.tga and b/gfx/menu/luma/gametype_nb.tga differ

diff --git a/gfx/menu/luma/gametype_ons.tga b/gfx/menu/luma/gametype_ons.tga
index d10dff98a3f3f334bbd2ff3179a6ef0910163f0f..a9a0f175249d02aa1d8752032a01e60e9a989ff1 100644 (file)
Binary files a/gfx/menu/luma/gametype_ons.tga and b/gfx/menu/luma/gametype_ons.tga differ

diff --git a/gfx/menu/luma/gametype_rc.tga b/gfx/menu/luma/gametype_rc.tga
index f47122c3bf976ddf6149a6608ec1613b0133bc5d..10d7e41ed0e360f258c49cffdb050e1815e1b792 100644 (file)
Binary files a/gfx/menu/luma/gametype_rc.tga and b/gfx/menu/luma/gametype_rc.tga differ

diff --git a/gfx/menu/luma/gametype_tdm.tga b/gfx/menu/luma/gametype_tdm.tga
index 646dacba9869a2686ba35db4c8b683d3580ad14a..289641e902e5f5787982fec84a8f267c50fba78d 100644 (file)
Binary files a/gfx/menu/luma/gametype_tdm.tga and b/gfx/menu/luma/gametype_tdm.tga differ

diff --git a/gfx/menu/luma/gametype_vip.tga b/gfx/menu/luma/gametype_vip.tga
index de111fa1439c2355e1c9ead99116bfc641eaa7ef..2c9eccc26349f1aaae5b8d269d06330feb2ba3bc 100644 (file)
Binary files a/gfx/menu/luma/gametype_vip.tga and b/gfx/menu/luma/gametype_vip.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel1.tga b/gfx/menu/luma/icon_aeslevel1.tga
index 9bcd47acbe90ebb7dfc2e3e550a1835fe4f197d4..22aa0ff6833922cf30db1ad4dc3d0bc85657dfc7 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel1.tga and b/gfx/menu/luma/icon_aeslevel1.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel2.tga b/gfx/menu/luma/icon_aeslevel2.tga
index 9bcd47acbe90ebb7dfc2e3e550a1835fe4f197d4..22aa0ff6833922cf30db1ad4dc3d0bc85657dfc7 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel2.tga and b/gfx/menu/luma/icon_aeslevel2.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel3.tga b/gfx/menu/luma/icon_aeslevel3.tga
index a4aa692400f38e8c09395362e37d6515e1417f9e..c90efa8c0d208c899f8cfcb1a6ceb9a332e3c460 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel3.tga and b/gfx/menu/luma/icon_aeslevel3.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel4.tga b/gfx/menu/luma/icon_aeslevel4.tga
index a4aa692400f38e8c09395362e37d6515e1417f9e..c90efa8c0d208c899f8cfcb1a6ceb9a332e3c460 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel4.tga and b/gfx/menu/luma/icon_aeslevel4.tga differ

diff --git a/gfx/menu/luma/icon_aeslevel5.tga b/gfx/menu/luma/icon_aeslevel5.tga
index a4aa692400f38e8c09395362e37d6515e1417f9e..c90efa8c0d208c899f8cfcb1a6ceb9a332e3c460 100644 (file)
Binary files a/gfx/menu/luma/icon_aeslevel5.tga and b/gfx/menu/luma/icon_aeslevel5.tga differ

diff --git a/gfx/menu/luma/icon_mod_.tga b/gfx/menu/luma/icon_mod_.tga
index b3c6bc29052bdafd9adbd8f6c830d30777649618..79a1f24504e0384a3d224de0113c76b2ae464de1 100644 (file)
Binary files a/gfx/menu/luma/icon_mod_.tga and b/gfx/menu/luma/icon_mod_.tga differ

diff --git a/gfx/menu/luma/icon_mod_MinstaGib.tga b/gfx/menu/luma/icon_mod_MinstaGib.tga
index 515ba6c8b3d22975a76aecc04f3c8f976b7ce123..ce8c2d50d7704a99a6ce9e36528dc70d9f998479 100644 (file)
Binary files a/gfx/menu/luma/icon_mod_MinstaGib.tga and b/gfx/menu/luma/icon_mod_MinstaGib.tga differ

diff --git a/gfx/menu/luma/icon_mod_NewToys.tga b/gfx/menu/luma/icon_mod_NewToys.tga
index e805c8c2208700baf9f8b9b976ca25393fe22539..c5f212c0787e03d5ae2a3d31dfffb0b1827d0bbe 100644 (file)
Binary files a/gfx/menu/luma/icon_mod_NewToys.tga and b/gfx/menu/luma/icon_mod_NewToys.tga differ

diff --git a/gfx/menu/luma/icon_mod_Overkill.tga b/gfx/menu/luma/icon_mod_Overkill.tga
index d4680d0583eb093eecb0d28f4e705e2fe0c905dc..aeeaeb883a0d02bc86c70416d00e2ec381a38e9b 100644 (file)
Binary files a/gfx/menu/luma/icon_mod_Overkill.tga and b/gfx/menu/luma/icon_mod_Overkill.tga differ

diff --git a/gfx/menu/luma/icon_mod_XDF.tga b/gfx/menu/luma/icon_mod_XDF.tga
index 7015f41e32aa79d2141fe08d6333503a7c60329d..c0b4e6dd99eaef1beeced4e0db868454a3fd28ec 100644 (file)
Binary files a/gfx/menu/luma/icon_mod_XDF.tga and b/gfx/menu/luma/icon_mod_XDF.tga differ

diff --git a/gfx/menu/luma/icon_pure1.tga b/gfx/menu/luma/icon_pure1.tga
index 5ac91cea03a7b1d121a8185a19bcf81336851ead..fbe4dc9ffacef6a30231ce81766dc638a5aa79e9 100644 (file)
Binary files a/gfx/menu/luma/icon_pure1.tga and b/gfx/menu/luma/icon_pure1.tga differ

diff --git a/gfx/menu/luma/icon_stats1.tga b/gfx/menu/luma/icon_stats1.tga
index c363c340616d3dce69b57a1628f5c137f5cee7bc..841dde650f8ccd05e7ad8303a237635510ec6699 100644 (file)
Binary files a/gfx/menu/luma/icon_stats1.tga and b/gfx/menu/luma/icon_stats1.tga differ

diff --git a/gfx/menu/luma/radiobutton_c0.tga b/gfx/menu/luma/radiobutton_c0.tga
index a43b47e6d2b69256f11b0597a6c37b3e24f0553c..8b60a1b274441481b3254ff9895e166be6d110dc 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_c0.tga and b/gfx/menu/luma/radiobutton_c0.tga differ

diff --git a/gfx/menu/luma/radiobutton_c1.tga b/gfx/menu/luma/radiobutton_c1.tga
index 185283eb06ac1dcd51772240f4e9a350cd566135..d23f9df0207126fee3a5b32274c7c663ad9aed71 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_c1.tga and b/gfx/menu/luma/radiobutton_c1.tga differ

diff --git a/gfx/menu/luma/radiobutton_d0.tga b/gfx/menu/luma/radiobutton_d0.tga
index b7e3ce0158ebd4e4f18f9cb2f83e216f3a4588d2..16a4ff8a323e0b15d88079964082eb944a67c568 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_d0.tga and b/gfx/menu/luma/radiobutton_d0.tga differ

diff --git a/gfx/menu/luma/radiobutton_d1.tga b/gfx/menu/luma/radiobutton_d1.tga
index 102c19e490e1e0b9ec374e177188957db78d461e..b4eacffbc29f574eb91b957d4df3ed10c96c090d 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_d1.tga and b/gfx/menu/luma/radiobutton_d1.tga differ

diff --git a/gfx/menu/luma/radiobutton_f0.tga b/gfx/menu/luma/radiobutton_f0.tga
index 92a2bc729ba91bd0d44d4c7bd2b069ecf9959709..59ecc0805b5826de64e4a00c7164d9c73c4a2b07 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_f0.tga and b/gfx/menu/luma/radiobutton_f0.tga differ

diff --git a/gfx/menu/luma/radiobutton_f1.tga b/gfx/menu/luma/radiobutton_f1.tga
index 3562049423bda9786a0f59eb2e84a34066307f37..396e2771a82d3fe4e94714fcada4791209d5ed2f 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_f1.tga and b/gfx/menu/luma/radiobutton_f1.tga differ

diff --git a/gfx/menu/luma/radiobutton_n0.tga b/gfx/menu/luma/radiobutton_n0.tga
index 7ca49ccc038feda1048f6bd2dc41505eefa6501c..13a96e96900895a580da08f76dae9f5fc351c7fc 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_n0.tga and b/gfx/menu/luma/radiobutton_n0.tga differ

diff --git a/gfx/menu/luma/radiobutton_n1.tga b/gfx/menu/luma/radiobutton_n1.tga
index 7e45838fd236146347f197334a1395a2a0cd363b..a64b50cc31b38d79805d86d8c485335de67b61a1 100644 (file)
Binary files a/gfx/menu/luma/radiobutton_n1.tga and b/gfx/menu/luma/radiobutton_n1.tga differ

diff --git a/gfx/menu/luma/skinvalues.txt b/gfx/menu/luma/skinvalues.txt
index 8e6c0b240361b7f0f458ff4848cf102a3b802e65..58b5b19edae1d65c5914e4b3cd147f3331e0fd4a 100644 (file)
--- a/gfx/menu/luma/skinvalues.txt
+++ b/gfx/menu/luma/skinvalues.txt
@@ -9,187 +9,191 @@ author sev
 //   1 2 3
 
 // background
-ALIGN_BACKGROUND                c5h5
-ALIGN_BACKGROUND_INGAME         c5h5
-ALPHA_BACKGROUND_INGAME         1
-ALPHA_DISABLED                  0.2
-ALPHA_BEHIND                    0.5
+ALIGN_BACKGROUND              c5h5
+ALIGN_BACKGROUND_INGAME       c5h5
+ALPHA_BACKGROUND_INGAME       1
+ALPHA_DISABLED                0.2
+ALPHA_BEHIND                  0.5
 
 // button
-COLOR_BUTTON_C                  '1 1 1'
-COLOR_BUTTON_D                  '1 1 1'
-COLOR_BUTTON_F                  '1 1 1'
-COLOR_BUTTON_N                  '1 1 1'
+COLOR_BUTTON_C                '1 1 1'
+COLOR_BUTTON_D                '1 1 1'
+COLOR_BUTTON_F                '1 1 1'
+COLOR_BUTTON_N                '1 1 1'
 
 // campaign
-ALPHA_CAMPAIGN_CURRENT          1
-ALPHA_CAMPAIGN_DESCRIPTION      0.77
-ALPHA_CAMPAIGN_FUTURE           0.2
-ALPHA_CAMPAIGN_SELECTABLE       0.8
-COLOR_CAMPAIGN_CURRENT          '1 1 1'
-COLOR_CAMPAIGN_FUTURE           '1 1 1'
-COLOR_CAMPAIGN_SELECTABLE       '1 1 1'
+ALPHA_CAMPAIGN_CURRENT        1
+COLOR_CAMPAIGN_CURRENT        '0.95 0.99 1'
+ALPHA_CAMPAIGN_DESCRIPTION    0.8
+ALPHA_CAMPAIGN_FUTURE         0.2
+COLOR_CAMPAIGN_FUTURE         '0.95 0.99 1'
+ALPHA_CAMPAIGN_SELECTABLE     0.6
+COLOR_CAMPAIGN_SELECTABLE     '0.95 0.99 1'
 
 // checkbox
-COLOR_CHECKBOX_C                '1 1 1'
-COLOR_CHECKBOX_D                '1 1 1'
-COLOR_CHECKBOX_F                '1 1 1'
-COLOR_CHECKBOX_N                '1 1 1'
+COLOR_CHECKBOX_C              '1 1 1'
+COLOR_CHECKBOX_D              '1 1 1'
+COLOR_CHECKBOX_F              '1 1 1'
+COLOR_CHECKBOX_N              '1 1 1'
 
 // clearbutton
-COLOR_CLEARBUTTON_C             '1 1 1'
-COLOR_CLEARBUTTON_F             '1 1 1'
-COLOR_CLEARBUTTON_N             '1 1 1'
-OFFSET_CLEARBUTTON              0
+COLOR_CLEARBUTTON_C           '1 1 1'
+COLOR_CLEARBUTTON_F           '1 1 1'
+COLOR_CLEARBUTTON_N           '1 1 1'
+OFFSET_CLEARBUTTON            0
 
 // colorpicker
-MARGIN_COLORPICKER              '0 0 0'
+MARGIN_COLORPICKER            '0 0 0'
 
 // credits
-ALPHA_CREDITS_FUNCTION          1
-ALPHA_CREDITS_PERSON            0.77
-ALPHA_CREDITS_TITLE             1
-COLOR_CREDITS_FUNCTION          '0.03 0.25 0.49'
-COLOR_CREDITS_PERSON            '1 1 1'
-COLOR_CREDITS_TITLE             '0.94 0.45 0.11'
-ROWS_CREDITS                    20
-WIDTH_CREDITS                   0.5
+ALPHA_CREDITS_FUNCTION        1
+COLOR_CREDITS_FUNCTION        '0.03 0.25 0.49'
+ALPHA_CREDITS_PERSON          0.8
+COLOR_CREDITS_PERSON          '0.95 0.99 1'
+ALPHA_CREDITS_TITLE           1
+COLOR_CREDITS_TITLE           '0.94 0.45 0.11'
+ROWS_CREDITS                  20
+WIDTH_CREDITS                 0.5
 
 // cursor
-SIZE_CURSOR                     '32 32 0'
-OFFSET_CURSOR                   '0.25 0.125 0'
-ALPHA_CURSOR_INTRO              0
+SIZE_CURSOR                   '32 32 0'
+OFFSET_CURSOR                 '0.25 0.125 0'
+ALPHA_CURSOR_INTRO            0
 
 // cvarlist
-ALPHA_CVARLIST_SAVED            0.85
-ALPHA_CVARLIST_TEMPORARY        0.55
-COLOR_CVARLIST_CHANGED          '0.95 0.05 0.05'
-COLOR_CVARLIST_CONTROLS         '1 0.15 0.15'
-COLOR_CVARLIST_UNCHANGED        '1 1 1'
+COLOR_CVARLIST_CHANGED        '0.95 0.05 0.05'
+COLOR_CVARLIST_CONTROLS       '1 0.2 0.15'
+COLOR_CVARLIST_UNCHANGED      '1 1 1'
+ALPHA_CVARLIST_SAVED          0.85
+ALPHA_CVARLIST_TEMPORARY      0.55
 
 // dialog color
-COLOR_DIALOG_MULTIPLAYER        '1 1 1'
-COLOR_DIALOG_SETTINGS           '1 1 1'
-COLOR_DIALOG_TEAMSELECT         '1 1 1'
-COLOR_DIALOG_SANDBOXTOOLS       '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_VIEW               '1 1 1'
-COLOR_DIALOG_MODEL              '1 1 1'
-COLOR_DIALOG_CROSSHAIR          '1 1 1'
-COLOR_DIALOG_HUD                '1 1 1'
-COLOR_DIALOG_SERVERINFO         '1 1 1'
-COLOR_DIALOG_CVARS              '1 0.15 0.15'
-COLOR_DIALOG_HUDCONFIRM         '1 0.15 0.15'
+COLOR_DIALOG_MULTIPLAYER      '1 1 1'
+COLOR_DIALOG_SETTINGS         '1 1 1'
+COLOR_DIALOG_TEAMSELECT       '1 1 1'
+COLOR_DIALOG_SANDBOXTOOLS     '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_VIEW             '1 1 1'
+COLOR_DIALOG_MODEL            '1 1 1'
+COLOR_DIALOG_CROSSHAIR        '1 1 1'
+COLOR_DIALOG_HUD              '1 1 1'
+COLOR_DIALOG_SERVERINFO       '1 1 1'
+COLOR_DIALOG_CVARS            '1 0.2 0.15'
+COLOR_DIALOG_HUDCONFIRM       '1 0.2 0.15'
 
 // dialog margins
-HEIGHT_DIALOGBORDER             1
-MARGIN_TOP                      8
-MARGIN_BOTTOM                   12
-MARGIN_LEFT                     16
-MARGIN_RIGHT                    16
-MARGIN_COLUMNS                  4
-MARGIN_ROWS                     4
+HEIGHT_DIALOGBORDER           1
+MARGIN_TOP                    8
+MARGIN_BOTTOM                 12
+MARGIN_LEFT                   16
+MARGIN_RIGHT                  16
+MARGIN_COLUMNS                4
+MARGIN_ROWS                   4
 
 // dialog scale transformation centers (NOT the actual positions)
-POSITION_DIALOG_MULTIPLAYER     '0.9 0.4 0'
-POSITION_DIALOG_SINGLEPLAYER    '0.15 0.4 0'
-POSITION_DIALOG_SETTINGS        '0.5 1 0'
-POSITION_DIALOG_CREDITS         '-0.05 1.2 0'
-POSITION_DIALOG_QUIT            '1.05 1.2 0'
+POSITION_DIALOG_MULTIPLAYER   '0.9 0.4 0'
+POSITION_DIALOG_SINGLEPLAYER  '0.15 0.4 0'
+POSITION_DIALOG_SETTINGS      '0.5 1 0'
+POSITION_DIALOG_CREDITS       '-0.05 1.2 0'
+POSITION_DIALOG_QUIT          '1.05 1.2 0'
 
 // font
-ALPHA_TEXT                      0.77
-FONTSIZE_NORMAL                 12
-FONTSIZE_TITLE                  16
-FONTSIZE_TOOLTIP                12
-HEIGHT_NORMAL                   1.5
-HEIGHT_TITLE                    1.5
-HEIGHT_ZOOMEDTITLE              -1
+ALPHA_TEXT                    0.8
+COLOR_TEXT                    '0.95 0.99 1'
+FONTSIZE_NORMAL               12
+FONTSIZE_TITLE                16
+FONTSIZE_TOOLTIP              12
+HEIGHT_NORMAL                 1.5
+HEIGHT_TITLE                  1.5
+HEIGHT_ZOOMEDTITLE            -1
 
 // inputbox
-COLOR_INPUTBOX_F                '1 1 1'
-COLOR_INPUTBOX_N                '1 1 1'
-MARGIN_INPUTBOX_CHARS           1
+COLOR_INPUTBOX_F              '1 1 1'
+COLOR_INPUTBOX_N              '1 1 1'
+MARGIN_INPUTBOX_CHARS         1
 
 // keygrabber
-ALPHA_KEYGRABBER_KEYS           0.77
-ALPHA_KEYGRABBER_TITLES         1
-COLOR_KEYGRABBER_KEYS           '1 1 1'
-COLOR_KEYGRABBER_TITLES         '0.03 0.25 0.49'
+ALPHA_KEYGRABBER_KEYS         0.8
+COLOR_KEYGRABBER_KEYS         '0.95 0.99 1'
+ALPHA_KEYGRABBER_TITLES       1
+COLOR_KEYGRABBER_TITLES       '0.03 0.25 0.49'
 
 // listbox
-ALPHA_LISTBOX_BACKGROUND        0.5
-ALPHA_LISTBOX_SELECTED          1
-ALPHA_LISTBOX_WAITING           0.8
-COLOR_LISTBOX_BACKGROUND        '0 0 0'
-COLOR_LISTBOX_SELECTED          '0.97 0.56 0.27'
-COLOR_LISTBOX_WAITING           '0.73 0.82 0.9'
+ALPHA_LISTBOX_BACKGROUND      0.5
+COLOR_LISTBOX_BACKGROUND      '0 0 0'
+ALPHA_LISTBOX_SELECTED        1
+COLOR_LISTBOX_SELECTED        '0.97 0.56 0.27'
+ALPHA_LISTBOX_WAITING         0.8
+COLOR_LISTBOX_WAITING         '0.73 0.82 0.9'
 
 // mainmenu
-ALPHAS_MAINMENU                 '0.8 0.9 1'
+ALPHAS_MAINMENU               '0.8 0.9 1'
 
 // maplist
-ALPHA_MAPLIST_INCLUDEDBG        0.3
-ALPHA_MAPLIST_INCLUDEDFG        1
-ALPHA_MAPLIST_NOTINCLUDEDFG     0.25
-COLOR_MAPLIST_AUTHOR            '0.56 0.72 0.86'
-COLOR_MAPLIST_INCLUDEDBG        '0.03 0.25 0.49'
-COLOR_MAPLIST_TITLE             '1 1 1'
+COLOR_MAPLIST_AUTHOR          '0.56 0.72 0.86'
+ALPHA_MAPLIST_INCLUDEDBG      0.3
+COLOR_MAPLIST_INCLUDEDBG      '0.03 0.25 0.49'
+ALPHA_MAPLIST_INCLUDEDFG      1
+ALPHA_MAPLIST_NOTINCLUDEDFG   0.25
+COLOR_MAPLIST_TITLE           '0.95 0.99 1'
 
 // modeltitle
-ALPHA_MODELTITLE                0.77
-COLOR_MODELTITLE                '1 1 1'
+ALPHA_MODELTITLE              0.8
+COLOR_MODELTITLE              '0.95 0.99 1'
 
 // radiobutton
-COLOR_RADIOBUTTON_C             '1 1 1'
-COLOR_RADIOBUTTON_D             '1 1 1'
-COLOR_RADIOBUTTON_F             '1 1 1'
-COLOR_RADIOBUTTON_N             '1 1 1'
+COLOR_RADIOBUTTON_C           '1 1 1'
+COLOR_RADIOBUTTON_D           '1 1 1'
+COLOR_RADIOBUTTON_F           '1 1 1'
+COLOR_RADIOBUTTON_N           '1 1 1'
 
 // serverinfo
-COLOR_SERVERINFO_IP             '1 1 1'
-COLOR_SERVERINFO_NAME           '0.94 0.45 0.11'
+COLOR_SERVERINFO_IP           '0.95 0.99 1'
+COLOR_SERVERINFO_NAME         '0.94 0.45 0.11'
 
 // serverlist
-ALPHA_SERVERLIST_EMPTY          0.65
-ALPHA_SERVERLIST_FAVORITE       0.8
-ALPHA_SERVERLIST_FULL           0.4
-ALPHA_SERVERLIST_HIGHPING       0.4
-COLOR_SERVERLIST_FAVORITE       '1 1 1'
-COLOR_SERVERLIST_LOWPING        '0.08 0.98 0.08'
-COLOR_SERVERLIST_MEDPING        '0.98 0.76 0.08'
-COLOR_SERVERLIST_HIGHPING       '0.98 0.08 0.08'
+ALPHA_SERVERLIST_CATEGORY     1
+COLOR_SERVERLIST_CATEGORY     '0.03 0.25 0.49'
+ALPHA_SERVERLIST_EMPTY        0.65
+ALPHA_SERVERLIST_FAVORITE     0.8
+COLOR_SERVERLIST_FAVORITE     '1 1 1'
+ALPHA_SERVERLIST_FULL         0.4
+ALPHA_SERVERLIST_HIGHPING     0.4
+COLOR_SERVERLIST_HIGHPING     '0.98 0.08 0.08'
+COLOR_SERVERLIST_LOWPING      '0.08 0.98 0.08'
+COLOR_SERVERLIST_MEDPING      '0.98 0.76 0.08'
 
 // skinlist
-COLOR_SKINLIST_AUTHOR           '0.56 0.72 0.86'
-COLOR_SKINLIST_TITLE            '1 1 1'
+COLOR_SKINLIST_AUTHOR         '0.56 0.72 0.86'
+COLOR_SKINLIST_TITLE          '0.95 0.99 1'
 
 // scrollbar
-COLOR_SCROLLBAR_C               '1 1 1'
-COLOR_SCROLLBAR_F               '1 1 1'
-COLOR_SCROLLBAR_N               '1 1 1'
-COLOR_SCROLLBAR_S               '1 1 1'
-WIDTH_SCROLLBAR                 16
+COLOR_SCROLLBAR_C             '1 1 1'
+COLOR_SCROLLBAR_F             '1 1 1'
+COLOR_SCROLLBAR_N             '1 1 1'
+COLOR_SCROLLBAR_S             '1 1 1'
+WIDTH_SCROLLBAR               16
 
 // slider
-COLOR_SLIDER_C                  '1 1 1'
-COLOR_SLIDER_D                  '1 1 1'
-COLOR_SLIDER_F                  '1 1 1'
-COLOR_SLIDER_N                  '1 1 1'
-COLOR_SLIDER_S                  '1 1 1'
-TOLERANCE_SLIDER                '0.2 2 0'
-WIDTH_SLIDERTEXT                0.333333333333
+COLOR_SLIDER_C                '1 1 1'
+COLOR_SLIDER_D                '1 1 1'
+COLOR_SLIDER_F                '1 1 1'
+COLOR_SLIDER_N                '1 1 1'
+COLOR_SLIDER_S                '1 1 1'
+TOLERANCE_SLIDER              '0.2 2 0'
+WIDTH_SLIDERTEXT              0.333333333333
 
 // tooltip
-ALPHA_TOOLTIP                   0.7
-AVOID_TOOLTIP                   '8 8 0'
-BORDER_TOOLTIP                  '16 16 0'
-MARGIN_TOOLTIP                  '10 8 0'
-WIDTH_TOOLTIP                   0.3
+ALPHA_TOOLTIP                 0.8
+COLOR_TOOLTIP                 '1 0.96 0.93'
+AVOID_TOOLTIP                 '8 8 0'
+BORDER_TOOLTIP                '16 16 0'
+MARGIN_TOOLTIP                '10 8 0'
+WIDTH_TOOLTIP                 0.3

diff --git a/gfx/menu/luma/tab_c.tga b/gfx/menu/luma/tab_c.tga
deleted file mode 100644 (file)
index 48697b4..0000000
Binary files a/gfx/menu/luma/tab_c.tga and /dev/null differ

diff --git a/gfx/menu/luma/tab_d.tga b/gfx/menu/luma/tab_d.tga
deleted file mode 100644 (file)
index 9907c41..0000000
Binary files a/gfx/menu/luma/tab_d.tga and /dev/null differ

diff --git a/gfx/menu/luma/tab_f.tga b/gfx/menu/luma/tab_f.tga
deleted file mode 100644 (file)
index 51d517c..0000000
Binary files a/gfx/menu/luma/tab_f.tga and /dev/null differ

diff --git a/gfx/menu/luma/tab_n.tga b/gfx/menu/luma/tab_n.tga
deleted file mode 100644 (file)
index ca112b9..0000000
Binary files a/gfx/menu/luma/tab_n.tga and /dev/null differ