From: TimePath Date: Sun, 10 May 2015 03:41:57 +0000 (+1000) Subject: Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title X-Git-Tag: xonotic-v0.8.1~54^2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61a847dbaab291d205cc9684b6d1a6e9bdad6375;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into terencehill/menu_remove_tab_title # Conflicts: # qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc # qcsrc/menu/xonotic/dialog_settings_game_hud.qc # qcsrc/menu/xonotic/dialog_settings_game_messages.qc # qcsrc/menu/xonotic/dialog_settings_game_model.qc # qcsrc/menu/xonotic/dialog_settings_game_view.qc # qcsrc/menu/xonotic/dialog_settings_game_weapons.qc --- 61a847dbaab291d205cc9684b6d1a6e9bdad6375 diff --cc qcsrc/menu/xonotic/dialog_multiplayer_join.qc index 86e1624a8,2b2354c53..a4e480e18 --- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticServerListTab) EXTENDS(XonoticTab) + #ifndef DIALOG_MULTIPLAYER_JOIN_H + #define DIALOG_MULTIPLAYER_JOIN_H + #include "tab.qc" + CLASS(XonoticServerListTab, XonoticTab) METHOD(XonoticServerListTab, fill, void(entity)) - ATTRIB(XonoticServerListTab, title, string, _("Join")) ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9) ATTRIB(XonoticServerListTab, rows, float, 23) ATTRIB(XonoticServerListTab, columns, float, 6.5) diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media.qc index fb52c5315,f6b5e02ad..03ffd0f36 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticMediaTab) EXTENDS(XonoticTab) + #ifndef DIALOG_MULTIPLAYER_MEDIA_H + #define DIALOG_MULTIPLAYER_MEDIA_H + #include "tab.qc" + CLASS(XonoticMediaTab, XonoticTab) METHOD(XonoticMediaTab, fill, void(entity)) - ATTRIB(XonoticMediaTab, title, string, _("Media")) ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9) ATTRIB(XonoticMediaTab, rows, float, 23) ATTRIB(XonoticMediaTab, columns, float, 3) diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc index 7a6ddf219,8ae5ae0c3..788aa5381 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticDemoBrowserTab) EXTENDS(XonoticTab) + #ifndef DIALOG_MULTIPLAYER_MEDIA_DEMO_H + #define DIALOG_MULTIPLAYER_MEDIA_DEMO_H + #include "tab.qc" + CLASS(XonoticDemoBrowserTab, XonoticTab) METHOD(XonoticDemoBrowserTab, fill, void(entity)) - ATTRIB(XonoticDemoBrowserTab, title, string, _("Demo")) ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9) ATTRIB(XonoticDemoBrowserTab, rows, float, 21) ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5) diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc index 5a1720a30,8fc33c1b8..6c0791ff7 --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticMusicPlayerTab) EXTENDS(XonoticTab) + #ifndef DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H + #define DIALOG_MULTIPLAYER_MEDIA_MUSICPLAYER_H + #include "tab.qc" + CLASS(XonoticMusicPlayerTab, XonoticTab) METHOD(XonoticMusicPlayerTab, fill, void(entity)) - ATTRIB(XonoticMusicPlayerTab, title, string, _("Music")) ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9) ATTRIB(XonoticMusicPlayerTab, rows, float, 21) ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5) diff --cc qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc index 751bf5d9e,36832a90c..c6526f2ec --- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticScreenshotBrowserTab) EXTENDS(XonoticTab) + #ifndef DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H + #define DIALOG_MULTIPLAYER_MEDIA_SCREENSHOT_H + #include "tab.qc" + CLASS(XonoticScreenshotBrowserTab, XonoticTab) METHOD(XonoticScreenshotBrowserTab, fill, void(entity)) - ATTRIB(XonoticScreenshotBrowserTab, title, string, "Screenshot") ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1) ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21) ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5) diff --cc qcsrc/menu/xonotic/dialog_multiplayer_profile.qc index 0f1062038,f9615d21c..9faf42888 --- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc @@@ -1,7 -1,10 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticProfileTab) EXTENDS(XonoticTab) + #ifndef DIALOG_MULTIPLAYER_PROFILE_H + #define DIALOG_MULTIPLAYER_PROFILE_H + #include "tab.qc" + CLASS(XonoticProfileTab, XonoticTab) METHOD(XonoticProfileTab, fill, void(entity)) METHOD(XonoticProfileTab, draw, void(entity)) - ATTRIB(XonoticProfileTab, title, string, _("Profile")) ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9) ATTRIB(XonoticProfileTab, rows, float, 23) ATTRIB(XonoticProfileTab, columns, float, 6.1) // added extra .2 for center space diff --cc qcsrc/menu/xonotic/dialog_settings_audio.qc index 2a4aa3ea5,528d95038..af8faddac --- a/qcsrc/menu/xonotic/dialog_settings_audio.qc +++ b/qcsrc/menu/xonotic/dialog_settings_audio.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticAudioSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_AUDIO_H + #define DIALOG_SETTINGS_AUDIO_H + #include "tab.qc" + CLASS(XonoticAudioSettingsTab, XonoticTab) METHOD(XonoticAudioSettingsTab, fill, void(entity)) - ATTRIB(XonoticAudioSettingsTab, title, string, _("Audio")) ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5) ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --cc qcsrc/menu/xonotic/dialog_settings_effects.qc index 9fc101675,a49e17647..d06465082 --- a/qcsrc/menu/xonotic/dialog_settings_effects.qc +++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticEffectsSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_EFFECTS_H + #define DIALOG_SETTINGS_EFFECTS_H + #include "tab.qc" + CLASS(XonoticEffectsSettingsTab, XonoticTab) METHOD(XonoticEffectsSettingsTab, fill, void(entity)) - ATTRIB(XonoticEffectsSettingsTab, title, string, _("Effects")) ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5) ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --cc qcsrc/menu/xonotic/dialog_settings_game.qc index 4524b5133,e8fd42d5d..5b14b7bdb --- a/qcsrc/menu/xonotic/dialog_settings_game.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_H + #define DIALOG_SETTINGS_GAME_H + #include "tab.qc" + CLASS(XonoticGameSettingsTab, XonoticTab) METHOD(XonoticGameSettingsTab, fill, void(entity)) - ATTRIB(XonoticGameSettingsTab, title, string, _("Game")) ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameSettingsTab, columns, float, 6.5) diff --cc qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc index 052794b08,bda4fadd7..be0d60edc --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc @@@ -1,7 -1,11 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticGameCrosshairSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_CROSSHAIR_H + #define DIALOG_SETTINGS_GAME_CROSSHAIR_H + #include "tab.qc" + CLASS(XonoticGameCrosshairSettingsTab, XonoticTab) - //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity)) METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity)) METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair")) ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 13) ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2) diff --cc qcsrc/menu/xonotic/dialog_settings_game_hud.qc index c934d66be,751eaa6a6..941daa792 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc @@@ -1,7 -1,11 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_HUD_H + #define DIALOG_SETTINGS_GAME_HUD_H + #include "tab.qc" + CLASS(XonoticGameHUDSettingsTab, XonoticTab) - //METHOD(XonoticGameHUDSettingsTab, toString, string(entity)) METHOD(XonoticGameHUDSettingsTab, fill, void(entity)) METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD")) ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13) ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2) diff --cc qcsrc/menu/xonotic/dialog_settings_game_messages.qc index 276fd13cf,eccd938f4..d52a102d4 --- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc @@@ -1,7 -1,11 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_MESSAGES_H + #define DIALOG_SETTINGS_GAME_MESSAGES_H + #include "tab.qc" + CLASS(XonoticGameMessageSettingsTab, XonoticTab) - //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity)) METHOD(XonoticGameMessageSettingsTab, fill, void(entity)) METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages")) ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13) ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6) diff --cc qcsrc/menu/xonotic/dialog_settings_game_model.qc index 850cb1e63,32955ba8f..db3e4082c --- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc @@@ -1,7 -1,11 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticGameModelSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_MODEL_H + #define DIALOG_SETTINGS_GAME_MODEL_H + #include "tab.qc" + CLASS(XonoticGameModelSettingsTab, XonoticTab) - //METHOD(XonoticGameModelSettingsTab, toString, string(entity)) METHOD(XonoticGameModelSettingsTab, fill, void(entity)) METHOD(XonoticGameModelSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameModelSettingsTab, title, string, _("Model")) ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameModelSettingsTab, rows, float, 13) ATTRIB(XonoticGameModelSettingsTab, columns, float, 5) diff --cc qcsrc/menu/xonotic/dialog_settings_game_view.qc index d1f9e550b,4daef475a..40a526d56 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@@ -1,7 -1,11 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticGameViewSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_VIEW_H + #define DIALOG_SETTINGS_GAME_VIEW_H + #include "tab.qc" + CLASS(XonoticGameViewSettingsTab, XonoticTab) - //METHOD(XonoticGameCrosshairSettingsTab, toString, string(entity)) METHOD(XonoticGameViewSettingsTab, fill, void(entity)) METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameViewSettingsTab, title, string, _("View")) ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameViewSettingsTab, rows, float, 13) ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2) diff --cc qcsrc/menu/xonotic/dialog_settings_game_weapons.qc index 237b76127,573f139a9..c59a9620d --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc @@@ -1,7 -1,11 +1,9 @@@ - #ifdef INTERFACE - CLASS(XonoticGameWeaponsSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_GAME_WEAPONS_H + #define DIALOG_SETTINGS_GAME_WEAPONS_H + #include "tab.qc" + CLASS(XonoticGameWeaponsSettingsTab, XonoticTab) - //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity)) METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity)) METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons")) ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13) ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6) diff --cc qcsrc/menu/xonotic/dialog_settings_input.qc index f7fc31f11,752aade97..f8e53c03a --- a/qcsrc/menu/xonotic/dialog_settings_input.qc +++ b/qcsrc/menu/xonotic/dialog_settings_input.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_INPUT_H + #define DIALOG_SETTINGS_INPUT_H + #include "tab.qc" + CLASS(XonoticInputSettingsTab, XonoticTab) METHOD(XonoticInputSettingsTab, fill, void(entity)) - ATTRIB(XonoticInputSettingsTab, title, string, _("Input")) ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticInputSettingsTab, rows, float, 15.5) ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space diff --cc qcsrc/menu/xonotic/dialog_settings_misc.qc index e60ca4969,95f218b0e..79e196170 --- a/qcsrc/menu/xonotic/dialog_settings_misc.qc +++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_MISC_H + #define DIALOG_SETTINGS_MISC_H + #include "tab.qc" + CLASS(XonoticMiscSettingsTab, XonoticTab) METHOD(XonoticMiscSettingsTab, fill, void(entity)) - ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc")) ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5) ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2) diff --cc qcsrc/menu/xonotic/dialog_settings_user.qc index d934f9050,e9ad109c4..35246ae17 --- a/qcsrc/menu/xonotic/dialog_settings_user.qc +++ b/qcsrc/menu/xonotic/dialog_settings_user.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_USER_H + #define DIALOG_SETTINGS_USER_H + #include "tab.qc" + CLASS(XonoticUserSettingsTab, XonoticTab) METHOD(XonoticUserSettingsTab, fill, void(entity)) - ATTRIB(XonoticUserSettingsTab, title, string, _("User")) ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticUserSettingsTab, rows, float, 15.5) ATTRIB(XonoticUserSettingsTab, columns, float, 6) diff --cc qcsrc/menu/xonotic/dialog_settings_video.qc index d242666b9,9b77e40a6..61a93f62e --- a/qcsrc/menu/xonotic/dialog_settings_video.qc +++ b/qcsrc/menu/xonotic/dialog_settings_video.qc @@@ -1,6 -1,9 +1,8 @@@ - #ifdef INTERFACE - CLASS(XonoticVideoSettingsTab) EXTENDS(XonoticTab) + #ifndef DIALOG_SETTINGS_VIDEO_H + #define DIALOG_SETTINGS_VIDEO_H + #include "tab.qc" + CLASS(XonoticVideoSettingsTab, XonoticTab) METHOD(XonoticVideoSettingsTab, fill, void(entity)) - ATTRIB(XonoticVideoSettingsTab, title, string, _("Video")) ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5) ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2) // added extra .2 for center space