Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 15 Sep 2010 11:03:34 +0000 (13:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 15 Sep 2010 11:03:34 +0000 (13:03 +0200)
98 files changed:
defaultXonotic.cfg
gfx/hud/default/ammo_current_bg.tga
gfx/hud/default/border_default.tga
gfx/hud/default/dock_medium.tga
gfx/hud/default/weapon_accuracy.tga
gfx/hud/default/weapon_ammo.tga
gfx/hud/default/weapon_complainbubble.tga
gfx/hud/default/weapon_current_bg.tga
gfx/hud/luminos/ammo_current_bg.tga
gfx/hud/luminos/border_default.tga
gfx/hud/luminos/dock_medium.tga
gfx/hud/luminos/weapon_accuracy.tga
gfx/hud/luminos/weapon_ammo.tga
gfx/hud/luminos/weapon_complainbubble.tga
gfx/hud/luminos/weapon_current_bg.tga
gfx/menu/luminos/background.tga [new file with mode: 0644]
gfx/menu/luminos/background_ingame.tga [new file with mode: 0644]
gfx/menu/luminos/background_ingame_l2.tga [new file with mode: 0644]
gfx/menu/luminos/background_l2.tga [new file with mode: 0644]
gfx/menu/luminos/bigbutton_c.tga [new file with mode: 0644]
gfx/menu/luminos/bigbutton_d.tga [new file with mode: 0644]
gfx/menu/luminos/bigbutton_f.tga [new file with mode: 0644]
gfx/menu/luminos/bigbutton_n.tga [new file with mode: 0644]
gfx/menu/luminos/bigbuttongray_c.tga [new file with mode: 0644]
gfx/menu/luminos/bigbuttongray_d.tga [new file with mode: 0644]
gfx/menu/luminos/bigbuttongray_f.tga [new file with mode: 0644]
gfx/menu/luminos/bigbuttongray_n.tga [new file with mode: 0644]
gfx/menu/luminos/border.tga [new file with mode: 0644]
gfx/menu/luminos/button_c.tga [new file with mode: 0644]
gfx/menu/luminos/button_d.tga [new file with mode: 0644]
gfx/menu/luminos/button_f.tga [new file with mode: 0644]
gfx/menu/luminos/button_n.tga [new file with mode: 0644]
gfx/menu/luminos/buttongray_c.tga [new file with mode: 0644]
gfx/menu/luminos/buttongray_d.tga [new file with mode: 0644]
gfx/menu/luminos/buttongray_f.tga [new file with mode: 0644]
gfx/menu/luminos/buttongray_n.tga [new file with mode: 0644]
gfx/menu/luminos/charmap.tga [new file with mode: 0755]
gfx/menu/luminos/charmapbutton.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_c0.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_c1.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_d0.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_d1.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_f0.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_f1.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_n0.tga [new file with mode: 0644]
gfx/menu/luminos/checkbox_n1.tga [new file with mode: 0644]
gfx/menu/luminos/checkmark.tga [new file with mode: 0644]
gfx/menu/luminos/closebutton_c.tga [new file with mode: 0644]
gfx/menu/luminos/closebutton_f.tga [new file with mode: 0644]
gfx/menu/luminos/closebutton_n.tga [new file with mode: 0644]
gfx/menu/luminos/color.tga [new file with mode: 0644]
gfx/menu/luminos/colorbutton_c.tga [new file with mode: 0644]
gfx/menu/luminos/colorbutton_f.tga [new file with mode: 0644]
gfx/menu/luminos/colorbutton_n.tga [new file with mode: 0755]
gfx/menu/luminos/colorpicker.tga [new file with mode: 0755]
gfx/menu/luminos/colorpicker_m.tga [new file with mode: 0755]
gfx/menu/luminos/colorpicker_selected.tga [new file with mode: 0644]
gfx/menu/luminos/crosshairbutton_c.tga [new file with mode: 0644]
gfx/menu/luminos/crosshairbutton_d.tga [new file with mode: 0755]
gfx/menu/luminos/crosshairbutton_f.tga [new file with mode: 0644]
gfx/menu/luminos/crosshairbutton_n.tga [new file with mode: 0755]
gfx/menu/luminos/cursor.tga [new file with mode: 0644]
gfx/menu/luminos/cursor_move.tga [new file with mode: 0644]
gfx/menu/luminos/cursor_resize.tga [new file with mode: 0644]
gfx/menu/luminos/cursor_resize2.tga [new file with mode: 0644]
gfx/menu/luminos/inputbox_f.tga [new file with mode: 0644]
gfx/menu/luminos/inputbox_n.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_c0.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_c1.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_d0.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_d1.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_f0.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_f1.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_n0.tga [new file with mode: 0644]
gfx/menu/luminos/radiobutton_n1.tga [new file with mode: 0644]
gfx/menu/luminos/scrollbar_c.tga [new file with mode: 0644]
gfx/menu/luminos/scrollbar_f.tga [new file with mode: 0644]
gfx/menu/luminos/scrollbar_n.tga [new file with mode: 0644]
gfx/menu/luminos/scrollbar_s.tga [new file with mode: 0644]
gfx/menu/luminos/skinpreview.jpg [new file with mode: 0644]
gfx/menu/luminos/skinvalues.txt [new file with mode: 0755]
gfx/menu/luminos/slider_c.tga [new file with mode: 0644]
gfx/menu/luminos/slider_d.tga [new file with mode: 0644]
gfx/menu/luminos/slider_f.tga [new file with mode: 0644]
gfx/menu/luminos/slider_n.tga [new file with mode: 0644]
gfx/menu/luminos/slider_s.tga [new file with mode: 0644]
gfx/menu/luminos/tooltip.tga [new file with mode: 0644]
gfx/scoreboard/accuracy_bg.tga
gfx/scoreboard/player_ready.tga
gfx/scoreboard/playercolor_base.tga
gfx/scoreboard/playercolor_pants.tga
gfx/scoreboard/playercolor_shirt.tga
gfx/scoreboard/scoreboard_bg.tga
gfx/scoreboard/scoreboard_tableheader.tga
hud_default.cfg [deleted file]
hud_luminos.cfg [new file with mode: 0644]
hud_luminos_default.cfg [deleted file]
qcsrc/server/g_world.qc

index 7336794..76975af 100644 (file)
@@ -507,7 +507,7 @@ set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: s
 set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)"
 set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
 seta g_maplist_mostrecent_count 3      "number of most recent maps that are blocked from being played again"
-seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep2 strength toxic warfare"
+seta g_maplist "g-23" "the list of maps to be cycled among (is autogenerated if empty)"
 seta g_maplist_index 0 "this is used internally for saving position in maplist cycle"
 seta g_maplist_selectrandom 0  "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle"
 seta g_maplist_shuffle 1       "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
@@ -1142,6 +1142,7 @@ seta sv_servermodelsonly 1
 cl_curl_enabled 1
 cl_curl_maxspeed 300
 sv_curl_defaulturl "http://www.xonotic.com/contentdownload/getmap.php?file="
+set sv_curl_serverpackages_auto 0 "automatically add packs with *.serverpackage files to sv_curl_serverpackages"
 
 set sv_motd ""
 
@@ -1310,7 +1311,7 @@ alias _userbind_call "${$1}"
 alias +userbind "_userbind_call userbind${1}_press"
 alias -userbind "_userbind_call userbind${1}_release"
 
-seta menu_skin "default"
+seta menu_skin "luminos"
 set menu_slowmo 1
 seta menu_sounds 0 "enables menu sound effects. 1 enables click sounds, 2 also enables hover sounds"
 
@@ -1339,7 +1340,7 @@ seta sbar_info_pos 0 "Y-axis distance from lower right corner for engine info pr
 exec _hud_descriptions.cfg
 // exec the default skin config
 // please add any new cvars into the hud_save script in qcsrc/client/hud.qc for consistency
