Merge branch 'master' into terencehill/quickmenu

diff --combined defaultXonotic.cfg
index f649ffde4020a01864a8ec69a3db4c9cb6e7e889,7c66a31a64c71cf042afcc4da44506cb740f3c7a..f23c3f8176da03fcdfa3d407886f644f7f0509e8
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -543,11 -543,46 +543,46 @@@ seta g_maplist_shuffle 1        "new randomiza
  set g_maplist_check_waypoints 0       "when 1, maps are skipped if there currently are bots, but the map has no waypoints"
  set samelevel 0 "when 1, always play the same level over and over again"
  
+ set g_grab_range 200 "distance at which dragable objects can be grabbed"
+ 
  set g_cloaked 0 "display all players mostly invisible"
  set g_player_alpha 1
  set g_player_brightness 0     "set to 2 for brighter players"
  seta g_balance_cloaked_alpha 0.25
  
+ set g_sandbox 0 "allow players to spawn and edit objects around the map"
+ set g_sandbox_info 1 "print object information to the server. 1 prints info about spawned / removed objects, 2 also prints info about edited objects"
+ set g_sandbox_readonly 0 "when this mode is active, players cannot modify objects or use any sandbox commands"
+ set g_sandbox_storage_name default "name of the selected storage to use"
+ set g_sandbox_storage_autosave 5 "storage is automatically saved every specified number of seconds"
+ set g_sandbox_storage_autoload 1 "if a storage file exists for the given map, automatically load it at startup"
+ set g_sandbox_editor_flood 1 "players must wait this many seconds between spawning objects"
+ set g_sandbox_editor_maxobjects 1000 "maximum number of objects that may exist at a time"
+ set g_sandbox_editor_free 1 "0 = players can only copy or edit their own objects, 1 = players can copy but not edit other objects, 2 = players can copy and edit all object"
+ set g_sandbox_editor_distance_spawn 200 "distance at which objects spawn in front of the player"
+ set g_sandbox_editor_distance_edit 300 "distance at which players can edit or remove objects they are looking at"
+ set g_sandbox_object_scale_min 0.1 "minimum scale that objects can be set to"
+ set g_sandbox_object_scale_max 2 "maximum scale that objects can be set to"
+ set g_sandbox_object_material_velocity_min 100 "velocity objects must have while colliding for material effects to be applied"
+ set g_sandbox_object_material_velocity_factor 0.002 "velocity range which decides the intensity of material effects"
+ set cl_sandbox_clipboard ""
+ 
+ seta menu_sandbox_spawn_model ""
+ seta menu_sandbox_attach_bone ""
+ seta menu_sandbox_edit_skin 0
+ seta menu_sandbox_edit_alpha 1
+ seta menu_sandbox_edit_color_main "1 1 1"
+ seta menu_sandbox_edit_color_glow "1 1 1"
+ seta menu_sandbox_edit_frame 0
+ seta menu_sandbox_edit_scale 1
+ seta menu_sandbox_edit_solidity 1
+ seta menu_sandbox_edit_physics 1
+ seta menu_sandbox_edit_force 1
+ seta menu_sandbox_edit_material ""
+ 
+ alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
+ bind f7 menu_showsandboxtools
+ 
  set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"
  set g_botclip_collisions 1 "0 = disable collision testing against botclips, might be useful on some defrag maps"
  
@@@ -1003,6 -1038,8 +1038,8 @@@ alias togglezoom "${_togglezoom}zoom
  
  alias reload "impulse 20"
  
+ alias sandbox "cmd g_sandbox $*"
+ 
  // movement
  bind w +forward
  bind a +moveleft
@@@ -1049,6 -1086,7 +1086,7 @@@ bind r reloa
  bind BACKSPACE dropweapon
  bind g dropweapon
  bind f +use
+ bind v +button8 // drag object
  
  // misc
  bind e +hook
@@@ -1068,8 -1106,6 +1106,8 @@@ bind F11 disconnec
  bind F12 screenshot
  bind F4 ready
  bind ALT +showaccuracy
 +alias quickmenu "cl_cmd hud_panel_quickmenu"
 +bind v quickmenu
  
  // Gamepad defaults. Tested with Logitech Rumblepad 2, I hope similar ones works as well.
  bind JOY1 "+crouch"
@@@ -2047,6 -2083,11 +2085,11 @@@ set g_forced_team_yellow "" "list of pl
  set g_forced_team_pink "" "list of player IDs for pink team"
  set g_forced_team_otherwise "default" "action if a non listed player joins (can be default for default action, spectate for forcing to spectate, or red, blue, yellow, pink)"
  
