From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 27 Sep 2015 04:36:52 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/guide
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=042661314bd444ff382fcd97fc516f1bbac61b33;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/guide

# Conflicts:
#	qcsrc/menu/xonotic/dialog_multiplayer_media.qc
---

042661314bd444ff382fcd97fc516f1bbac61b33
diff --cc qcsrc/common/nades.qh
index 5a9877c4ee,ba189c9bf8..85abc5b521
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@@ -101,6 -101,6 +101,7 @@@ REGISTER_NADE(MONSTER) 
      NADE_PROJECTILE(1, PROJECTILE_NADE_MONSTER_BURN, "nade_red_burn");
  }
  
++#ifndef MENUQC
  entity Nade_FromProjectile(float proj)
  {
      FOREACH(NADES, true, LAMBDA(
@@@ -132,6 -132,6 +133,7 @@@ string Nade_TrailEffect(float proj, flo
      }
      return "";
  }
++#endif
  
  #ifdef SVQC
  float healer_send(entity to, int sf);
diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media.qc
index 40c434aff7,19c97f771f..f37b36a677
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc
@@@ -25,8 -25,8 +25,9 @@@ void XonoticMediaTab_fill(entity me
  	mc = makeXonoticTabController(me.rows - 2);
  
  	me.gotoRC(me, 0.5, 0);
 +		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Guide"), NEW(XonoticGuideTab)));
- 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab()));
+ 		me.TD(me, 1, 1, e = mc.makeTabButton_T(mc, _("Demos"), makeXonoticDemoBrowserTab(),
+ 			_("Browse and view demos")));
  		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Screenshots"), makeXonoticScreenshotBrowserTab()));
  		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Music Player"), makeXonoticMusicPlayerTab()));