Merge branch 'master' into terencehill/welcome_dialog

Conflicts:
	gfx/menu/luminos/skinvalues.txt
	gfx/menu/wickedx/skinvalues.txt
	gfx/menu/xaw/skinvalues.txt
	qcsrc/client/Main.qc
	qcsrc/common/constants.qh
	qcsrc/menu/xonotic/mainwindow.c

diff --cc commands.cfg
Simple merge

diff --cc gfx/menu/luminos/skinvalues.txt
index e4f417cbf0345289ee221dc600d917f7c70c2fc2,77af6c8dc0dfededc9af62be884e9eb482f55a90..af9aca7139c77de1345552925014d521a0e0234b
--- 1/gfx/menu/luminos/skinvalues.txt
--- 2/gfx/menu/luminos/skinvalues.txt
+++ b/gfx/menu/luminos/skinvalues.txt
@@@ -180,8 -192,7 +192,9 @@@ 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_SCREENSHOTVIEWER   '1 1 1'
 +COLOR_DIALOG_FIRSTRUN           '1 1 1'
 +COLOR_DIALOG_WELCOME            '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
  COLOR_DIALOG_HUDCONFIRM         '1 0 0'
  

diff --cc gfx/menu/wickedx/skinvalues.txt
index b8e71197296db965448ad38ce9730ddb81e071ce,8b56baa1f3c54a54d561f3a335017a68424fa876..277642d3600e04efdc38db9d1c480a4c655406af
mode 100755,100644..100755
--- 1/gfx/menu/wickedx/skinvalues.txt
--- 2/gfx/menu/wickedx/skinvalues.txt
+++ b/gfx/menu/wickedx/skinvalues.txt
@@@ -180,8 -192,7 +192,9 @@@ 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_SCREENSHOTVIEWER   '1 1 1'
 +COLOR_DIALOG_FIRSTRUN           '1 1 1'
 +COLOR_DIALOG_WELCOME            '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
  COLOR_DIALOG_HUDCONFIRM         '1 0 0'
  

diff --cc gfx/menu/xaw/skinvalues.txt
index af6b0ebbae50e5bc698025580f27553bfe414a9a,57c6f2a35009163a49426aa802b167804474a6f3..fd298fe121b5217b611b344c7961adb473ab3cb5
--- 1/gfx/menu/xaw/skinvalues.txt
--- 2/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@@ -35,8 -36,7 +36,9 @@@ 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_SCREENSHOTVIEWER   '1 1 1'
 +COLOR_DIALOG_FIRSTRUN           '1 1 1'
 +COLOR_DIALOG_WELCOME            '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
  COLOR_DIALOG_HUDCONFIRM         '1 0 0'
  

