Merge branch 'Mario/quickmenu_merge' of http://nl.git.xonotic.org/xonotic/xonotic...

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index a26aadcff8dd1d98c6ada810e14b0a7cfdc88636..81d3ce929b0a6616d0ff68936e7f519bbba664c9 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -296,7 +296,7 @@ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
 
 seta hud_panel_quickmenu 1
-seta hud_panel_quickmenu_pos "0.000000 0.430000"
+seta hud_panel_quickmenu_pos "0.010000 0.410000"
 seta hud_panel_quickmenu_size "0.210000 0.250000"
 seta hud_panel_quickmenu_bg ""
 seta hud_panel_quickmenu_bg_color ""

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 4b5b5cef34ce386b48dfc79bd70127e6d2760cf2..ddad55747ca219dacb7518f9d252149c79308dfb 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -296,7 +296,7 @@ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
 
 seta hud_panel_quickmenu 1
-seta hud_panel_quickmenu_pos "0.000000 0.430000"
+seta hud_panel_quickmenu_pos "0.010000 0.410000"
 seta hud_panel_quickmenu_size "0.210000 0.250000"
 seta hud_panel_quickmenu_bg ""
 seta hud_panel_quickmenu_bg_color ""

diff --git a/hud_luminos_minimal_xhair.cfg b/hud_luminos_minimal_xhair.cfg
index 5f606282afb4d9707d223c4a1256f165a5022dc2..758f18c71bf78a1349671df9005c7346f405222d 100644 (file)
--- a/hud_luminos_minimal_xhair.cfg
+++ b/hud_luminos_minimal_xhair.cfg
@@ -296,7 +296,7 @@ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
 
 seta hud_panel_quickmenu 1
-seta hud_panel_quickmenu_pos "0.000000 0.430000"
+seta hud_panel_quickmenu_pos "0.010000 0.410000"
 seta hud_panel_quickmenu_size "0.210000 0.250000"
 seta hud_panel_quickmenu_bg ""
 seta hud_panel_quickmenu_bg_color ""

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 85442906e644a1eadb4f943b440abf280ae3dd06..ac1fd12fb9180d06e4f07ee13ecc9e8de08d218f 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -296,7 +296,7 @@ seta hud_panel_centerprint_fade_subsequent_minfontsize "0.75"
 seta hud_panel_centerprint_fade_minfontsize "0"
 
 seta hud_panel_quickmenu 1
-seta hud_panel_quickmenu_pos "0.000000 0.380000"
+seta hud_panel_quickmenu_pos "0.010000 0.380000"
 seta hud_panel_quickmenu_size "0.210000 0.250000"
 seta hud_panel_quickmenu_bg ""
 seta hud_panel_quickmenu_bg_color ""

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 41ee45c0efb0c7d46838f0f7d5009428697ce4a3..bfee552ce4924e91fea22196980ad391f19ae5d1 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4390,7 +4390,8 @@ void HUD_CenterPrint (void)
        }
 }
 
-
+// QuickMenu (#17)
+//
 // QUICKMENU_MAXLINES must be <= 10
 #define QUICKMENU_MAXLINES 10
 #define QUICKMENU_MAXENTRIES 256

diff --git a/quickmenu.txt b/quickmenu.txt
index 15c589a1e5b160560aaf975d3693f521139c428f..d6fea367347c2e4194f94731be7cceaaf0240ea8 100644 (file)
--- a/quickmenu.txt
+++ b/quickmenu.txt
@@ -1,56 +1,66 @@
 "Chat"
-       "nice one" "say :-) / nice one"
-       "good game" "say good game"
-       "hi / good luck" "say hi / good luck and have fun"
+       "nice one" "say :-) / nice one; cl_cmd hud quickmenu"
+       "good game" "say good game; cl_cmd hud quickmenu"
+       "hi / good luck" "say hi / good luck and have fun; cl_cmd hud quickmenu"
 "Chat"
 
 "Team chat"
