Merge branch 'master' into TimePath/issue-1170

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / classes.c

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 4658d08bc0c9d18ba7c96c9054345e896a9eeac3..60063224906878d91a83baa098da86f5febd9f95 100644 (file)
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -29,15 +29,16 @@
 #include "xonotic/dialog_firstrun.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"
 #include "xonotic/dialog_settings_audio.c"
-#include "xonotic/dialog_settings_game.c"
 #include "xonotic/dialog_settings_user.c"
+#include "xonotic/dialog_settings_user_languagewarning.c"
 #include "xonotic/dialog_settings_misc.c"
 #include "xonotic/dialog_multiplayer.c"
-#include "xonotic/dialog_multiplayer_profile.c"
+#include "xonotic/dialog_multiplayer_playersetup.c"
 #include "xonotic/tabcontroller.c"
 #include "xonotic/textlabel.c"
 #include "xonotic/slider.c"
@@ -59,6 +60,7 @@
 #include "xonotic/dialog_quit.c"
 #include "xonotic/dialog_multiplayer_create.c"
 #include "xonotic/dialog_multiplayer_create_mutators.c"
+#include "xonotic/dialog_multiplayer_create_advanced.c"
 #include "xonotic/dialog_multiplayer_create_mapinfo.c"
 #include "xonotic/gametypelist.c"
 #include "xonotic/maplist.c"
@@ -78,20 +80,15 @@
 #include "xonotic/dialog_singleplayer_winner.c"
 #include "xonotic/dialog_credits.c"
 #include "xonotic/credits.c"
-#include "xonotic/dialog_settings_game_crosshair.c"
-#include "xonotic/dialog_settings_game_hud.c"
-#include "xonotic/dialog_settings_game_hudconfirm.c"
-#include "xonotic/dialog_settings_game_model.c"
-#include "xonotic/dialog_settings_game_view.c"
-#include "xonotic/dialog_settings_game_weapons.c"
+#include "xonotic/dialog_multiplayer_playersetup_crosshair.c"
+#include "xonotic/dialog_multiplayer_playersetup_hud.c"
+#include "xonotic/dialog_multiplayer_playersetup_hudconfirm.c"
+#include "xonotic/dialog_multiplayer_playersetup_model.c"
+#include "xonotic/dialog_multiplayer_playersetup_view.c"
+#include "xonotic/dialog_multiplayer_playersetup_weapons.c"
 #include "xonotic/weaponslist.c"
-#include "xonotic/dialog_multiplayer_media.c"
-#include "xonotic/dialog_multiplayer_media_demo.c"
+#include "xonotic/dialog_multiplayer_demo.c"
 #include "xonotic/demolist.c"
-#include "xonotic/screenshotimage.c"
-#include "xonotic/dialog_multiplayer_media_screenshot.c"
-#include "xonotic/dialog_multiplayer_media_screenshot_viewer.c"
-#include "xonotic/screenshotlist.c"
 #include "xonotic/colorpicker.c"
 #include "xonotic/colorpicker_string.c"
 #include "xonotic/cvarlist.c"
@@ -114,7 +111,7 @@
 #include "xonotic/dialog_hudpanel_weapons.c"
 #include "xonotic/dialog_hudpanel_physics.c"
 #include "xonotic/dialog_hudpanel_centerprint.c"
+#include "xonotic/dialog_hudpanel_buffs.c"
 #include "xonotic/slider_picmip.c"
-#include "xonotic/dialog_settings_game_notification.c"
-#include "xonotic/dialog_multiplayer_media_demo_democonfirm.c"
 #include "xonotic/slider_particles.c"
+#include "xonotic/dialog_settings_misc_reset.c"