diff --cc qcsrc/client/Main.qc
index edc1a6fb098b61bb248ae7adbdb3ca4bc189ad6e,d6b00ec9f55182fdee763ce20adb3a7a0639d275..eb80195e4ea6a79968ae75e93adb96a51ca8fec4
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -1283,14 -1244,10 +1279,18 @@@ float CSQC_Parse_TempEntity(
                        cl_notice_read();
                        bHandled = true;
                        break;
+               case TE_CSQC_SHOCKWAVEPARTICLE:
+                       Net_ReadShockwaveParticle();
+                       bHandled = true;
+                       break;
 +              case TE_CSQC_SERVERINFO:
 +                      Net_ReadServerInfo();
 +                      bHandled = true;
 +                      break;
 +              case TE_CSQC_SERVERINFO_PIC:
 +                      Net_ReadServerInfo_Pic();
 +                      bHandled = true;
 +                      break;
                default:
                        // No special logic for this temporary entity; return 0 so the engine can handle it
                        bHandled = false;

diff --cc qcsrc/common/constants.qh
index e769ad88a4a3853c4bd521ec94b77198dadced1f,8586cffa9d539ff5f56067ab570df0e132f43ce6..25ae390ac000323339ec3fc6a779a7936d72e244
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -42,8 -41,7 +41,9 @@@ const float TE_CSQC_MINELAYER_MAXMINES 
  const float TE_CSQC_HAGAR_MAXROCKETS = 111;
  const float TE_CSQC_VEHICLESETUP = 112;
  const float TE_CSQC_SVNOTICE = 113;
- const float TE_CSQC_SERVERINFO = 114;
- const float TE_CSQC_SERVERINFO_PIC = 115;
+ const float TE_CSQC_SHOCKWAVEPARTICLE = 114;
++const float TE_CSQC_SERVERINFO = 115;
++const float TE_CSQC_SERVERINFO_PIC = 116;
  
  const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
  const float RACE_NET_CHECKPOINT_CLEAR = 1;

diff --cc qcsrc/menu/classes.c
index e4328206004877282b0318a5cf02a226fcda2281,9f01ee3fbf08dc8c8a633916923eea028f0d14d1..038802eb85b5f1906b9058548f04efb0692775c9
--- 1/qcsrc/menu/classes.c
--- 2/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@@ -26,10 -26,11 +26,12 @@@
  #include "xonotic/bigbutton.c"
  #include "xonotic/commandbutton.c"
  #include "xonotic/bigcommandbutton.c"
+ #include "xonotic/textlabel.c"
  #include "xonotic/dialog_firstrun.c"
 +#include "xonotic/dialog_welcome.c"
  #include "xonotic/dialog_teamselect.c"
  #include "xonotic/dialog_sandboxtools.c"
+ #include "xonotic/dialog_monstertools.c"
  #include "xonotic/dialog_settings.c"
  #include "xonotic/dialog_settings_video.c"
  #include "xonotic/dialog_settings_effects.c"

diff --cc qcsrc/menu/command/menu_cmd.qc
index 4b59146bc256673b3c0cc0c38043dad077edb93e,c7499e58e40a8a94ba1f31f2c504f0310bb465a3..6b8ba6c303643e152d4d3392dc939d60e7df4a3e
--- 1/qcsrc/menu/command/menu_cmd.qc
--- 2/qcsrc/menu/command/menu_cmd.qc
+++ b/qcsrc/menu/command/menu_cmd.qc
@@@ -51,11 -51,14 +51,17 @@@ void GameCommand(string theCommand
                return;
        }
  
+       if(argv(0) == "update_conwidths_before_vid_restart")
+       {
+               updateConwidths(cvar("vid_width"), cvar("vid_height"), cvar("vid_pixelheight"));
+               return;
+       }
+ 
        if(argv(0) == "directmenu" || argv(0) == "directpanelhudmenu")
        {
 +              float i;
 +              entity e;
 +              string s;
                string filter = string_null;
                if(argv(0) == "directpanelhudmenu")
                        filter = strzone("HUD");

diff --cc qcsrc/menu/skin-customizables.inc
index 9a9f124ba3859d904498a60d581b7c23c57f5827,ee0e76f399f7efbde625505d3b2fd59db7f84dae..15ba8382768d520bdfbdf2e1416da5810e481cbf
--- 1/qcsrc/menu/skin-customizables.inc
--- 2/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@@ -69,8 -70,8 +70,9 @@@ SKINBEGI
        SKINVECTOR(COLOR_DIALOG_CROSSHAIR, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_HUD, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
 +      SKINVECTOR(COLOR_DIALOG_WELCOME, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
+       SKINVECTOR(COLOR_DIALOG_SCREENSHOTVIEWER, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_HUDCONFIRM, '1 0 0');
  
        // nexposee positions of windows (they are the scale transformation

diff --cc qcsrc/menu/xonotic/mainwindow.c
index 5dc781e7246c88677619c2f4cf46d8c8a37fbb8e,6fa40bfac69cf687997ec45952d7b10eb7825d12..adb7509b258c927d638c13f9e47c8574e17fbab5
--- 1/qcsrc/menu/xonotic/mainwindow.c
--- 2/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -199,10 -197,10 +197,14 @@@ void MainWindow_configureMainWindow(ent
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
  
+       i = spawnXonoticMonsterToolsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z * SKINALPHA_DIALOG_SANDBOXTOOLS);
+ 
 +      i = spawnXonoticWelcomeDialog();
 +      i.configureDialog(i);
 +      me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 +
  
        // main dialogs/windows
        me.mainNexposee = n = spawnXonoticNexposee();

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/command/cmd.qc
index facdaa22c7676990ef3a43da6bd41b114053834b,898e7db18faf59a78afe5988320a8a21baa02ccb..2772d4488f54044e0f236509d29ae9de25308238
--- 1/qcsrc/server/command/cmd.qc
--- 2/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@@ -583,8 -729,10 +749,11 @@@ void ClientCommand_(float request
        CLIENT_COMMAND("checkfail", ClientCommand_checkfail(request, command), "Report if a client-side check failed") \
        CLIENT_COMMAND("clientversion", ClientCommand_clientversion(request, arguments), "Release version of the game") \
        CLIENT_COMMAND("mv_getpicture", ClientCommand_mv_getpicture(request, arguments), "Retrieve mapshot picture from the server") \
 +      CLIENT_COMMAND("getserverpic", ClientCommand_getserverpic(request), "Retrieve server banner from the server") \
        CLIENT_COMMAND("join", ClientCommand_join(request), "Become a player in the game") \
+       CLIENT_COMMAND("mobedit", ClientCommand_mobedit(request, arguments), "Edit your monster's properties") \
+       CLIENT_COMMAND("mobkill", ClientCommand_mobkill(request), "Kills your monster") \
+       CLIENT_COMMAND("mobspawn", ClientCommand_mobspawn(request, arguments), "Spawn monsters infront of yourself") \
        CLIENT_COMMAND("ready", ClientCommand_ready(request), "Qualify as ready to end warmup stage (or restart server if allowed)") \
        CLIENT_COMMAND("say", ClientCommand_say(request, arguments, command), "Print a message to chat to all players") \
        CLIENT_COMMAND("say_team", ClientCommand_say_team(request, arguments, command), "Print a message to chat to all team mates") \