From: terencehill Date: Mon, 19 Jan 2015 18:21:08 +0000 (+0100) Subject: Merge branch 'master' into terencehill/welcome_dialog X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cfd3098e371b5fd7c8aee539bf698d6245595d64;p=xonotic%2Fxonotic-data.pk3dir.git 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 --- cfd3098e371b5fd7c8aee539bf698d6245595d64 diff --cc gfx/menu/luminos/skinvalues.txt index e4f417cbf,77af6c8dc..af9aca713 --- a/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 b8e711972,8b56baa1f..277642d36 mode 100755,100644..100755 --- a/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 af6b0ebba,57c6f2a35..fd298fe12 --- a/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 edc1a6fb0,d6b00ec9f..eb80195e4 --- a/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 e769ad88a,8586cffa9..25ae390ac --- a/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 e43282060,9f01ee3fb..038802eb8 --- a/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 4b59146bc,c7499e58e..6b8ba6c30 --- a/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 9a9f124ba,ee0e76f39..15ba83827 --- a/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 5dc781e72,6fa40bfac..adb7509b2 --- a/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/command/cmd.qc index facdaa22c,898e7db18..2772d4488 --- a/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") \