Merge branch 'master' into terencehill/itemstime

Conflicts:
	qcsrc/client/hud.qc
	qcsrc/menu/xonotic/mainwindow.c
	qcsrc/server/t_items.qc

diff --cc _hud_common.cfg
Simple merge

diff --cc _hud_descriptions.cfg
Simple merge

diff --cc defaultXonotic.cfg
Simple merge

diff --cc hud_luminos.cfg
Simple merge

diff --cc hud_luminos_minimal.cfg
Simple merge

diff --cc hud_luminos_minimal_xhair.cfg
Simple merge

diff --cc hud_luminos_old.cfg
Simple merge

diff --cc hud_nexuiz.cfg
Simple merge

diff --cc qcsrc/client/autocvars.qh
Simple merge

diff --cc qcsrc/client/hud.qc
index 3e96d9223c4c4e04d0325e3f85f3acf2bd687ad1,27e0a0dc12cad21aa76e9c1337b5ca01dd46dfef..f7ca1a5b9867f3ea7d6996b694be0bcfdb96e882
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -5002,13 -4965,11 +5144,13 @@@ switch (id) {
        case (HUD_PANEL_ENGINEINFO):\
                HUD_EngineInfo(); break;\
        case (HUD_PANEL_INFOMESSAGES):\
-                HUD_InfoMessages(); break;\
+               HUD_InfoMessages(); break;\
        case (HUD_PANEL_PHYSICS):\
-                HUD_Physics(); break;\
+               HUD_Physics(); break;\
        case (HUD_PANEL_CENTERPRINT):\
-                HUD_CenterPrint(); break;\
+               HUD_CenterPrint(); break;\
 +      case (HUD_PANEL_ITEMSTIME):\
-                HUD_ItemsTime(); break;\
++              HUD_ItemsTime(); break;\
  } ENDS_WITH_CURLY_BRACE
  
  void HUD_Main (void)

diff --cc qcsrc/client/hud_config.qc
Simple merge

diff --cc qcsrc/common/constants.qh
index 1dbafdddf5b53270001f290c23f3de49d7b43718,d0149251f49f6827c80eb06eb33e246ed6b9b069..74c45a7a8020d58e4f58f23f7853c2b1a8d91070
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -561,10 -553,7 +565,8 @@@ string HUD_PANELNAME_ENGINEINFO           = "en
  string HUD_PANELNAME_INFOMESSAGES     = "infomessages";
  string HUD_PANELNAME_PHYSICS  = "physics";
  string HUD_PANELNAME_CENTERPRINT      = "centerprint";
 +string HUD_PANELNAME_ITEMSTIME                = "itemstime";
  
- float HUD_MENU_ENABLE         = 0;
- 
  #define SERVERFLAG_ALLOW_FULLBRIGHT 1
  #define SERVERFLAG_TEAMPLAY 2
  #define SERVERFLAG_PLAYERSTATS 4

diff --cc qcsrc/common/util.qh
Simple merge

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

diff --cc qcsrc/menu/xonotic/mainwindow.c
index 3b433fa5afb4122c8a3b5fa3ed9f4e967aaec823,f9d86c2dd229276aadb7272c9484f165bb1ad606..54ed66ada1c30d6fa87d8e364e03e18574bb4b3c
--- 1/qcsrc/menu/xonotic/mainwindow.c
--- 2/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -125,11 -124,35 +124,39 @@@ void MainWindow_configureMainWindow(ent
        i = spawnXonoticHUDCenterprintDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
- 
 +
 +      i = spawnXonoticHUDItemsTimeDialog();
 +      i.configureDialog(i);
 +      me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       
+       // dialogs used by settings
+       me.userbindEditDialog = i = spawnXonoticUserbindEditDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       me.cvarsDialog = i = spawnXonoticCvarsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       
+       // dialog used by singleplayer
+       me.winnerDialog = i = spawnXonoticWinnerDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       
+       // dialog used by multiplayer/join
+       me.serverInfoDialog = i = spawnXonoticServerInfoDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       
+       // dialogs used by multiplayer/create
+       me.mapInfoDialog = i = spawnXonoticMapInfoDialog();
+       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);

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

diff --cc qcsrc/server/defs.qh
Simple merge

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

diff --cc qcsrc/server/t_items.qc
index b688831fa484d1c690336c11eecf670b99233ce0,ac029e6577659f3e243a610219b9a3f290d15bc4..3d7638c001beda713cf80bcc070c87904782ee57
--- 1/qcsrc/server/t_items.qc
--- 2/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -400,7 -265,7 +409,7 @@@ void Item_RespawnCountdown (void
  
  void Item_ScheduleRespawnIn(entity e, float t)
  {
-       if(e.flags & FL_POWERUP || e.classname == "item_armor_large" || e.items == IT_HEALTH)
 -      if((e.flags & FL_POWERUP) || WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS))
++      if((e.flags & FL_POWERUP) || WEPSET_CONTAINS_ANY_EA(e, WEPBIT_SUPERWEAPONS) || e.classname == "item_armor_large" || e.items == IT_HEALTH)
        {
                e.think = Item_RespawnCountdown;
                e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS);