Merge branch 'AriosJentu/DisconnectDialog' into 'master'
authorMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 11:33:20 +0000 (11:33 +0000)
committerMario <mario.mario@y7mail.com>
Thu, 26 Sep 2019 11:33:20 +0000 (11:33 +0000)
Move disconnect dialog from multiplayer to main menu

See merge request xonotic/xonotic-data.pk3dir!687

1  2 
qcsrc/menu/xonotic/_mod.inc

@@@ -19,6 -19,7 +19,7 @@@
  #include <menu/xonotic/demolist.qc>
  #include <menu/xonotic/dialog.qc>
  #include <menu/xonotic/dialog_credits.qc>
+ #include <menu/xonotic/dialog_disconnect.qc>
  #include <menu/xonotic/dialog_firstrun.qc>
  #include <menu/xonotic/dialog_hudpanel_ammo.qc>
  #include <menu/xonotic/dialog_hudpanel_centerprint.qc>
@@@ -59,7 -60,6 +60,7 @@@
  #include <menu/xonotic/dialog_sandboxtools.qc>
  #include <menu/xonotic/dialog_settings.qc>
  #include <menu/xonotic/dialog_settings_audio.qc>
 +#include <menu/xonotic/dialog_settings_bindings_reset.qc>
  #include <menu/xonotic/dialog_settings_effects.qc>
  #include <menu/xonotic/dialog_settings_game.qc>
  #include <menu/xonotic/dialog_settings_game_crosshair.qc>
@@@ -71,6 -71,7 +72,6 @@@
  #include <menu/xonotic/dialog_settings_game_weapons.qc>
  #include <menu/xonotic/dialog_settings_input.qc>
  #include <menu/xonotic/dialog_settings_input_userbind.qc>
 -#include <menu/xonotic/dialog_settings_bindings_reset.qc>
  #include <menu/xonotic/dialog_settings_misc.qc>
  #include <menu/xonotic/dialog_settings_misc_cvars.qc>
  #include <menu/xonotic/dialog_settings_misc_reset.qc>