Merge branch 'master' into terencehill/screenshot_viewer

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer.c
	qcsrc/menu/xonotic/mainwindow.c

diff --cc gfx/menu/default/skinvalues.txt
index de81ef878cfa3bdd7fba6a8ef7327f114802c963,b2b0a97008db10893fac7592b3a5132c4d0bae09..9226848bfcb767a9a3487913b602301c83a39b95
--- 1/gfx/menu/default/skinvalues.txt
--- 2/gfx/menu/default/skinvalues.txt
+++ b/gfx/menu/default/skinvalues.txt
@@@ -174,10 -174,9 +174,10 @@@ 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_WAYPOINTS          '1 1 1'
  COLOR_DIALOG_SERVERINFO         '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
 +COLOR_DIALOG_SCREENSHOTVIEWER   '1 1 1'
  
  // item: input box
  //   uses "inputbox" images

diff --cc gfx/menu/xaw/skinvalues.txt
index b34f88c8a099538899964a7bc618c422238565fa,eae123ce79fa059b02987416f594302d08d96c63..a15696a6d856f5b637eff14f073e71f8b9fdf0ce
--- 1/gfx/menu/xaw/skinvalues.txt
--- 2/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@@ -29,10 -29,9 +29,10 @@@ 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_WAYPOINTS          '1 1 1'
  COLOR_DIALOG_SERVERINFO         '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
 +COLOR_DIALOG_SCREENSHOTVIEWER   '1 1 1'
  
  // nexposee positions of windows (they are the scale transformation
  // centers, NOT the actual positions of the windows!)

diff --cc qcsrc/menu/classes.c
Simple merge

diff --cc qcsrc/menu/skin-customizables.inc
index 5270cb6722312d1f6adf4742f353f40e732db6f0,ca8f4cf8e959ee7d2a5755e74e82def02d543c0b..3997048157c80748a5d9ce13d9705fe5aa336c0c
--- 1/qcsrc/menu/skin-customizables.inc
--- 2/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@@ -62,10 -63,9 +63,10 @@@ SKINBEGI
        SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
        SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
-       SKINVECTOR(COLOR_DIALOG_RADAR, '0.7 0.7 1');
+       SKINVECTOR(COLOR_DIALOG_WAYPOINTS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 +      SKINVECTOR(COLOR_DIALOG_SCREENSHOTVIEWER, '0.7 0.7 1');
  
        // nexposee positions of windows (they are the scale transformation
        // centers, NOT the actual positions of the windows!)

diff --cc qcsrc/menu/xonotic/dialog_multiplayer.c
index a31683e39ad1e8bff5700206ab1311a5a6b1b5f0,2492581d0603178b2b43dd9b372b38e57c7f667f..878c5e2a0fab9c148b583ee867f6d97f9b1e4e08
--- 1/qcsrc/menu/xonotic/dialog_multiplayer.c
--- 2/qcsrc/menu/xonotic/dialog_multiplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer.c
@@@ -15,15 -15,10 +15,11 @@@ void XonoticMultiplayerDialog_fill(enti
        entity mc, e;
        mc = makeXonoticTabController(me.rows - 2);
        me.TR(me);
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Servers",  makeXonoticServerListTab()));
-                       setDependentStringNotEqual(e, "_cl_name", "Player");
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Create",  makeXonoticServerCreateTab()));
-                       setDependentStringNotEqual(e, "_cl_name", "Player");
-               me.TD(me, 1, 1, mc.makeTabButton(mc, "Demos",   makeXonoticDemoBrowserTab()));
-               me.TD(me, 1, 1, mc.makeTabButton(mc, "Screenshots",   makeXonoticScreenshotBrowserTab()));
-               me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Player Setup",  makeXonoticPlayerSettingsTab()));
-                       if(cvar_string("_cl_name") == "Player")
-                               e.onClick(e, e.onClickEntity); // lol animation
+               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"),  makeXonoticServerListTab()));
+               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"),  makeXonoticServerCreateTab()));
+               me.TD(me, 1, 1, mc.makeTabButton(mc, _("Demos"),   makeXonoticDemoBrowserTab()));
++              me.TD(me, 1, 1, mc.makeTabButton(mc, _("Screenshots"),   makeXonoticScreenshotBrowserTab()));
+               me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Player Setup"),  makeXonoticPlayerSettingsTab()));
  
        me.TR(me);
        me.TR(me);

diff --cc qcsrc/menu/xonotic/mainwindow.c
index 55a5a078901b4e24dadc8d7a2937cb77ad716743,bd15150a8cfb59ac1ec45e390a5b9c4a831cf801..314d192bb9b39f8b69d96ffce17132099c3d3e52
--- 1/qcsrc/menu/xonotic/mainwindow.c
--- 2/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -11,8 -12,9 +12,10 @@@ CLASS(MainWindow) EXTENDS(ModalControll
        ATTRIB(MainWindow, waypointDialog, entity, NULL)
        ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
        ATTRIB(MainWindow, cvarsDialog, entity, NULL)
++      ATTRIB(MainWindow, screenshotViewerDialog, entity, NULL)
        ATTRIB(MainWindow, mainNexposee, entity, NULL)
        ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
+       ATTRIB(MainWindow, dialogToShow, entity, NULL)
  ENDCLASS(MainWindow)
  #endif