+ // nice alias to set up a match
+ // example: g_forced_team_matchsetup stormkeep "mzDo0nO2y3XpFPNbQAyeUucyaejZ9xpiXLYMGU2x3qM=" "BRLOGENSHFEGLE/+Mq3x2UGMYLXipx9ZjeaycuUeyAQ="
+ // will set up a match on stormkeep where mzDo0nO2y3XpFPNbQAyeUucyaejZ9xpiXLYMGU2x3qM= and BRLOGENSHFEGLE/+Mq3x2UGMYLXipx9ZjeaycuUeyAQ= play against each other
+ alias g_forced_team_matchsetup "map $1; settemp g_forced_team_red \"$2\"; settemp g_forced_team_blue \"$3\"; settemp g_forced_team_yellow \"$4\"; settemp g_forced_team_pink \"$5\"; settemp g_forced_team_otherwise spectate"
+ 
  // random charge stuff :P
  set g_weapon_charge_colormod_hdrmultiplier 4 "how much to multiply the colors by in the colormod vector"
  set g_weapon_charge_colormod_red_half 0

diff --combined keybinds.txt
index 03dd3417cf4fd814380b30b54f18d8c8e3f5298f,d7ec276f57f9d541057d42ebaccc63776a177069..ee142c69aa3f5df1404707c33d2066784c1b62a6
--- 1/keybinds.txt
--- 2/keybinds.txt
+++ b/keybinds.txt
@@@ -44,7 -44,6 +44,7 @@@
  "ready"                                 "ready"
  ""                                      ""
  ""                                      "Client"
 +"quickmenu"                             "quick menu"
  "+show_info"                            "server info"
  "toggleconsole"                         "enter console"
  "disconnect"                            "disconnect"
@@@ -54,9 -53,11 +54,11 @@@
  "messagemode2"                          "team chat"
  "team_auto"                             "auto-join team"
  "menu_showteamselect"                   "team menu"
+ "menu_showsandboxtools"                 "sandbox menu"
  "spec"                                  "enter spectator mode"
  "dropweapon"                            "drop weapon"
  "+use"                                  "drop key / drop flag"
+ "+button8"                              "drag object"
  ""                                      ""
  ""                                      "User defined"
  "+userbind 1"                           "$userbind1"

diff --combined qcsrc/menu/classes.c
index fc0a9109443e2a3c53ce455655dd6c9387414dc7,c0a9780471e3689ca0f1490c51459d9ce05c84ed..dd4dfaa334609bc7f0211732d232c2da2f486707
--- 1/qcsrc/menu/classes.c
--- 2/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@@ -29,6 -29,7 +29,7 @@@
  #include "xonotic/bigcommandbutton.c"
  #include "xonotic/dialog_firstrun.c"
  #include "xonotic/dialog_teamselect.c"
+ #include "xonotic/dialog_sandboxtools.c"
  #include "xonotic/dialog_settings.c"
  #include "xonotic/dialog_settings_video.c"
  #include "xonotic/dialog_settings_effects.c"
@@@ -105,5 -106,4 +106,5 @@@
  #include "xonotic/dialog_hudpanel_weapons.c"
  #include "xonotic/dialog_hudpanel_physics.c"
  #include "xonotic/dialog_hudpanel_centerprint.c"
 +#include "xonotic/dialog_hudpanel_quickmenu.c"
  #include "xonotic/slider_picmip.c"

diff --combined qcsrc/menu/xonotic/mainwindow.c
index 336622e143a7425da05fa91da64873b59e6d84f7,20627c7a579d25adee8be4192d7e00c8264640e5..b7f51b7a6ef99f1be911bd40fd8362efb70f2753
--- 1/qcsrc/menu/xonotic/mainwindow.c
--- 2/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -49,6 -49,10 +49,10 @@@ void MainWindow_configureMainWindow(ent
        i = spawnXonoticTeamSelectDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+ 
+       i = spawnXonoticSandboxToolsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
        
        i = spawnXonoticHUDExitDialog();
        i.configureDialog(i);
@@@ -122,10 -126,6 +126,10 @@@
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
  
 +      i = spawnXonoticHUDQuickMenuDialog();
 +      i.configureDialog(i);
 +      me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 +
        me.advancedDialog = i = spawnXonoticAdvancedDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);