-       "quad soon" "say_team quad soon"
-       "free item, icon" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p"
-       "took item, icon" "say_team took item (l:%l^7); g_waypointsprite_team_here"
-       "negative" "say_team negative"
-       "positive" "say_team positive"
-       "need help, icon" "say_team need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme; cmd voice needhelp"
-       "enemy seen, icon" "say_team enemy seen (l:%y^7); g_waypointsprite_team_danger_p; cmd voice incoming"
-       "flag seen, icon" "say_team flag seen (l:%y^7); g_waypointsprite_team_here_p; cmd voice seenflag"
-       "defending, icon" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here"
-       "roaming, icon" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here"
-       "attacking, icon" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here"
-       "killed flag, icon" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_here_p"
-       "dropped flag, icon" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d"
-       "drop gun, icon" "say_team dropped gun %w^7 (l:%l^7); g_waypointsprite_team_here; wait; dropweapon"
-       "drop flag/key, icon" "say_team dropped flag/key %w^7 (l:%l^7); g_waypointsprite_team_here; wait; +use"
+       "quad soon" "say_team quad soon; cl_cmd hud quickmenu"
+       "free item, icon" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p; cl_cmd hud quickmenu"
+       "took item, icon" "say_team took item (l:%l^7); g_waypointsprite_team_here; cl_cmd hud quickmenu"
+       "negative" "say_team negative; cl_cmd hud quickmenu"
+       "positive" "say_team positive; cl_cmd hud quickmenu"
+       "need help, icon" "say_team need help (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_helpme; cmd voice needhelp; cl_cmd hud quickmenu"
+       "enemy seen, icon" "say_team enemy seen (l:%y^7); g_waypointsprite_team_danger_p; cmd voice incoming; cl_cmd hud quickmenu"
+       "flag seen, icon" "say_team flag seen (l:%y^7); g_waypointsprite_team_here_p; cmd voice seenflag; cl_cmd hud quickmenu"
+       "defending, icon" "say_team defending (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here; cl_cmd hud quickmenu"
+       "roaming, icon" "say_team roaming (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here; cl_cmd hud quickmenu"
+       "attacking, icon" "say_team attacking (l:%l^7) (h:%h^7 a:%a^7 w:%w^7); g_waypointsprite_team_here; cl_cmd hud quickmenu"
+       "killed flag, icon" "say_team killed flagcarrier (l:%y^7); g_waypointsprite_team_here_p; cl_cmd hud quickmenu"
+       "dropped flag, icon" "say_team dropped flag (l:%d^7); g_waypointsprite_team_here_d; cl_cmd hud quickmenu"
+       "drop gun, icon" "say_team dropped gun %w^7 (l:%l^7); g_waypointsprite_team_here; wait; dropweapon; cl_cmd hud quickmenu"
+       "drop flag/key, icon" "say_team dropped flag/key %w^7 (l:%l^7); g_waypointsprite_team_here; wait; +use; cl_cmd hud quickmenu"
 "Team chat"
 
 "Settings"
        "View/HUD settings"
-               "1st/3rd person view" "toggle chase_active"
-               "Force player models like mine on/off" "toggle cl_forceplayermodels"
-               "Waypoints on/off" "toggle cl_hidewaypoints"
-               "Player waypoints on/off" "toggle hud_shownames"
-               "Crosshair per weapon on/off" "toggle crosshair_per_weapon"
-               "Show fps on/off" "toggle hud_panel_engineinfo"
+               "1st/3rd person view" "toggle chase_active; cl_cmd hud quickmenu"
+               "Force player models on/off" "toggle cl_forceplayermodels; cl_cmd hud quickmenu"
+               "Player names on/off" "toggle hud_shownames; cl_cmd hud quickmenu"
+               "Crosshair per weapon on/off" "toggle crosshair_per_weapon; cl_cmd hud quickmenu"
+               "Show fps on/off" "toggle hud_panel_engineinfo; cl_cmd hud quickmenu"
        "View/HUD settings"
 
        "Sound settings"
-               "Hit sound on/off" "toggle cl_hitsound"
-               "Chat sound on/off" "toggle cl_chatsound"
+               "Hit sound on/off" "toggle cl_hitsound; cl_cmd hud quickmenu"
+               "Chat sound on/off" "toggle cl_chatsound; cl_cmd hud quickmenu"
        "Sound settings"
 
        "Spectator camera"
-               "1st person" "chase_active 0; -use"
-               "3rd person free" "chase_active 1; +use"
-               "3rd person behind" "chase_active 1; -use"
+               "1st person" "chase_active 0; -use; cl_cmd hud quickmenu"
+               "3rd person free" "chase_active 1; +use; cl_cmd hud quickmenu"
+               "3rd person behind" "chase_active 1; -use; cl_cmd hud quickmenu"
        "Spectator camera"
 
        "Observer camera"
-               "Increase speed" "weapnext"
-               "Decrease speed" "weapprev"
-               "Wall collision off" "-use"
-               "Wall collision on" "+use"
+               "Increase speed" "weapnext; cl_cmd hud quickmenu"
+               "Decrease speed" "weapprev; cl_cmd hud quickmenu"
+               "Wall collision off" "-use; cl_cmd hud quickmenu"
+               "Wall collision on" "+use; cl_cmd hud quickmenu"
        "Observer camera"
+       
+       "toggle fullscreen" "toggle vid_fullscreen; vid_restart; cl_cmd hud quickmenu"
 "Settings"
 
-"screenshot" "wait; screenshot"
-"toggle recording .avi" "wait; toggle cl_capturevideo"
-"toggle fullscreen" "toggle vid_fullscreen; vid_restart"
+"Call a vote"
+       "Restart the map" "vcall restart; cl_cmd hud quickmenu"
+       "Endmatch" "vcall endmatch; cl_cmd hud quickmenu"
+       "Reduce matchtime" "vcall reducematchtime; cl_cmd hud quickmenu"
+       "Extend matchtime" "vcall extendmatchtime; cl_cmd hud quickmenu"
+       "Shuffle" "vcall shuffleteams; cl_cmd hud quickmenu"
+       "Cointoss" "vcall cointoss; cl_cmd hud quickmenu"
+       
+       "Vote a map"
+               "lsmaps"
+       "Vote a map"
+"Call a vote"