-exec hud_default.cfg
+exec hud_luminos.cfg
 
 // user preference cvars (i.e. shouldn't be adjusted by a skin config) 
 seta hud_panel_weapons_label 1 "1 = show number of weapon, 2 = show bound key of weapon"
index 7036279..2d3aef4 100644 (file)
Binary files a/gfx/hud/default/ammo_current_bg.tga and b/gfx/hud/default/ammo_current_bg.tga differ
index 3b76811..651f523 100644 (file)
Binary files a/gfx/hud/default/border_default.tga and b/gfx/hud/default/border_default.tga differ
index 3163382..5b2d01b 100644 (file)
Binary files a/gfx/hud/default/dock_medium.tga and b/gfx/hud/default/dock_medium.tga differ
index 8dcf3aa..6c7916d 100644 (file)
Binary files a/gfx/hud/default/weapon_accuracy.tga and b/gfx/hud/default/weapon_accuracy.tga differ
index de4148c..ec1b4ad 100644 (file)
Binary files a/gfx/hud/default/weapon_ammo.tga and b/gfx/hud/default/weapon_ammo.tga differ
index 349274f..1a5b4fc 100644 (file)
Binary files a/gfx/hud/default/weapon_complainbubble.tga and b/gfx/hud/default/weapon_complainbubble.tga differ
index 688d805..b9c7c80 100644 (file)
Binary files a/gfx/hud/default/weapon_current_bg.tga and b/gfx/hud/default/weapon_current_bg.tga differ
index 7036279..2d3aef4 100644 (file)
Binary files a/gfx/hud/luminos/ammo_current_bg.tga and b/gfx/hud/luminos/ammo_current_bg.tga differ
index 3b76811..651f523 100644 (file)
Binary files a/gfx/hud/luminos/border_default.tga and b/gfx/hud/luminos/border_default.tga differ
index 3163382..5b2d01b 100644 (file)
Binary files a/gfx/hud/luminos/dock_medium.tga and b/gfx/hud/luminos/dock_medium.tga differ
index 8dcf3aa..6c7916d 100644 (file)
Binary files a/gfx/hud/luminos/weapon_accuracy.tga and b/gfx/hud/luminos/weapon_accuracy.tga differ
index de4148c..ec1b4ad 100644 (file)
Binary files a/gfx/hud/luminos/weapon_ammo.tga and b/gfx/hud/luminos/weapon_ammo.tga differ
index 349274f..1a5b4fc 100644 (file)
Binary files a/gfx/hud/luminos/weapon_complainbubble.tga and b/gfx/hud/luminos/weapon_complainbubble.tga differ
index 688d805..b9c7c80 100644 (file)
Binary files a/gfx/hud/luminos/weapon_current_bg.tga and b/gfx/hud/luminos/weapon_current_bg.tga differ
diff --git a/gfx/menu/luminos/background.tga b/gfx/menu/luminos/background.tga
new file mode 100644 (file)
index 0000000..67e31a5
Binary files /dev/null and b/gfx/menu/luminos/background.tga differ
diff --git a/gfx/menu/luminos/background_ingame.tga b/gfx/menu/luminos/background_ingame.tga
new file mode 100644 (file)
index 0000000..e2c977c
Binary files /dev/null and b/gfx/menu/luminos/background_ingame.tga differ
diff --git a/gfx/menu/luminos/background_ingame_l2.tga b/gfx/menu/luminos/background_ingame_l2.tga
new file mode 100644 (file)
index 0000000..f134814
Binary files /dev/null and b/gfx/menu/luminos/background_ingame_l2.tga differ
diff --git a/gfx/menu/luminos/background_l2.tga b/gfx/menu/luminos/background_l2.tga
new file mode 100644 (file)
index 0000000..f134814
Binary files /dev/null and b/gfx/menu/luminos/background_l2.tga differ
diff --git a/gfx/menu/luminos/bigbutton_c.tga b/gfx/menu/luminos/bigbutton_c.tga
new file mode 100644 (file)
index 0000000..8ef3976
Binary files /dev/null and b/gfx/menu/luminos/bigbutton_c.tga differ
diff --git a/gfx/menu/luminos/bigbutton_d.tga b/gfx/menu/luminos/bigbutton_d.tga
new file mode 100644 (file)
index 0000000..6d64cce
Binary files /dev/null and b/gfx/menu/luminos/bigbutton_d.tga differ
diff --git a/gfx/menu/luminos/bigbutton_f.tga b/gfx/menu/luminos/bigbutton_f.tga
new file mode 100644 (file)
index 0000000..5aa55da
Binary files /dev/null and b/gfx/menu/luminos/bigbutton_f.tga differ
diff --git a/gfx/menu/luminos/bigbutton_n.tga b/gfx/menu/luminos/bigbutton_n.tga
new file mode 100644 (file)
index 0000000..4ed2a2c
Binary files /dev/null and b/gfx/menu/luminos/bigbutton_n.tga differ
diff --git a/gfx/menu/luminos/bigbuttongray_c.tga b/gfx/menu/luminos/bigbuttongray_c.tga
new file mode 100644 (file)
index 0000000..7f2c537
Binary files /dev/null and b/gfx/menu/luminos/bigbuttongray_c.tga differ
diff --git a/gfx/menu/luminos/bigbuttongray_d.tga b/gfx/menu/luminos/bigbuttongray_d.tga
new file mode 100644 (file)
index 0000000..66cecc4
Binary files /dev/null and b/gfx/menu/luminos/bigbuttongray_d.tga differ
diff --git a/gfx/menu/luminos/bigbuttongray_f.tga b/gfx/menu/luminos/bigbuttongray_f.tga
new file mode 100644 (file)
index 0000000..2dd5d29
Binary files /dev/null and b/gfx/menu/luminos/bigbuttongray_f.tga differ
diff --git a/gfx/menu/luminos/bigbuttongray_n.tga b/gfx/menu/luminos/bigbuttongray_n.tga
new file mode 100644 (file)
index 0000000..2f701a4
Binary files /dev/null and b/gfx/menu/luminos/bigbuttongray_n.tga differ
diff --git a/gfx/menu/luminos/border.tga b/gfx/menu/luminos/border.tga
new file mode 100644 (file)
index 0000000..0be23bc
Binary files /dev/null and b/gfx/menu/luminos/border.tga differ
diff --git a/gfx/menu/luminos/button_c.tga b/gfx/menu/luminos/button_c.tga
new file mode 100644 (file)
index 0000000..5c431df
Binary files /dev/null and b/gfx/menu/luminos/button_c.tga differ
diff --git a/gfx/menu/luminos/button_d.tga b/gfx/menu/luminos/button_d.tga
new file mode 100644 (file)
index 0000000..5c880ac
Binary files /dev/null and b/gfx/menu/luminos/button_d.tga differ
diff --git a/gfx/menu/luminos/button_f.tga b/gfx/menu/luminos/button_f.tga
new file mode 100644 (file)
index 0000000..d522b17
Binary files /dev/null and b/gfx/menu/luminos/button_f.tga differ
diff --git a/gfx/menu/luminos/button_n.tga b/gfx/menu/luminos/button_n.tga
new file mode 100644 (file)
index 0000000..afa5f22
Binary files /dev/null and b/gfx/menu/luminos/button_n.tga differ
diff --git a/gfx/menu/luminos/buttongray_c.tga b/gfx/menu/luminos/buttongray_c.tga
new file mode 100644 (file)
index 0000000..a287b23
Binary files /dev/null and b/gfx/menu/luminos/buttongray_c.tga differ
diff --git a/gfx/menu/luminos/buttongray_d.tga b/gfx/menu/luminos/buttongray_d.tga
new file mode 100644 (file)
index 0000000..58d4d34
Binary files /dev/null and b/gfx/menu/luminos/buttongray_d.tga differ
diff --git a/gfx/menu/luminos/buttongray_f.tga b/gfx/menu/luminos/buttongray_f.tga
new file mode 100644 (file)
index 0000000..f269885
Binary files /dev/null and b/gfx/menu/luminos/buttongray_f.tga differ
diff --git a/gfx/menu/luminos/buttongray_n.tga b/gfx/menu/luminos/buttongray_n.tga
new file mode 100644 (file)
index 0000000..cf1b987
Binary files /dev/null and b/gfx/menu/luminos/buttongray_n.tga differ
diff --git a/gfx/menu/luminos/charmap.tga b/gfx/menu/luminos/charmap.tga
new file mode 100755 (executable)
index 0000000..d8ed1d5
Binary files /dev/null and b/gfx/menu/luminos/charmap.tga differ
diff --git a/gfx/menu/luminos/charmapbutton.tga b/gfx/menu/luminos/charmapbutton.tga
new file mode 100644 (file)
index 0000000..8826245
Binary files /dev/null and b/gfx/menu/luminos/charmapbutton.tga differ
diff --git a/gfx/menu/luminos/checkbox_c0.tga b/gfx/menu/luminos/checkbox_c0.tga
new file mode 100644 (file)
index 0000000..37dbf73
Binary files /dev/null and b/gfx/menu/luminos/checkbox_c0.tga differ
diff --git a/gfx/menu/luminos/checkbox_c1.tga b/gfx/menu/luminos/checkbox_c1.tga
new file mode 100644 (file)
index 0000000..37dbf73
Binary files /dev/null and b/gfx/menu/luminos/checkbox_c1.tga differ
diff --git a/gfx/menu/luminos/checkbox_d0.tga b/gfx/menu/luminos/checkbox_d0.tga
new file mode 100644 (file)
index 0000000..4f0b001
Binary files /dev/null and b/gfx/menu/luminos/checkbox_d0.tga differ
diff --git a/gfx/menu/luminos/checkbox_d1.tga b/gfx/menu/luminos/checkbox_d1.tga
new file mode 100644 (file)
index 0000000..a1dad7e
Binary files /dev/null and b/gfx/menu/luminos/checkbox_d1.tga differ
diff --git a/gfx/menu/luminos/checkbox_f0.tga b/gfx/menu/luminos/checkbox_f0.tga
new file mode 100644 (file)
index 0000000..5f19b3c
Binary files /dev/null and b/gfx/menu/luminos/checkbox_f0.tga differ
diff --git a/gfx/menu/luminos/checkbox_f1.tga b/gfx/menu/luminos/checkbox_f1.tga
new file mode 100644 (file)
index 0000000..71aad7a
Binary files /dev/null and b/gfx/menu/luminos/checkbox_f1.tga differ
diff --git a/gfx/menu/luminos/checkbox_n0.tga b/gfx/menu/luminos/checkbox_n0.tga
new file mode 100644 (file)
index 0000000..c062f31
Binary files /dev/null and b/gfx/menu/luminos/checkbox_n0.tga differ
diff --git a/gfx/menu/luminos/checkbox_n1.tga b/gfx/menu/luminos/checkbox_n1.tga
new file mode 100644 (file)
index 0000000..37dbf73
Binary files /dev/null and b/gfx/menu/luminos/checkbox_n1.tga differ
diff --git a/gfx/menu/luminos/checkmark.tga b/gfx/menu/luminos/checkmark.tga
new file mode 100644 (file)
index 0000000..7c22294
Binary files /dev/null and b/gfx/menu/luminos/checkmark.tga differ
diff --git a/gfx/menu/luminos/closebutton_c.tga b/gfx/menu/luminos/closebutton_c.tga
new file mode 100644 (file)
index 0000000..3de1ccb
Binary files /dev/null and b/gfx/menu/luminos/closebutton_c.tga differ
diff --git a/gfx/menu/luminos/closebutton_f.tga b/gfx/menu/luminos/closebutton_f.tga
new file mode 100644 (file)
index 0000000..be0939c
Binary files /dev/null and b/gfx/menu/luminos/closebutton_f.tga differ
diff --git a/gfx/menu/luminos/closebutton_n.tga b/gfx/menu/luminos/closebutton_n.tga
new file mode 100644 (file)
index 0000000..57d76c4
Binary files /dev/null and b/gfx/menu/luminos/closebutton_n.tga differ
diff --git a/gfx/menu/luminos/color.tga b/gfx/menu/luminos/color.tga
new file mode 100644 (file)
index 0000000..3ce25a5
Binary files /dev/null and b/gfx/menu/luminos/color.tga differ
diff --git a/gfx/menu/luminos/colorbutton_c.tga b/gfx/menu/luminos/colorbutton_c.tga
new file mode 100644 (file)
index 0000000..586f9b4
Binary files /dev/null and b/gfx/menu/luminos/colorbutton_c.tga differ
diff --git a/gfx/menu/luminos/colorbutton_f.tga b/gfx/menu/luminos/colorbutton_f.tga
new file mode 100644 (file)
index 0000000..57d7d93
Binary files /dev/null and b/gfx/menu/luminos/colorbutton_f.tga differ
diff --git a/gfx/menu/luminos/colorbutton_n.tga b/gfx/menu/luminos/colorbutton_n.tga
new file mode 100755 (executable)
index 0000000..110faa1
Binary files /dev/null and b/gfx/menu/luminos/colorbutton_n.tga differ
diff --git a/gfx/menu/luminos/colorpicker.tga b/gfx/menu/luminos/colorpicker.tga
new file mode 100755 (executable)
index 0000000..6f9845b
Binary files /dev/null and b/gfx/menu/luminos/colorpicker.tga differ
diff --git a/gfx/menu/luminos/colorpicker_m.tga b/gfx/menu/luminos/colorpicker_m.tga
new file mode 100755 (executable)
index 0000000..79b0e83
Binary files /dev/null and b/gfx/menu/luminos/colorpicker_m.tga differ
diff --git a/gfx/menu/luminos/colorpicker_selected.tga b/gfx/menu/luminos/colorpicker_selected.tga
new file mode 100644 (file)
index 0000000..605e932
Binary files /dev/null and b/gfx/menu/luminos/colorpicker_selected.tga differ
diff --git a/gfx/menu/luminos/crosshairbutton_c.tga b/gfx/menu/luminos/crosshairbutton_c.tga
new file mode 100644 (file)
index 0000000..586f9b4
Binary files /dev/null and b/gfx/menu/luminos/crosshairbutton_c.tga differ
diff --git a/gfx/menu/luminos/crosshairbutton_d.tga b/gfx/menu/luminos/crosshairbutton_d.tga
new file mode 100755 (executable)
index 0000000..cba9d88
Binary files /dev/null and b/gfx/menu/luminos/crosshairbutton_d.tga differ
diff --git a/gfx/menu/luminos/crosshairbutton_f.tga b/gfx/menu/luminos/crosshairbutton_f.tga
new file mode 100644 (file)
index 0000000..57d7d93
Binary files /dev/null and b/gfx/menu/luminos/crosshairbutton_f.tga differ
diff --git a/gfx/menu/luminos/crosshairbutton_n.tga b/gfx/menu/luminos/crosshairbutton_n.tga
new file mode 100755 (executable)
index 0000000..ac94535
Binary files /dev/null and b/gfx/menu/luminos/crosshairbutton_n.tga differ
diff --git a/gfx/menu/luminos/cursor.tga b/gfx/menu/luminos/cursor.tga
new file mode 100644 (file)
index 0000000..130e282
Binary files /dev/null and b/gfx/menu/luminos/cursor.tga differ
diff --git a/gfx/menu/luminos/cursor_move.tga b/gfx/menu/luminos/cursor_move.tga
new file mode 100644 (file)
index 0000000..bd86328
Binary files /dev/null and b/gfx/menu/luminos/cursor_move.tga differ
diff --git a/gfx/menu/luminos/cursor_resize.tga b/gfx/menu/luminos/cursor_resize.tga
new file mode 100644 (file)
index 0000000..8dbabe1
Binary files /dev/null and b/gfx/menu/luminos/cursor_resize.tga differ
diff --git a/gfx/menu/luminos/cursor_resize2.tga b/gfx/menu/luminos/cursor_resize2.tga
new file mode 100644 (file)
index 0000000..bcd8c28
Binary files /dev/null and b/gfx/menu/luminos/cursor_resize2.tga differ
diff --git a/gfx/menu/luminos/inputbox_f.tga b/gfx/menu/luminos/inputbox_f.tga
new file mode 100644 (file)
index 0000000..d783eb2
Binary files /dev/null and b/gfx/menu/luminos/inputbox_f.tga differ
diff --git a/gfx/menu/luminos/inputbox_n.tga b/gfx/menu/luminos/inputbox_n.tga
new file mode 100644 (file)
index 0000000..9ce3260
Binary files /dev/null and b/gfx/menu/luminos/inputbox_n.tga differ
diff --git a/gfx/menu/luminos/radiobutton_c0.tga b/gfx/menu/luminos/radiobutton_c0.tga
new file mode 100644 (file)
index 0000000..06296d6
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_c0.tga differ
diff --git a/gfx/menu/luminos/radiobutton_c1.tga b/gfx/menu/luminos/radiobutton_c1.tga
new file mode 100644 (file)
index 0000000..06296d6
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_c1.tga differ
diff --git a/gfx/menu/luminos/radiobutton_d0.tga b/gfx/menu/luminos/radiobutton_d0.tga
new file mode 100644 (file)
index 0000000..b11e09d
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_d0.tga differ
diff --git a/gfx/menu/luminos/radiobutton_d1.tga b/gfx/menu/luminos/radiobutton_d1.tga
new file mode 100644 (file)
index 0000000..757bb2c
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_d1.tga differ
diff --git a/gfx/menu/luminos/radiobutton_f0.tga b/gfx/menu/luminos/radiobutton_f0.tga
new file mode 100644 (file)
index 0000000..83985f8
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_f0.tga differ
diff --git a/gfx/menu/luminos/radiobutton_f1.tga b/gfx/menu/luminos/radiobutton_f1.tga
new file mode 100644 (file)
index 0000000..8b25bef
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_f1.tga differ
diff --git a/gfx/menu/luminos/radiobutton_n0.tga b/gfx/menu/luminos/radiobutton_n0.tga
new file mode 100644 (file)
index 0000000..ee87298
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_n0.tga differ
diff --git a/gfx/menu/luminos/radiobutton_n1.tga b/gfx/menu/luminos/radiobutton_n1.tga
new file mode 100644 (file)
index 0000000..06296d6
Binary files /dev/null and b/gfx/menu/luminos/radiobutton_n1.tga differ
diff --git a/gfx/menu/luminos/scrollbar_c.tga b/gfx/menu/luminos/scrollbar_c.tga
new file mode 100644 (file)
index 0000000..043f5dc
Binary files /dev/null and b/gfx/menu/luminos/scrollbar_c.tga differ
diff --git a/gfx/menu/luminos/scrollbar_f.tga b/gfx/menu/luminos/scrollbar_f.tga
new file mode 100644 (file)
index 0000000..5115c81
Binary files /dev/null and b/gfx/menu/luminos/scrollbar_f.tga differ
diff --git a/gfx/menu/luminos/scrollbar_n.tga b/gfx/menu/luminos/scrollbar_n.tga
new file mode 100644 (file)
index 0000000..62f950e
Binary files /dev/null and b/gfx/menu/luminos/scrollbar_n.tga differ
diff --git a/gfx/menu/luminos/scrollbar_s.tga b/gfx/menu/luminos/scrollbar_s.tga
new file mode 100644 (file)
index 0000000..dcbbd41
Binary files /dev/null and b/gfx/menu/luminos/scrollbar_s.tga differ
diff --git a/gfx/menu/luminos/skinpreview.jpg b/gfx/menu/luminos/skinpreview.jpg
new file mode 100644 (file)
index 0000000..9cc5343
Binary files /dev/null and b/gfx/menu/luminos/skinpreview.jpg differ
diff --git a/gfx/menu/luminos/skinvalues.txt b/gfx/menu/luminos/skinvalues.txt
new file mode 100755 (executable)
index 0000000..9cb2b59
--- /dev/null
@@ -0,0 +1,224 @@
+title Luminos
+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                c5h5
+ALIGN_BACKGROUND_INGAME         c5h5
+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.25 0.125 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.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'
+
+// 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             '1 0.4375 0'
+ALPHA_CREDITS_TITLE             1
+COLOR_CREDITS_FUNCTION          '0 0.25 0.5'
+ALPHA_CREDITS_FUNCTION          1
+COLOR_CREDITS_PERSON            '0.6875 0.84375 1'
+ALPHA_CREDITS_PERSON            1
+ROWS_CREDITS                    20
+WIDTH_CREDITS                   0.5
+
+// item: cvar list
+ALPHA_CVARLIST_SAVED            1
+ALPHA_CVARLIST_TEMPORARY        0.7    
+COLOR_CVARLIST_CHANGED          '1 0 0' 
+COLOR_CVARLIST_REVERTBUTTON     '1 0 0'
+COLOR_CVARLIST_UNCHANGED        '1 1 1'
+
+// item: list box
+COLOR_LISTBOX_SELECTED          '1 0.4375 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.6875 0.84375 1'
+COLOR_MAPLIST_INCLUDEDBG        '0 0.1875 0.375'
+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             '1 0.4375 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.6875 0.84375 1'
+
+//------------------------------------------------------------------------------
+// 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                '1 1 1'
+COLOR_CHECKBOX_F                '1 1 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_RADAR              '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               '1 1 1'
+COLOR_SCROLLBAR_F               '1 1 1'
+COLOR_SCROLLBAR_S               '1 1 1'
+WIDTH_SCROLLBAR                 16
+
+// item: slider
+//   uses "slider" images
+COLOR_SLIDER_N                  '1 1 1'
+COLOR_SLIDER_C                  '1 1 1'
+COLOR_SLIDER_F                  '1 1 1'
+COLOR_SLIDER_D                  '1 1 1'
+COLOR_SLIDER_S                  '1 1 1'
+WIDTH_SLIDERTEXT                0.333333333333
+TOLERANCE_SLIDER                '0.2 2 0'
diff --git a/gfx/menu/luminos/slider_c.tga b/gfx/menu/luminos/slider_c.tga
new file mode 100644 (file)
index 0000000..fe43eb9
Binary files /dev/null and b/gfx/menu/luminos/slider_c.tga differ
diff --git a/gfx/menu/luminos/slider_d.tga b/gfx/menu/luminos/slider_d.tga
new file mode 100644 (file)
index 0000000..aaa80f0
Binary files /dev/null and b/gfx/menu/luminos/slider_d.tga differ
diff --git a/gfx/menu/luminos/slider_f.tga b/gfx/menu/luminos/slider_f.tga
new file mode 100644 (file)
index 0000000..3dea585
Binary files /dev/null and b/gfx/menu/luminos/slider_f.tga differ
diff --git a/gfx/menu/luminos/slider_n.tga b/gfx/menu/luminos/slider_n.tga
new file mode 100644 (file)
index 0000000..e270201
Binary files /dev/null and b/gfx/menu/luminos/slider_n.tga differ
diff --git a/gfx/menu/luminos/slider_s.tga b/gfx/menu/luminos/slider_s.tga
new file mode 100644 (file)
index 0000000..f097972
Binary files /dev/null and b/gfx/menu/luminos/slider_s.tga differ
diff --git a/gfx/menu/luminos/tooltip.tga b/gfx/menu/luminos/tooltip.tga
new file mode 100644 (file)
index 0000000..d73d099
Binary files /dev/null and b/gfx/menu/luminos/tooltip.tga differ
index 2974c1d..5f26183 100644 (file)
Binary files a/gfx/scoreboard/accuracy_bg.tga and b/gfx/scoreboard/accuracy_bg.tga differ
index 0e2a31c..549eb50 100644 (file)
Binary files a/gfx/scoreboard/player_ready.tga and b/gfx/scoreboard/player_ready.tga differ
index 645457d..a09afe1 100644 (file)
Binary files a/gfx/scoreboard/playercolor_base.tga and b/gfx/scoreboard/playercolor_base.tga differ
index 608f96f..7153181 100644 (file)
Binary files a/gfx/scoreboard/playercolor_pants.tga and b/gfx/scoreboard/playercolor_pants.tga differ
index 61ad4da..316bbd8 100644 (file)
Binary files a/gfx/scoreboard/playercolor_shirt.tga and b/gfx/scoreboard/playercolor_shirt.tga differ
index 1d9ea76..6f71136 100644 (file)
Binary files a/gfx/scoreboard/scoreboard_bg.tga and b/gfx/scoreboard/scoreboard_bg.tga differ
index e43040f..04147bc 100644 (file)
Binary files a/gfx/scoreboard/scoreboard_tableheader.tga and b/gfx/scoreboard/scoreboard_tableheader.tga differ
diff --git a/hud_default.cfg b/hud_default.cfg
deleted file mode 100644 (file)
index 813947b..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-seta hud_skin "luminos"
-seta hud_panel_bg "border_default"
-seta hud_panel_bg_color "0.875 0.375 0"
-seta hud_panel_bg_color_team "0"
-seta hud_panel_bg_alpha "1"
-seta hud_panel_bg_border "8"
-seta hud_panel_bg_padding "2"
-seta hud_panel_fg_alpha "1"
-
-seta hud_dock "dock"
-seta hud_dock_color "0 0.1875 0.4375"
-seta hud_dock_color_team "0.700000"
-seta hud_dock_alpha "1"
-
-seta hud_progressbar_alpha "0.500000"
-seta hud_progressbar_strength_color "0 0 0.6"
-seta hud_progressbar_shield_color "0.6 0 0.6"
-seta hud_progressbar_health_color "0.6 0 0"
-seta hud_progressbar_armor_color "0 0.6 0"
-seta hud_progressbar_fuel_color "0.6 0.6 0"
-seta hud_progressbar_nexball_color "0.7 0.1 0"
-
-seta _hud_panelorder "10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 "
-
-seta hud_configure_grid "1"
-seta hud_configure_grid_xsize "0.010000"
-seta hud_configure_grid_ysize "0.010000"
-
-seta scr_centerpos "0.25"
-
-seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.920000 0.090000"
-seta hud_panel_weapons_size "0.060000 0.630000"
-seta hud_panel_weapons_bg ""
-seta hud_panel_weapons_bg_color ""
-seta hud_panel_weapons_bg_color_team ""
-seta hud_panel_weapons_bg_alpha ""
-seta hud_panel_weapons_bg_border ""
-seta hud_panel_weapons_bg_padding ""
-seta hud_panel_weapons_complainbubble "1"
-seta hud_panel_weapons_complainbubble_padding "-10"
-seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
-seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
-seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
-seta hud_panel_weapons_ammo_color "0 1 0"
-seta hud_panel_weapons_ammo_alpha "1"
-seta hud_panel_weapons_aspect "2"
-
-seta hud_panel_ammo 1
-seta hud_panel_ammo_pos "0.190000 0.920000"
-seta hud_panel_ammo_size "0.120000 0.070000"
-seta hud_panel_ammo_bg ""
-seta hud_panel_ammo_bg_color ""
-seta hud_panel_ammo_bg_color_team ""
-seta hud_panel_ammo_bg_alpha ""
-seta hud_panel_ammo_bg_border ""
-seta hud_panel_ammo_bg_padding ""
-seta hud_panel_ammo_onlycurrent "0"
-seta hud_panel_ammo_iconalign "0"
-
-seta hud_panel_powerups 1
-seta hud_panel_powerups_pos "0.660000 0.940000"
-seta hud_panel_powerups_size "0.330000 0.060000"
-seta hud_panel_powerups_bg "0"
-seta hud_panel_powerups_bg_color ""
-seta hud_panel_powerups_bg_color_team ""
-seta hud_panel_powerups_bg_alpha ""
-seta hud_panel_powerups_bg_border ""
-seta hud_panel_powerups_bg_padding ""
-seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "4"
-seta hud_panel_powerups_baralign "4"
-seta hud_panel_powerups_progressbar "1"
-
-seta hud_panel_healtharmor 1
-seta hud_panel_healtharmor_pos "0.330000 0.920000"
-seta hud_panel_healtharmor_size "0.310000 0.070000"
-seta hud_panel_healtharmor_bg ""
-seta hud_panel_healtharmor_bg_color ""
-seta hud_panel_healtharmor_bg_color_team ""
-seta hud_panel_healtharmor_bg_alpha ""
-seta hud_panel_healtharmor_bg_border ""
-seta hud_panel_healtharmor_bg_padding ""
-seta hud_panel_healtharmor_flip "0
-seta hud_panel_healtharmor_iconalign "4"
-seta hud_panel_healtharmor_baralign "4"
-seta hud_panel_healtharmor_progressbar "1"
-
-seta hud_panel_notify 1
-seta hud_panel_notify_pos "0.660000 0.730000"
-seta hud_panel_notify_size "0.320000 0.190000"
-seta hud_panel_notify_bg "0"
-seta hud_panel_notify_bg_color ""
-seta hud_panel_notify_bg_color_team ""
-seta hud_panel_notify_bg_alpha ""
-seta hud_panel_notify_bg_border ""
-seta hud_panel_notify_bg_padding ""
-seta hud_panel_notify_flip "0"
-seta hud_panel_notify_print "1"
-
-seta hud_panel_timer 1
-seta hud_panel_timer_pos "0.870000 0"
-seta hud_panel_timer_size "0.130000 0.060000"
-seta hud_panel_timer_bg "0"
-seta hud_panel_timer_bg_color ""
-seta hud_panel_timer_bg_color_team ""
-seta hud_panel_timer_bg_alpha ""
-seta hud_panel_timer_bg_border ""
-seta hud_panel_timer_bg_padding "0"
-
-seta hud_panel_radar 1
-seta hud_panel_radar_pos "0.030000 0.020000"
-seta hud_panel_radar_size "0.170000 0.220000"
-seta hud_panel_radar_bg ""
-seta hud_panel_radar_bg_color ""
-seta hud_panel_radar_bg_color_team ""
-seta hud_panel_radar_bg_alpha ""
-seta hud_panel_radar_bg_border ""
-seta hud_panel_radar_bg_padding "-3"
-seta hud_panel_radar_foreground_alpha "0.800000"
-
-seta hud_panel_score 1
-seta hud_panel_score_pos "0.020000 0.920000"
-seta hud_panel_score_size "0.150000 0.070000"
-seta hud_panel_score_bg ""
-seta hud_panel_score_bg_color ""
-seta hud_panel_score_bg_color_team ""
-seta hud_panel_score_bg_alpha ""
-seta hud_panel_score_bg_border ""
-seta hud_panel_score_bg_padding ""
-
-seta hud_panel_racetimer 1
-seta hud_panel_racetimer_pos "0.360000 0.090000"
-seta hud_panel_racetimer_size "0.280000 0.090000"
-seta hud_panel_racetimer_bg "0"
-seta hud_panel_racetimer_bg_color ""
-seta hud_panel_racetimer_bg_color_team ""
-seta hud_panel_racetimer_bg_alpha ""
-seta hud_panel_racetimer_bg_border ""
-seta hud_panel_racetimer_bg_padding ""
-
-seta hud_panel_vote 1
-seta hud_panel_vote_pos "0.020000 0.650000"
-seta hud_panel_vote_size "0.230000 0.110000"
-seta hud_panel_vote_bg ""
-seta hud_panel_vote_bg_color ""
-seta hud_panel_vote_bg_color_team ""
-seta hud_panel_vote_bg_alpha ""
-seta hud_panel_vote_bg_border ""
-seta hud_panel_vote_bg_padding ""
-seta hud_panel_vote_alreadyvoted_alpha "0.800000"
-
-seta hud_panel_modicons 1
-seta hud_panel_modicons_pos "0.040000 0.270000"
-seta hud_panel_modicons_size "0.080000 0.200000"
-seta hud_panel_modicons_bg ""
-seta hud_panel_modicons_bg_color ""
-seta hud_panel_modicons_bg_color_team ""
-seta hud_panel_modicons_bg_alpha ""
-seta hud_panel_modicons_bg_border ""
-seta hud_panel_modicons_bg_padding ""
-
-seta hud_panel_pressedkeys 1
-seta hud_panel_pressedkeys_pos "0.410000 0.710000"
-seta hud_panel_pressedkeys_size "0.180000 0.130000"
-seta hud_panel_pressedkeys_bg "0"
-seta hud_panel_pressedkeys_bg_color ""
-seta hud_panel_pressedkeys_bg_color_team ""
-seta hud_panel_pressedkeys_bg_alpha ""
-seta hud_panel_pressedkeys_bg_border ""
-seta hud_panel_pressedkeys_bg_padding ""
-seta hud_panel_pressedkeys_aspect "1.600000"
-
-seta hud_panel_chat 1
-seta hud_panel_chat_pos "0.020000 0.780000"
-seta hud_panel_chat_size "0.630000 0.110000"
-seta hud_panel_chat_bg "0"
-seta hud_panel_chat_bg_color ""
-seta hud_panel_chat_bg_color_team ""
-seta hud_panel_chat_bg_alpha ""
-seta hud_panel_chat_bg_border ""
-seta hud_panel_chat_bg_padding ""
-
-seta hud_panel_engineinfo 1
-seta hud_panel_engineinfo_pos "0.910000 0.970000"
-seta hud_panel_engineinfo_size "0.090000 0.030000"
-seta hud_panel_engineinfo_bg "0"
-seta hud_panel_engineinfo_bg_color ""
-seta hud_panel_engineinfo_bg_color_team ""
-seta hud_panel_engineinfo_bg_alpha ""
-seta hud_panel_engineinfo_bg_border ""
-seta hud_panel_engineinfo_bg_padding ""
-
-seta hud_panel_infomessages 1
-seta hud_panel_infomessages_pos "0.510000 0"
-seta hud_panel_infomessages_size "0.340000 0.090000"
-seta hud_panel_infomessages_bg "0"
-seta hud_panel_infomessages_bg_color ""
-seta hud_panel_infomessages_bg_color_team ""
-seta hud_panel_infomessages_bg_alpha ""
-seta hud_panel_infomessages_bg_border ""
-seta hud_panel_infomessages_bg_padding "0"
-seta hud_panel_infomessages_flip "1"
-
-menu_sync
diff --git a/hud_luminos.cfg b/hud_luminos.cfg
new file mode 100644 (file)
index 0000000..5660da4
--- /dev/null
@@ -0,0 +1,205 @@
+seta hud_skin "luminos"
+seta hud_panel_bg "border_default"
+seta hud_panel_bg_color "1 0.4375 0"
+seta hud_panel_bg_color_team "0"
+seta hud_panel_bg_alpha "1"
+seta hud_panel_bg_border "8"
+seta hud_panel_bg_padding "2"
+seta hud_panel_fg_alpha "1"
+
+seta hud_dock "dock"
+seta hud_dock_color "0 0.1875 0.40625"
+seta hud_dock_color_team "0.700000"
+seta hud_dock_alpha "1"
+
+seta hud_progressbar_alpha "0.500000"
+seta hud_progressbar_strength_color "0 0 0.6"
+seta hud_progressbar_shield_color "0.6 0 0.6"
+seta hud_progressbar_health_color "0.6 0 0"
+seta hud_progressbar_armor_color "0 0.6 0"
+seta hud_progressbar_fuel_color "0.6 0.6 0"
+seta hud_progressbar_nexball_color "0.7 0.1 0"
+
+seta _hud_panelorder "10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 "
+
+seta hud_configure_grid "1"
+seta hud_configure_grid_xsize "0.010000"
+seta hud_configure_grid_ysize "0.010000"
+
+seta scr_centerpos "0.25"
+
+seta hud_panel_weapons 1
+seta hud_panel_weapons_pos "0.920000 0.090000"
+seta hud_panel_weapons_size "0.060000 0.630000"
+seta hud_panel_weapons_bg ""
+seta hud_panel_weapons_bg_color ""
+seta hud_panel_weapons_bg_color_team ""
+seta hud_panel_weapons_bg_alpha ""
+seta hud_panel_weapons_bg_border ""
+seta hud_panel_weapons_bg_padding ""
+seta hud_panel_weapons_complainbubble "1"
+seta hud_panel_weapons_complainbubble_padding "-10"
+seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
+seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
+seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
+seta hud_panel_weapons_ammo_color "0 1 0"
+seta hud_panel_weapons_ammo_alpha "1"
+seta hud_panel_weapons_aspect "2"
+
+seta hud_panel_ammo 1
+seta hud_panel_ammo_pos "0.190000 0.920000"
+seta hud_panel_ammo_size "0.120000 0.070000"
+seta hud_panel_ammo_bg ""
+seta hud_panel_ammo_bg_color ""
+seta hud_panel_ammo_bg_color_team ""
+seta hud_panel_ammo_bg_alpha ""
+seta hud_panel_ammo_bg_border ""
+seta hud_panel_ammo_bg_padding ""
+seta hud_panel_ammo_onlycurrent "0"
+seta hud_panel_ammo_iconalign "0"
+
+seta hud_panel_powerups 1
+seta hud_panel_powerups_pos "0.660000 0.940000"
+seta hud_panel_powerups_size "0.330000 0.060000"
+seta hud_panel_powerups_bg "0"
+seta hud_panel_powerups_bg_color ""
+seta hud_panel_powerups_bg_color_team ""
+seta hud_panel_powerups_bg_alpha ""
+seta hud_panel_powerups_bg_border ""
+seta hud_panel_powerups_bg_padding ""
+seta hud_panel_powerups_flip "1"
+seta hud_panel_powerups_iconalign "4"
+seta hud_panel_powerups_baralign "4"
+seta hud_panel_powerups_progressbar "1"
+
+seta hud_panel_healtharmor 1
+seta hud_panel_healtharmor_pos "0.330000 0.920000"
+seta hud_panel_healtharmor_size "0.310000 0.070000"
+seta hud_panel_healtharmor_bg ""
+seta hud_panel_healtharmor_bg_color ""
+seta hud_panel_healtharmor_bg_color_team ""
+seta hud_panel_healtharmor_bg_alpha ""
+seta hud_panel_healtharmor_bg_border ""
+seta hud_panel_healtharmor_bg_padding ""
+seta hud_panel_healtharmor_flip "0
+seta hud_panel_healtharmor_iconalign "4"
+seta hud_panel_healtharmor_baralign "4"
+seta hud_panel_healtharmor_progressbar "1"
+
+seta hud_panel_notify 1
+seta hud_panel_notify_pos "0.660000 0.730000"
+seta hud_panel_notify_size "0.320000 0.190000"
+seta hud_panel_notify_bg "0"
+seta hud_panel_notify_bg_color ""
+seta hud_panel_notify_bg_color_team ""
+seta hud_panel_notify_bg_alpha ""
+seta hud_panel_notify_bg_border ""
+seta hud_panel_notify_bg_padding ""
+seta hud_panel_notify_flip "0"
+seta hud_panel_notify_print "1"
+
+seta hud_panel_timer 1
+seta hud_panel_timer_pos "0.870000 0"
+seta hud_panel_timer_size "0.130000 0.060000"
+seta hud_panel_timer_bg "0"
+seta hud_panel_timer_bg_color ""
+seta hud_panel_timer_bg_color_team ""
+seta hud_panel_timer_bg_alpha ""
+seta hud_panel_timer_bg_border ""
+seta hud_panel_timer_bg_padding "0"
+
+seta hud_panel_radar 1
+seta hud_panel_radar_pos "0.030000 0.020000"
+seta hud_panel_radar_size "0.170000 0.220000"
+seta hud_panel_radar_bg ""
+seta hud_panel_radar_bg_color ""
+seta hud_panel_radar_bg_color_team ""
+seta hud_panel_radar_bg_alpha ""
+seta hud_panel_radar_bg_border ""
+seta hud_panel_radar_bg_padding "-3"
+seta hud_panel_radar_foreground_alpha "0.800000"
+
+seta hud_panel_score 1
+seta hud_panel_score_pos "0.020000 0.920000"
+seta hud_panel_score_size "0.150000 0.070000"
+seta hud_panel_score_bg ""
+seta hud_panel_score_bg_color ""
+seta hud_panel_score_bg_color_team ""
+seta hud_panel_score_bg_alpha ""
+seta hud_panel_score_bg_border ""
+seta hud_panel_score_bg_padding ""
+
+seta hud_panel_racetimer 1
+seta hud_panel_racetimer_pos "0.360000 0.090000"
+seta hud_panel_racetimer_size "0.280000 0.090000"
+seta hud_panel_racetimer_bg "0"
+seta hud_panel_racetimer_bg_color ""
+seta hud_panel_racetimer_bg_color_team ""
+seta hud_panel_racetimer_bg_alpha ""
+seta hud_panel_racetimer_bg_border ""
+seta hud_panel_racetimer_bg_padding ""
+
+seta hud_panel_vote 1
+seta hud_panel_vote_pos "0.020000 0.650000"
+seta hud_panel_vote_size "0.230000 0.110000"
+seta hud_panel_vote_bg ""
+seta hud_panel_vote_bg_color ""
+seta hud_panel_vote_bg_color_team ""
+seta hud_panel_vote_bg_alpha ""
+seta hud_panel_vote_bg_border ""
+seta hud_panel_vote_bg_padding ""
+seta hud_panel_vote_alreadyvoted_alpha "0.800000"
+
+seta hud_panel_modicons 1
+seta hud_panel_modicons_pos "0.040000 0.270000"
+seta hud_panel_modicons_size "0.080000 0.200000"
+seta hud_panel_modicons_bg ""
+seta hud_panel_modicons_bg_color ""
+seta hud_panel_modicons_bg_color_team ""
+seta hud_panel_modicons_bg_alpha ""
+seta hud_panel_modicons_bg_border ""
+seta hud_panel_modicons_bg_padding ""
+
+seta hud_panel_pressedkeys 1
+seta hud_panel_pressedkeys_pos "0.410000 0.710000"
+seta hud_panel_pressedkeys_size "0.180000 0.130000"
+seta hud_panel_pressedkeys_bg "0"
+seta hud_panel_pressedkeys_bg_color ""
+seta hud_panel_pressedkeys_bg_color_team ""
+seta hud_panel_pressedkeys_bg_alpha ""
+seta hud_panel_pressedkeys_bg_border ""
+seta hud_panel_pressedkeys_bg_padding ""
+seta hud_panel_pressedkeys_aspect "1.600000"
+
+seta hud_panel_chat 1
+seta hud_panel_chat_pos "0.020000 0.780000"
+seta hud_panel_chat_size "0.630000 0.110000"
+seta hud_panel_chat_bg "0"
+seta hud_panel_chat_bg_color ""
+seta hud_panel_chat_bg_color_team ""
+seta hud_panel_chat_bg_alpha ""
+seta hud_panel_chat_bg_border ""
+seta hud_panel_chat_bg_padding ""
+
+seta hud_panel_engineinfo 1
+seta hud_panel_engineinfo_pos "0.910000 0.970000"
+seta hud_panel_engineinfo_size "0.090000 0.030000"
+seta hud_panel_engineinfo_bg "0"
+seta hud_panel_engineinfo_bg_color ""
+seta hud_panel_engineinfo_bg_color_team ""
+seta hud_panel_engineinfo_bg_alpha ""
+seta hud_panel_engineinfo_bg_border ""
+seta hud_panel_engineinfo_bg_padding ""
+
+seta hud_panel_infomessages 1
+seta hud_panel_infomessages_pos "0.510000 0"
+seta hud_panel_infomessages_size "0.340000 0.090000"
+seta hud_panel_infomessages_bg "0"
+seta hud_panel_infomessages_bg_color ""
+seta hud_panel_infomessages_bg_color_team ""
+seta hud_panel_infomessages_bg_alpha ""
+seta hud_panel_infomessages_bg_border ""
+seta hud_panel_infomessages_bg_padding "0"
+seta hud_panel_infomessages_flip "1"
+
+menu_sync
diff --git a/hud_luminos_default.cfg b/hud_luminos_default.cfg
deleted file mode 100644 (file)
index 813947b..0000000
+++ /dev/null
@@ -1,205 +0,0 @@
-seta hud_skin "luminos"
-seta hud_panel_bg "border_default"
-seta hud_panel_bg_color "0.875 0.375 0"
-seta hud_panel_bg_color_team "0"
-seta hud_panel_bg_alpha "1"
-seta hud_panel_bg_border "8"
-seta hud_panel_bg_padding "2"
-seta hud_panel_fg_alpha "1"
-
-seta hud_dock "dock"
-seta hud_dock_color "0 0.1875 0.4375"
-seta hud_dock_color_team "0.700000"
-seta hud_dock_alpha "1"
-
-seta hud_progressbar_alpha "0.500000"
-seta hud_progressbar_strength_color "0 0 0.6"
-seta hud_progressbar_shield_color "0.6 0 0.6"
-seta hud_progressbar_health_color "0.6 0 0"
-seta hud_progressbar_armor_color "0 0.6 0"
-seta hud_progressbar_fuel_color "0.6 0.6 0"
-seta hud_progressbar_nexball_color "0.7 0.1 0"
-
-seta _hud_panelorder "10 9 6 8 14 5 0 4 13 2 7 1 3 11 12 "
-
-seta hud_configure_grid "1"
-seta hud_configure_grid_xsize "0.010000"
-seta hud_configure_grid_ysize "0.010000"
-
-seta scr_centerpos "0.25"
-
-seta hud_panel_weapons 1
-seta hud_panel_weapons_pos "0.920000 0.090000"
-seta hud_panel_weapons_size "0.060000 0.630000"
-seta hud_panel_weapons_bg ""
-seta hud_panel_weapons_bg_color ""
-seta hud_panel_weapons_bg_color_team ""
-seta hud_panel_weapons_bg_alpha ""
-seta hud_panel_weapons_bg_border ""
-seta hud_panel_weapons_bg_padding ""
-seta hud_panel_weapons_complainbubble "1"
-seta hud_panel_weapons_complainbubble_padding "-10"
-seta hud_panel_weapons_complainbubble_color_outofammo "0.8 0 0"
-seta hud_panel_weapons_complainbubble_color_donthave "0.8 0.5 0"
-seta hud_panel_weapons_complainbubble_color_unavailable "0 0.3 0.8"
-seta hud_panel_weapons_ammo_color "0 1 0"
-seta hud_panel_weapons_ammo_alpha "1"
-seta hud_panel_weapons_aspect "2"
-
-seta hud_panel_ammo 1
-seta hud_panel_ammo_pos "0.190000 0.920000"
-seta hud_panel_ammo_size "0.120000 0.070000"
-seta hud_panel_ammo_bg ""
-seta hud_panel_ammo_bg_color ""
-seta hud_panel_ammo_bg_color_team ""
-seta hud_panel_ammo_bg_alpha ""
-seta hud_panel_ammo_bg_border ""
-seta hud_panel_ammo_bg_padding ""
-seta hud_panel_ammo_onlycurrent "0"
-seta hud_panel_ammo_iconalign "0"
-
-seta hud_panel_powerups 1
-seta hud_panel_powerups_pos "0.660000 0.940000"
-seta hud_panel_powerups_size "0.330000 0.060000"
-seta hud_panel_powerups_bg "0"
-seta hud_panel_powerups_bg_color ""
-seta hud_panel_powerups_bg_color_team ""
-seta hud_panel_powerups_bg_alpha ""
-seta hud_panel_powerups_bg_border ""
-seta hud_panel_powerups_bg_padding ""
-seta hud_panel_powerups_flip "1"
-seta hud_panel_powerups_iconalign "4"
-seta hud_panel_powerups_baralign "4"
-seta hud_panel_powerups_progressbar "1"
-
-seta hud_panel_healtharmor 1
-seta hud_panel_healtharmor_pos "0.330000 0.920000"
-seta hud_panel_healtharmor_size "0.310000 0.070000"
-seta hud_panel_healtharmor_bg ""
-seta hud_panel_healtharmor_bg_color ""
-seta hud_panel_healtharmor_bg_color_team ""
-seta hud_panel_healtharmor_bg_alpha ""
-seta hud_panel_healtharmor_bg_border ""
-seta hud_panel_healtharmor_bg_padding ""
-seta hud_panel_healtharmor_flip "0
-seta hud_panel_healtharmor_iconalign "4"
-seta hud_panel_healtharmor_baralign "4"
-seta hud_panel_healtharmor_progressbar "1"
-
-seta hud_panel_notify 1
-seta hud_panel_notify_pos "0.660000 0.730000"
-seta hud_panel_notify_size "0.320000 0.190000"
-seta hud_panel_notify_bg "0"
-seta hud_panel_notify_bg_color ""
-seta hud_panel_notify_bg_color_team ""
-seta hud_panel_notify_bg_alpha ""
-seta hud_panel_notify_bg_border ""
-seta hud_panel_notify_bg_padding ""
-seta hud_panel_notify_flip "0"
-seta hud_panel_notify_print "1"
-
-seta hud_panel_timer 1
-seta hud_panel_timer_pos "0.870000 0"
-seta hud_panel_timer_size "0.130000 0.060000"
-seta hud_panel_timer_bg "0"
-seta hud_panel_timer_bg_color ""
-seta hud_panel_timer_bg_color_team ""
-seta hud_panel_timer_bg_alpha ""
-seta hud_panel_timer_bg_border ""
-seta hud_panel_timer_bg_padding "0"
-
-seta hud_panel_radar 1
-seta hud_panel_radar_pos "0.030000 0.020000"
-seta hud_panel_radar_size "0.170000 0.220000"
-seta hud_panel_radar_bg ""
-seta hud_panel_radar_bg_color ""
-seta hud_panel_radar_bg_color_team ""
-seta hud_panel_radar_bg_alpha ""
-seta hud_panel_radar_bg_border ""
-seta hud_panel_radar_bg_padding "-3"
-seta hud_panel_radar_foreground_alpha "0.800000"
-
-seta hud_panel_score 1
-seta hud_panel_score_pos "0.020000 0.920000"
-seta hud_panel_score_size "0.150000 0.070000"
-seta hud_panel_score_bg ""
-seta hud_panel_score_bg_color ""
-seta hud_panel_score_bg_color_team ""
-seta hud_panel_score_bg_alpha ""
-seta hud_panel_score_bg_border ""
-seta hud_panel_score_bg_padding ""
-
-seta hud_panel_racetimer 1
-seta hud_panel_racetimer_pos "0.360000 0.090000"
-seta hud_panel_racetimer_size "0.280000 0.090000"
-seta hud_panel_racetimer_bg "0"
-seta hud_panel_racetimer_bg_color ""
-seta hud_panel_racetimer_bg_color_team ""
-seta hud_panel_racetimer_bg_alpha ""
-seta hud_panel_racetimer_bg_border ""
-seta hud_panel_racetimer_bg_padding ""
-
-seta hud_panel_vote 1
-seta hud_panel_vote_pos "0.020000 0.650000"
-seta hud_panel_vote_size "0.230000 0.110000"
-seta hud_panel_vote_bg ""
-seta hud_panel_vote_bg_color ""
-seta hud_panel_vote_bg_color_team ""
-seta hud_panel_vote_bg_alpha ""
-seta hud_panel_vote_bg_border ""
-seta hud_panel_vote_bg_padding ""
-seta hud_panel_vote_alreadyvoted_alpha "0.800000"
-
-seta hud_panel_modicons 1
-seta hud_panel_modicons_pos "0.040000 0.270000"
-seta hud_panel_modicons_size "0.080000 0.200000"
-seta hud_panel_modicons_bg ""
-seta hud_panel_modicons_bg_color ""
-seta hud_panel_modicons_bg_color_team ""
-seta hud_panel_modicons_bg_alpha ""
-seta hud_panel_modicons_bg_border ""
-seta hud_panel_modicons_bg_padding ""
-
-seta hud_panel_pressedkeys 1
-seta hud_panel_pressedkeys_pos "0.410000 0.710000"
-seta hud_panel_pressedkeys_size "0.180000 0.130000"
-seta hud_panel_pressedkeys_bg "0"
-seta hud_panel_pressedkeys_bg_color ""
-seta hud_panel_pressedkeys_bg_color_team ""
-seta hud_panel_pressedkeys_bg_alpha ""
-seta hud_panel_pressedkeys_bg_border ""
-seta hud_panel_pressedkeys_bg_padding ""
-seta hud_panel_pressedkeys_aspect "1.600000"
-
-seta hud_panel_chat 1
-seta hud_panel_chat_pos "0.020000 0.780000"
-seta hud_panel_chat_size "0.630000 0.110000"
-seta hud_panel_chat_bg "0"
-seta hud_panel_chat_bg_color ""
-seta hud_panel_chat_bg_color_team ""
-seta hud_panel_chat_bg_alpha ""
-seta hud_panel_chat_bg_border ""
-seta hud_panel_chat_bg_padding ""
-
-seta hud_panel_engineinfo 1
-seta hud_panel_engineinfo_pos "0.910000 0.970000"
-seta hud_panel_engineinfo_size "0.090000 0.030000"
-seta hud_panel_engineinfo_bg "0"
-seta hud_panel_engineinfo_bg_color ""
-seta hud_panel_engineinfo_bg_color_team ""
-seta hud_panel_engineinfo_bg_alpha ""
-seta hud_panel_engineinfo_bg_border ""
-seta hud_panel_engineinfo_bg_padding ""
-
-seta hud_panel_infomessages 1
-seta hud_panel_infomessages_pos "0.510000 0"
-seta hud_panel_infomessages_size "0.340000 0.090000"
-seta hud_panel_infomessages_bg "0"
-seta hud_panel_infomessages_bg_color ""
-seta hud_panel_infomessages_bg_color_team ""
-seta hud_panel_infomessages_bg_alpha ""
-seta hud_panel_infomessages_bg_border ""
-seta hud_panel_infomessages_bg_padding "0"
-seta hud_panel_infomessages_flip "1"
-
-menu_sync
index 07898df..9df213c 100644 (file)
@@ -703,6 +703,21 @@ void spawnfunc_worldspawn (void)
 
        localcmd("\n_sv_hook_gamestart ", GetGametype(), "\n");
 
+       // fill sv_curl_serverpackages from .serverpackage files
+       if(cvar("sv_curl_serverpackages_auto"))
+       {
+               fd = search_begin("*.serverpackage", TRUE, FALSE);
+               s = "";
+               if(fd >= 0)
+               {
+                       j = search_getsize(fd);
+                       for(i = 0; i < j; ++i)
+                               s = strcat(s, " ", search_getfilename(fd, i));
+                       search_end(fd);
+               }
+               cvar_set("sv_curl_serverpackages", substring(s, 1, -1));
+       }
+
        world_initialized = 1;
 }