From b7125852b5ffe6a09d13cd6537d70ab87d0730b5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 15:17:36 +0100 Subject: [PATCH 1/4] Remove d2k dependency from TS UI --- mods/ts/chrome/ingame-observer.yaml | 160 ++++++++++++++++++++++++++++ mods/ts/mod.yaml | 3 +- 2 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 mods/ts/chrome/ingame-observer.yaml diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml new file mode 100644 index 0000000000..ea88067bf6 --- /dev/null +++ b/mods/ts/chrome/ingame-observer.yaml @@ -0,0 +1,160 @@ +Container@OBSERVER_WIDGETS: + Logic: MenuButtonsChromeLogic + Children: + MenuButton@OPTIONS_BUTTON: + Width: 160 + Height: 25 + Text: Options (Esc) + Font: Bold + Key: escape + DisableWorldSounds: true + MenuButton@OBSERVER_STATS_BUTTON: + MenuContainer: INGAME_OBSERVERSTATS_BG + HideIngameUI: False + Pause: False + X: 162 + Y: 0 + Width: 160 + Height: 25 + Text: Statistics (F1) + Font: Bold + Key: f1 + Container@GAME_TIMER_BLOCK: + Logic: GameTimerLogic + X: (WINDOW_RIGHT - WIDTH) / 2 + Width: 100 + Height: 55 + Children: + LabelWithTooltip@GAME_TIMER: + Width: PARENT_RIGHT + Height: 30 + Align: Center + Font: Title + Contrast: true + TooltipContainer: TOOLTIP_CONTAINER + TooltipTemplate: SIMPLE_TOOLTIP + Label@GAME_TIMER_STATUS: + Y: 32 + Width: PARENT_RIGHT + Height: 15 + Align: Center + Font: Bold + Contrast: true + Background@RADAR_BG: + X: WINDOW_RIGHT-255 + Y: 5 + Width: 250 + Height: 250 + Children: + Radar@INGAME_RADAR: + X: 10 + Y: 10 + Width: PARENT_RIGHT-19 + Height: PARENT_BOTTOM-19 + WorldInteractionController: INTERACTION_CONTROLLER + Background@OBSERVER_CONTROL_BG: + X: WINDOW_RIGHT-255 + Y: 260 + Width: 250 + Height: 55 + Children: + DropDownButton@SHROUD_SELECTOR: + Logic: ObserverShroudSelectorLogic + X: 15 + Y: 15 + Width: 220 + Height: 25 + Font: Bold + Children: + LogicKeyListener@SHROUD_KEYHANDLER: + Image@FLAG: + Width: 23 + Height: 23 + X: 4 + Y: 2 + Label@LABEL: + X: 34 + Width: 60 + Height: 25 + Shadow: True + Label@NOFLAG_LABEL: + X: 5 + Width: PARENT_RIGHT + Height: 25 + Shadow: True + Container@REPLAY_PLAYER: + Logic: ReplayControlBarLogic + Y: 39 + Width: 160 + Height: 35 + Visible: false + Children: + Button@BUTTON_PAUSE: + X: 15 + Y: 10 + Width: 26 + Height: 26 + IgnoreChildMouseOver: true + Children: + Image@IMAGE_PAUSE: + Y: 1 + Width: 25 + Height: 25 + ImageCollection: music + ImageName: pause + Button@BUTTON_PLAY: + X: 15 + Y: 10 + Width: 26 + Height: 26 + IgnoreChildMouseOver: true + Children: + Image@IMAGE_PLAY: + Width: 25 + Height: 25 + ImageCollection: music + ImageName: play + Button@BUTTON_SLOW: + X: 55 + Y: 13 + Width: 36 + Height: 20 + BaseLine: 1 + TooltipText: Slow speed + TooltipContainer: TOOLTIP_CONTAINER + VisualHeight: 0 + Text: 50% + Font: TinyBold + Button@BUTTON_REGULAR: + X: 55 + 45 + Y: 13 + Width: 38 + Height: 20 + BaseLine: 1 + TooltipText: Regular speed + TooltipContainer: TOOLTIP_CONTAINER + VisualHeight: 0 + Text: 100% + Font: TinyBold + Button@BUTTON_FAST: + X: 55 + 45*2 + Y: 13 + Width: 38 + Height: 20 + BaseLine: 1 + TooltipText: Fast speed + TooltipContainer: TOOLTIP_CONTAINER + VisualHeight: 0 + Text: 200% + Font: TinyBold + Button@BUTTON_MAXIMUM: + X: 55 + 45*3 + Y: 13 + Width: 38 + Height: 20 + BaseLine: 1 + TooltipText: Maximum speed + TooltipContainer: TOOLTIP_CONTAINER + VisualHeight: 0 + Text: MAX + Font: TinyBold diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index e51d479402..a27edd6cf5 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -15,7 +15,6 @@ Packages: ./mods/common: common $ra: ra $cnc: cnc - $d2k: d2k # Tiberian Sun ~scores.mix @@ -140,7 +139,7 @@ ChromeLayout: ra|chrome/ingame-infobriefing.yaml ra|chrome/ingame-infoobjectives.yaml ra|chrome/ingame-infostats.yaml - d2k|chrome/ingame-observer.yaml + ts|chrome/ingame-observer.yaml ts|chrome/ingame-observerstats.yaml ts|chrome/ingame-player.yaml ra|chrome/ingame-perf.yaml From 6f9f630fdcf4fc211ed8a7bb22c42c0c8f85942b Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 15:23:25 +0100 Subject: [PATCH 2/4] Move RA chrome yamls to common --- mods/{ra => common}/chrome/assetbrowser.yaml | 0 mods/{ra => common}/chrome/color-picker.yaml | 0 .../chrome/confirmation-dialogs.yaml | 0 mods/{ra => common}/chrome/connection.yaml | 0 mods/{ra => common}/chrome/credits.yaml | 0 mods/{ra => common}/chrome/dropdowns.yaml | 0 mods/{ra => common}/chrome/editor.yaml | 0 mods/{ra => common}/chrome/ingame-chat.yaml | 0 mods/{ra => common}/chrome/ingame-debug.yaml | 0 .../chrome/ingame-fmvplayer.yaml | 0 mods/{ra => common}/chrome/ingame-info.yaml | 0 .../chrome/ingame-infobriefing.yaml | 0 .../chrome/ingame-infoobjectives.yaml | 0 .../chrome/ingame-infoscripterror.yaml | 0 .../chrome/ingame-infostats.yaml | 0 mods/{ra => common}/chrome/ingame-menu.yaml | 0 .../chrome/ingame-observerstats.yaml | 0 mods/{ra => common}/chrome/ingame-perf.yaml | 0 mods/{ra => common}/chrome/ingame-player.yaml | 0 mods/{ra => common}/chrome/ingame.yaml | 0 .../chrome/lobby-globalchat.yaml | 0 .../chrome/lobby-kickdialogs.yaml | 0 .../chrome/lobby-mappreview.yaml | 0 mods/{ra => common}/chrome/lobby-music.yaml | 0 mods/{ra => common}/chrome/lobby-options.yaml | 0 mods/{ra => common}/chrome/lobby-players.yaml | 0 mods/{ra => common}/chrome/lobby.yaml | 0 mods/{ra => common}/chrome/mainmenu.yaml | 0 mods/{ra => common}/chrome/map-chooser.yaml | 0 .../{ra => common}/chrome/missionbrowser.yaml | 0 .../chrome/multiplayer-browser.yaml | 0 .../chrome/multiplayer-createserver.yaml | 0 .../chrome/multiplayer-directconnect.yaml | 0 .../chrome/multiplayer-globalchat.yaml | 0 mods/{ra => common}/chrome/multiplayer.yaml | 0 mods/{ra => common}/chrome/musicplayer.yaml | 0 mods/{ra => common}/chrome/replaybrowser.yaml | 0 mods/{ra => common}/chrome/settings.yaml | 0 mods/{ra => common}/chrome/tooltips.yaml | 0 mods/d2k/mod.yaml | 60 +++++++------- mods/ra/mod.yaml | 78 +++++++++---------- mods/ts/mod.yaml | 66 ++++++++-------- 42 files changed, 102 insertions(+), 102 deletions(-) rename mods/{ra => common}/chrome/assetbrowser.yaml (100%) rename mods/{ra => common}/chrome/color-picker.yaml (100%) rename mods/{ra => common}/chrome/confirmation-dialogs.yaml (100%) rename mods/{ra => common}/chrome/connection.yaml (100%) rename mods/{ra => common}/chrome/credits.yaml (100%) rename mods/{ra => common}/chrome/dropdowns.yaml (100%) rename mods/{ra => common}/chrome/editor.yaml (100%) rename mods/{ra => common}/chrome/ingame-chat.yaml (100%) rename mods/{ra => common}/chrome/ingame-debug.yaml (100%) rename mods/{ra => common}/chrome/ingame-fmvplayer.yaml (100%) rename mods/{ra => common}/chrome/ingame-info.yaml (100%) rename mods/{ra => common}/chrome/ingame-infobriefing.yaml (100%) rename mods/{ra => common}/chrome/ingame-infoobjectives.yaml (100%) rename mods/{ra => common}/chrome/ingame-infoscripterror.yaml (100%) rename mods/{ra => common}/chrome/ingame-infostats.yaml (100%) rename mods/{ra => common}/chrome/ingame-menu.yaml (100%) rename mods/{ra => common}/chrome/ingame-observerstats.yaml (100%) rename mods/{ra => common}/chrome/ingame-perf.yaml (100%) rename mods/{ra => common}/chrome/ingame-player.yaml (100%) rename mods/{ra => common}/chrome/ingame.yaml (100%) rename mods/{ra => common}/chrome/lobby-globalchat.yaml (100%) rename mods/{ra => common}/chrome/lobby-kickdialogs.yaml (100%) rename mods/{ra => common}/chrome/lobby-mappreview.yaml (100%) rename mods/{ra => common}/chrome/lobby-music.yaml (100%) rename mods/{ra => common}/chrome/lobby-options.yaml (100%) rename mods/{ra => common}/chrome/lobby-players.yaml (100%) rename mods/{ra => common}/chrome/lobby.yaml (100%) rename mods/{ra => common}/chrome/mainmenu.yaml (100%) rename mods/{ra => common}/chrome/map-chooser.yaml (100%) rename mods/{ra => common}/chrome/missionbrowser.yaml (100%) rename mods/{ra => common}/chrome/multiplayer-browser.yaml (100%) rename mods/{ra => common}/chrome/multiplayer-createserver.yaml (100%) rename mods/{ra => common}/chrome/multiplayer-directconnect.yaml (100%) rename mods/{ra => common}/chrome/multiplayer-globalchat.yaml (100%) rename mods/{ra => common}/chrome/multiplayer.yaml (100%) rename mods/{ra => common}/chrome/musicplayer.yaml (100%) rename mods/{ra => common}/chrome/replaybrowser.yaml (100%) rename mods/{ra => common}/chrome/settings.yaml (100%) rename mods/{ra => common}/chrome/tooltips.yaml (100%) diff --git a/mods/ra/chrome/assetbrowser.yaml b/mods/common/chrome/assetbrowser.yaml similarity index 100% rename from mods/ra/chrome/assetbrowser.yaml rename to mods/common/chrome/assetbrowser.yaml diff --git a/mods/ra/chrome/color-picker.yaml b/mods/common/chrome/color-picker.yaml similarity index 100% rename from mods/ra/chrome/color-picker.yaml rename to mods/common/chrome/color-picker.yaml diff --git a/mods/ra/chrome/confirmation-dialogs.yaml b/mods/common/chrome/confirmation-dialogs.yaml similarity index 100% rename from mods/ra/chrome/confirmation-dialogs.yaml rename to mods/common/chrome/confirmation-dialogs.yaml diff --git a/mods/ra/chrome/connection.yaml b/mods/common/chrome/connection.yaml similarity index 100% rename from mods/ra/chrome/connection.yaml rename to mods/common/chrome/connection.yaml diff --git a/mods/ra/chrome/credits.yaml b/mods/common/chrome/credits.yaml similarity index 100% rename from mods/ra/chrome/credits.yaml rename to mods/common/chrome/credits.yaml diff --git a/mods/ra/chrome/dropdowns.yaml b/mods/common/chrome/dropdowns.yaml similarity index 100% rename from mods/ra/chrome/dropdowns.yaml rename to mods/common/chrome/dropdowns.yaml diff --git a/mods/ra/chrome/editor.yaml b/mods/common/chrome/editor.yaml similarity index 100% rename from mods/ra/chrome/editor.yaml rename to mods/common/chrome/editor.yaml diff --git a/mods/ra/chrome/ingame-chat.yaml b/mods/common/chrome/ingame-chat.yaml similarity index 100% rename from mods/ra/chrome/ingame-chat.yaml rename to mods/common/chrome/ingame-chat.yaml diff --git a/mods/ra/chrome/ingame-debug.yaml b/mods/common/chrome/ingame-debug.yaml similarity index 100% rename from mods/ra/chrome/ingame-debug.yaml rename to mods/common/chrome/ingame-debug.yaml diff --git a/mods/ra/chrome/ingame-fmvplayer.yaml b/mods/common/chrome/ingame-fmvplayer.yaml similarity index 100% rename from mods/ra/chrome/ingame-fmvplayer.yaml rename to mods/common/chrome/ingame-fmvplayer.yaml diff --git a/mods/ra/chrome/ingame-info.yaml b/mods/common/chrome/ingame-info.yaml similarity index 100% rename from mods/ra/chrome/ingame-info.yaml rename to mods/common/chrome/ingame-info.yaml diff --git a/mods/ra/chrome/ingame-infobriefing.yaml b/mods/common/chrome/ingame-infobriefing.yaml similarity index 100% rename from mods/ra/chrome/ingame-infobriefing.yaml rename to mods/common/chrome/ingame-infobriefing.yaml diff --git a/mods/ra/chrome/ingame-infoobjectives.yaml b/mods/common/chrome/ingame-infoobjectives.yaml similarity index 100% rename from mods/ra/chrome/ingame-infoobjectives.yaml rename to mods/common/chrome/ingame-infoobjectives.yaml diff --git a/mods/ra/chrome/ingame-infoscripterror.yaml b/mods/common/chrome/ingame-infoscripterror.yaml similarity index 100% rename from mods/ra/chrome/ingame-infoscripterror.yaml rename to mods/common/chrome/ingame-infoscripterror.yaml diff --git a/mods/ra/chrome/ingame-infostats.yaml b/mods/common/chrome/ingame-infostats.yaml similarity index 100% rename from mods/ra/chrome/ingame-infostats.yaml rename to mods/common/chrome/ingame-infostats.yaml diff --git a/mods/ra/chrome/ingame-menu.yaml b/mods/common/chrome/ingame-menu.yaml similarity index 100% rename from mods/ra/chrome/ingame-menu.yaml rename to mods/common/chrome/ingame-menu.yaml diff --git a/mods/ra/chrome/ingame-observerstats.yaml b/mods/common/chrome/ingame-observerstats.yaml similarity index 100% rename from mods/ra/chrome/ingame-observerstats.yaml rename to mods/common/chrome/ingame-observerstats.yaml diff --git a/mods/ra/chrome/ingame-perf.yaml b/mods/common/chrome/ingame-perf.yaml similarity index 100% rename from mods/ra/chrome/ingame-perf.yaml rename to mods/common/chrome/ingame-perf.yaml diff --git a/mods/ra/chrome/ingame-player.yaml b/mods/common/chrome/ingame-player.yaml similarity index 100% rename from mods/ra/chrome/ingame-player.yaml rename to mods/common/chrome/ingame-player.yaml diff --git a/mods/ra/chrome/ingame.yaml b/mods/common/chrome/ingame.yaml similarity index 100% rename from mods/ra/chrome/ingame.yaml rename to mods/common/chrome/ingame.yaml diff --git a/mods/ra/chrome/lobby-globalchat.yaml b/mods/common/chrome/lobby-globalchat.yaml similarity index 100% rename from mods/ra/chrome/lobby-globalchat.yaml rename to mods/common/chrome/lobby-globalchat.yaml diff --git a/mods/ra/chrome/lobby-kickdialogs.yaml b/mods/common/chrome/lobby-kickdialogs.yaml similarity index 100% rename from mods/ra/chrome/lobby-kickdialogs.yaml rename to mods/common/chrome/lobby-kickdialogs.yaml diff --git a/mods/ra/chrome/lobby-mappreview.yaml b/mods/common/chrome/lobby-mappreview.yaml similarity index 100% rename from mods/ra/chrome/lobby-mappreview.yaml rename to mods/common/chrome/lobby-mappreview.yaml diff --git a/mods/ra/chrome/lobby-music.yaml b/mods/common/chrome/lobby-music.yaml similarity index 100% rename from mods/ra/chrome/lobby-music.yaml rename to mods/common/chrome/lobby-music.yaml diff --git a/mods/ra/chrome/lobby-options.yaml b/mods/common/chrome/lobby-options.yaml similarity index 100% rename from mods/ra/chrome/lobby-options.yaml rename to mods/common/chrome/lobby-options.yaml diff --git a/mods/ra/chrome/lobby-players.yaml b/mods/common/chrome/lobby-players.yaml similarity index 100% rename from mods/ra/chrome/lobby-players.yaml rename to mods/common/chrome/lobby-players.yaml diff --git a/mods/ra/chrome/lobby.yaml b/mods/common/chrome/lobby.yaml similarity index 100% rename from mods/ra/chrome/lobby.yaml rename to mods/common/chrome/lobby.yaml diff --git a/mods/ra/chrome/mainmenu.yaml b/mods/common/chrome/mainmenu.yaml similarity index 100% rename from mods/ra/chrome/mainmenu.yaml rename to mods/common/chrome/mainmenu.yaml diff --git a/mods/ra/chrome/map-chooser.yaml b/mods/common/chrome/map-chooser.yaml similarity index 100% rename from mods/ra/chrome/map-chooser.yaml rename to mods/common/chrome/map-chooser.yaml diff --git a/mods/ra/chrome/missionbrowser.yaml b/mods/common/chrome/missionbrowser.yaml similarity index 100% rename from mods/ra/chrome/missionbrowser.yaml rename to mods/common/chrome/missionbrowser.yaml diff --git a/mods/ra/chrome/multiplayer-browser.yaml b/mods/common/chrome/multiplayer-browser.yaml similarity index 100% rename from mods/ra/chrome/multiplayer-browser.yaml rename to mods/common/chrome/multiplayer-browser.yaml diff --git a/mods/ra/chrome/multiplayer-createserver.yaml b/mods/common/chrome/multiplayer-createserver.yaml similarity index 100% rename from mods/ra/chrome/multiplayer-createserver.yaml rename to mods/common/chrome/multiplayer-createserver.yaml diff --git a/mods/ra/chrome/multiplayer-directconnect.yaml b/mods/common/chrome/multiplayer-directconnect.yaml similarity index 100% rename from mods/ra/chrome/multiplayer-directconnect.yaml rename to mods/common/chrome/multiplayer-directconnect.yaml diff --git a/mods/ra/chrome/multiplayer-globalchat.yaml b/mods/common/chrome/multiplayer-globalchat.yaml similarity index 100% rename from mods/ra/chrome/multiplayer-globalchat.yaml rename to mods/common/chrome/multiplayer-globalchat.yaml diff --git a/mods/ra/chrome/multiplayer.yaml b/mods/common/chrome/multiplayer.yaml similarity index 100% rename from mods/ra/chrome/multiplayer.yaml rename to mods/common/chrome/multiplayer.yaml diff --git a/mods/ra/chrome/musicplayer.yaml b/mods/common/chrome/musicplayer.yaml similarity index 100% rename from mods/ra/chrome/musicplayer.yaml rename to mods/common/chrome/musicplayer.yaml diff --git a/mods/ra/chrome/replaybrowser.yaml b/mods/common/chrome/replaybrowser.yaml similarity index 100% rename from mods/ra/chrome/replaybrowser.yaml rename to mods/common/chrome/replaybrowser.yaml diff --git a/mods/ra/chrome/settings.yaml b/mods/common/chrome/settings.yaml similarity index 100% rename from mods/ra/chrome/settings.yaml rename to mods/common/chrome/settings.yaml diff --git a/mods/ra/chrome/tooltips.yaml b/mods/common/chrome/tooltips.yaml similarity index 100% rename from mods/ra/chrome/tooltips.yaml rename to mods/common/chrome/tooltips.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 290a62e915..9f6a84a455 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -68,46 +68,46 @@ Assemblies: d2k|OpenRA.Mods.D2k.dll ChromeLayout: - ra|chrome/ingame.yaml - ra|chrome/ingame-chat.yaml - ra|chrome/ingame-fmvplayer.yaml + common|chrome/ingame.yaml + common|chrome/ingame-chat.yaml + common|chrome/ingame-fmvplayer.yaml d2k|chrome/ingame-menu.yaml - ra|chrome/ingame-info.yaml - ra|chrome/ingame-infoscripterror.yaml - ra|chrome/ingame-infobriefing.yaml - ra|chrome/ingame-infoobjectives.yaml + common|chrome/ingame-info.yaml + common|chrome/ingame-infoscripterror.yaml + common|chrome/ingame-infobriefing.yaml + common|chrome/ingame-infoobjectives.yaml d2k|chrome/ingame-infostats.yaml d2k|chrome/ingame-observer.yaml - ra|chrome/ingame-observerstats.yaml + common|chrome/ingame-observerstats.yaml d2k|chrome/ingame-player.yaml - ra|chrome/ingame-perf.yaml - ra|chrome/ingame-debug.yaml + common|chrome/ingame-perf.yaml + common|chrome/ingame-debug.yaml d2k|chrome/mainmenu.yaml - ra|chrome/settings.yaml - ra|chrome/credits.yaml - ra|chrome/lobby.yaml - ra|chrome/lobby-mappreview.yaml + common|chrome/settings.yaml + common|chrome/credits.yaml + common|chrome/lobby.yaml + common|chrome/lobby-mappreview.yaml d2k|chrome/lobby-players.yaml d2k|chrome/lobby-options.yaml - ra|chrome/lobby-music.yaml - ra|chrome/lobby-kickdialogs.yaml - ra|chrome/lobby-globalchat.yaml - ra|chrome/color-picker.yaml - ra|chrome/map-chooser.yaml - ra|chrome/multiplayer.yaml - ra|chrome/multiplayer-browser.yaml - ra|chrome/multiplayer-createserver.yaml - ra|chrome/multiplayer-directconnect.yaml - ra|chrome/multiplayer-globalchat.yaml - ra|chrome/connection.yaml + common|chrome/lobby-music.yaml + common|chrome/lobby-kickdialogs.yaml + common|chrome/lobby-globalchat.yaml + common|chrome/color-picker.yaml + common|chrome/map-chooser.yaml + common|chrome/multiplayer.yaml + common|chrome/multiplayer-browser.yaml + common|chrome/multiplayer-createserver.yaml + common|chrome/multiplayer-directconnect.yaml + common|chrome/multiplayer-globalchat.yaml + common|chrome/connection.yaml d2k|chrome/dropdowns.yaml - ra|chrome/musicplayer.yaml + common|chrome/musicplayer.yaml d2k|chrome/tooltips.yaml - ra|chrome/assetbrowser.yaml + common|chrome/assetbrowser.yaml d2k|chrome/missionbrowser.yaml - ra|chrome/confirmation-dialogs.yaml - ra|chrome/editor.yaml - ra|chrome/replaybrowser.yaml + common|chrome/confirmation-dialogs.yaml + common|chrome/editor.yaml + common|chrome/replaybrowser.yaml Weapons: d2k|weapons/debris.yaml diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 908078c7c0..da42ef501d 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -84,46 +84,46 @@ Assemblies: cnc|OpenRA.Mods.Cnc.dll ChromeLayout: - ra|chrome/ingame.yaml - ra|chrome/ingame-chat.yaml - ra|chrome/ingame-fmvplayer.yaml - ra|chrome/ingame-info.yaml - ra|chrome/ingame-infoscripterror.yaml - ra|chrome/ingame-infobriefing.yaml - ra|chrome/ingame-infoobjectives.yaml - ra|chrome/ingame-infostats.yaml - ra|chrome/ingame-menu.yaml + common|chrome/ingame.yaml + common|chrome/ingame-chat.yaml + common|chrome/ingame-fmvplayer.yaml + common|chrome/ingame-info.yaml + common|chrome/ingame-infoscripterror.yaml + common|chrome/ingame-infobriefing.yaml + common|chrome/ingame-infoobjectives.yaml + common|chrome/ingame-infostats.yaml + common|chrome/ingame-menu.yaml ra|chrome/ingame-observer.yaml - ra|chrome/ingame-observerstats.yaml - ra|chrome/ingame-player.yaml - ra|chrome/ingame-perf.yaml - ra|chrome/ingame-debug.yaml - ra|chrome/mainmenu.yaml - ra|chrome/settings.yaml - ra|chrome/credits.yaml - ra|chrome/lobby.yaml - ra|chrome/lobby-mappreview.yaml - ra|chrome/lobby-players.yaml - ra|chrome/lobby-options.yaml - ra|chrome/lobby-music.yaml - ra|chrome/lobby-kickdialogs.yaml - ra|chrome/lobby-globalchat.yaml - ra|chrome/color-picker.yaml - ra|chrome/map-chooser.yaml - ra|chrome/multiplayer.yaml - ra|chrome/multiplayer-browser.yaml - ra|chrome/multiplayer-createserver.yaml - ra|chrome/multiplayer-directconnect.yaml - ra|chrome/multiplayer-globalchat.yaml - ra|chrome/connection.yaml - ra|chrome/replaybrowser.yaml - ra|chrome/dropdowns.yaml - ra|chrome/musicplayer.yaml - ra|chrome/tooltips.yaml - ra|chrome/assetbrowser.yaml - ra|chrome/missionbrowser.yaml - ra|chrome/confirmation-dialogs.yaml - ra|chrome/editor.yaml + common|chrome/ingame-observerstats.yaml + common|chrome/ingame-player.yaml + common|chrome/ingame-perf.yaml + common|chrome/ingame-debug.yaml + common|chrome/mainmenu.yaml + common|chrome/settings.yaml + common|chrome/credits.yaml + common|chrome/lobby.yaml + common|chrome/lobby-mappreview.yaml + common|chrome/lobby-players.yaml + common|chrome/lobby-options.yaml + common|chrome/lobby-music.yaml + common|chrome/lobby-kickdialogs.yaml + common|chrome/lobby-globalchat.yaml + common|chrome/color-picker.yaml + common|chrome/map-chooser.yaml + common|chrome/multiplayer.yaml + common|chrome/multiplayer-browser.yaml + common|chrome/multiplayer-createserver.yaml + common|chrome/multiplayer-directconnect.yaml + common|chrome/multiplayer-globalchat.yaml + common|chrome/connection.yaml + common|chrome/replaybrowser.yaml + common|chrome/dropdowns.yaml + common|chrome/musicplayer.yaml + common|chrome/tooltips.yaml + common|chrome/assetbrowser.yaml + common|chrome/missionbrowser.yaml + common|chrome/confirmation-dialogs.yaml + common|chrome/editor.yaml Weapons: ra|weapons/explosions.yaml diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index a27edd6cf5..904960b4c7 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -130,47 +130,47 @@ Assemblies: cnc|OpenRA.Mods.Cnc.dll ChromeLayout: - ra|chrome/ingame.yaml - ra|chrome/ingame-chat.yaml - ra|chrome/ingame-fmvplayer.yaml - ra|chrome/ingame-menu.yaml + common|chrome/ingame.yaml + common|chrome/ingame-chat.yaml + common|chrome/ingame-fmvplayer.yaml + common|chrome/ingame-menu.yaml ts|chrome/ingame-info.yaml - ra|chrome/ingame-infoscripterror.yaml - ra|chrome/ingame-infobriefing.yaml - ra|chrome/ingame-infoobjectives.yaml - ra|chrome/ingame-infostats.yaml + common|chrome/ingame-infoscripterror.yaml + common|chrome/ingame-infobriefing.yaml + common|chrome/ingame-infoobjectives.yaml + common|chrome/ingame-infostats.yaml ts|chrome/ingame-observer.yaml ts|chrome/ingame-observerstats.yaml ts|chrome/ingame-player.yaml - ra|chrome/ingame-perf.yaml + common|chrome/ingame-perf.yaml ts|chrome/ingame-debug.yaml - ra|chrome/mainmenu.yaml + common|chrome/mainmenu.yaml ts|chrome/mainmenu-prerelease-notification.yaml - ra|chrome/settings.yaml - ra|chrome/credits.yaml - ra|chrome/lobby.yaml - ra|chrome/lobby-mappreview.yaml - ra|chrome/lobby-players.yaml - ra|chrome/lobby-options.yaml - ra|chrome/lobby-music.yaml - ra|chrome/lobby-kickdialogs.yaml - ra|chrome/lobby-globalchat.yaml + common|chrome/settings.yaml + common|chrome/credits.yaml + common|chrome/lobby.yaml + common|chrome/lobby-mappreview.yaml + common|chrome/lobby-players.yaml + common|chrome/lobby-options.yaml + common|chrome/lobby-music.yaml + common|chrome/lobby-kickdialogs.yaml + common|chrome/lobby-globalchat.yaml ts|chrome/color-picker.yaml - ra|chrome/map-chooser.yaml - ra|chrome/multiplayer.yaml - ra|chrome/multiplayer-browser.yaml - ra|chrome/multiplayer-createserver.yaml - ra|chrome/multiplayer-directconnect.yaml - ra|chrome/multiplayer-globalchat.yaml - ra|chrome/connection.yaml - ra|chrome/replaybrowser.yaml + common|chrome/map-chooser.yaml + common|chrome/multiplayer.yaml + common|chrome/multiplayer-browser.yaml + common|chrome/multiplayer-createserver.yaml + common|chrome/multiplayer-directconnect.yaml + common|chrome/multiplayer-globalchat.yaml + common|chrome/connection.yaml + common|chrome/replaybrowser.yaml ts|chrome/dropdowns.yaml - ra|chrome/musicplayer.yaml - ra|chrome/tooltips.yaml - ra|chrome/assetbrowser.yaml - ra|chrome/missionbrowser.yaml - ra|chrome/confirmation-dialogs.yaml - ra|chrome/editor.yaml + common|chrome/musicplayer.yaml + common|chrome/tooltips.yaml + common|chrome/assetbrowser.yaml + common|chrome/missionbrowser.yaml + common|chrome/confirmation-dialogs.yaml + common|chrome/editor.yaml Voices: ts|audio/voices.yaml From 5e465ff96545aaaf7a6273b2b76bf001d13ef299 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 15:32:02 +0100 Subject: [PATCH 3/4] Remove RA reference from d2k --- mods/d2k/mod.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 9f6a84a455..0510d576e7 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -14,7 +14,6 @@ Packages: ~^Content/d2k/v2/Music . $d2k: d2k - $ra: ra $cnc: cnc ./mods/common: common From 66f1cc69d8e96317b3f74cb571a2937c25a2525f Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 12 Feb 2017 16:43:52 +0100 Subject: [PATCH 4/4] Move D2k/TS ingame-observer.yaml to common --- .../chrome/ingame-observer.yaml | 0 mods/d2k/mod.yaml | 2 +- mods/ts/chrome/ingame-observer.yaml | 160 ------------------ mods/ts/mod.yaml | 2 +- 4 files changed, 2 insertions(+), 162 deletions(-) rename mods/{d2k => common}/chrome/ingame-observer.yaml (100%) delete mode 100644 mods/ts/chrome/ingame-observer.yaml diff --git a/mods/d2k/chrome/ingame-observer.yaml b/mods/common/chrome/ingame-observer.yaml similarity index 100% rename from mods/d2k/chrome/ingame-observer.yaml rename to mods/common/chrome/ingame-observer.yaml diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 0510d576e7..8ac3d1efa6 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -76,7 +76,7 @@ ChromeLayout: common|chrome/ingame-infobriefing.yaml common|chrome/ingame-infoobjectives.yaml d2k|chrome/ingame-infostats.yaml - d2k|chrome/ingame-observer.yaml + common|chrome/ingame-observer.yaml common|chrome/ingame-observerstats.yaml d2k|chrome/ingame-player.yaml common|chrome/ingame-perf.yaml diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml deleted file mode 100644 index ea88067bf6..0000000000 --- a/mods/ts/chrome/ingame-observer.yaml +++ /dev/null @@ -1,160 +0,0 @@ -Container@OBSERVER_WIDGETS: - Logic: MenuButtonsChromeLogic - Children: - MenuButton@OPTIONS_BUTTON: - Width: 160 - Height: 25 - Text: Options (Esc) - Font: Bold - Key: escape - DisableWorldSounds: true - MenuButton@OBSERVER_STATS_BUTTON: - MenuContainer: INGAME_OBSERVERSTATS_BG - HideIngameUI: False - Pause: False - X: 162 - Y: 0 - Width: 160 - Height: 25 - Text: Statistics (F1) - Font: Bold - Key: f1 - Container@GAME_TIMER_BLOCK: - Logic: GameTimerLogic - X: (WINDOW_RIGHT - WIDTH) / 2 - Width: 100 - Height: 55 - Children: - LabelWithTooltip@GAME_TIMER: - Width: PARENT_RIGHT - Height: 30 - Align: Center - Font: Title - Contrast: true - TooltipContainer: TOOLTIP_CONTAINER - TooltipTemplate: SIMPLE_TOOLTIP - Label@GAME_TIMER_STATUS: - Y: 32 - Width: PARENT_RIGHT - Height: 15 - Align: Center - Font: Bold - Contrast: true - Background@RADAR_BG: - X: WINDOW_RIGHT-255 - Y: 5 - Width: 250 - Height: 250 - Children: - Radar@INGAME_RADAR: - X: 10 - Y: 10 - Width: PARENT_RIGHT-19 - Height: PARENT_BOTTOM-19 - WorldInteractionController: INTERACTION_CONTROLLER - Background@OBSERVER_CONTROL_BG: - X: WINDOW_RIGHT-255 - Y: 260 - Width: 250 - Height: 55 - Children: - DropDownButton@SHROUD_SELECTOR: - Logic: ObserverShroudSelectorLogic - X: 15 - Y: 15 - Width: 220 - Height: 25 - Font: Bold - Children: - LogicKeyListener@SHROUD_KEYHANDLER: - Image@FLAG: - Width: 23 - Height: 23 - X: 4 - Y: 2 - Label@LABEL: - X: 34 - Width: 60 - Height: 25 - Shadow: True - Label@NOFLAG_LABEL: - X: 5 - Width: PARENT_RIGHT - Height: 25 - Shadow: True - Container@REPLAY_PLAYER: - Logic: ReplayControlBarLogic - Y: 39 - Width: 160 - Height: 35 - Visible: false - Children: - Button@BUTTON_PAUSE: - X: 15 - Y: 10 - Width: 26 - Height: 26 - IgnoreChildMouseOver: true - Children: - Image@IMAGE_PAUSE: - Y: 1 - Width: 25 - Height: 25 - ImageCollection: music - ImageName: pause - Button@BUTTON_PLAY: - X: 15 - Y: 10 - Width: 26 - Height: 26 - IgnoreChildMouseOver: true - Children: - Image@IMAGE_PLAY: - Width: 25 - Height: 25 - ImageCollection: music - ImageName: play - Button@BUTTON_SLOW: - X: 55 - Y: 13 - Width: 36 - Height: 20 - BaseLine: 1 - TooltipText: Slow speed - TooltipContainer: TOOLTIP_CONTAINER - VisualHeight: 0 - Text: 50% - Font: TinyBold - Button@BUTTON_REGULAR: - X: 55 + 45 - Y: 13 - Width: 38 - Height: 20 - BaseLine: 1 - TooltipText: Regular speed - TooltipContainer: TOOLTIP_CONTAINER - VisualHeight: 0 - Text: 100% - Font: TinyBold - Button@BUTTON_FAST: - X: 55 + 45*2 - Y: 13 - Width: 38 - Height: 20 - BaseLine: 1 - TooltipText: Fast speed - TooltipContainer: TOOLTIP_CONTAINER - VisualHeight: 0 - Text: 200% - Font: TinyBold - Button@BUTTON_MAXIMUM: - X: 55 + 45*3 - Y: 13 - Width: 38 - Height: 20 - BaseLine: 1 - TooltipText: Maximum speed - TooltipContainer: TOOLTIP_CONTAINER - VisualHeight: 0 - Text: MAX - Font: TinyBold diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 904960b4c7..127e2b2287 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -139,7 +139,7 @@ ChromeLayout: common|chrome/ingame-infobriefing.yaml common|chrome/ingame-infoobjectives.yaml common|chrome/ingame-infostats.yaml - ts|chrome/ingame-observer.yaml + common|chrome/ingame-observer.yaml ts|chrome/ingame-observerstats.yaml ts|chrome/ingame-player.yaml common|chrome/ingame-perf.yaml