Merge pull request #12762 from reaperrr/common-ui

Move RA chrome yamls to common

mods/d2k/mod.yaml

@@ -14,7 +14,6 @@ Packages:
 	~^Content/d2k/v2/Music
 	.
 	$d2k: d2k
-	$ra: ra
 	$cnc: cnc
 	./mods/common: common
 
@@ -68,46 +67,46 @@ Assemblies:
 	d2k|OpenRA.Mods.D2k.dll
 
 ChromeLayout:
-	ra|chrome/ingame.yaml
+	common|chrome/ingame.yaml
-	ra|chrome/ingame-chat.yaml
+	common|chrome/ingame-chat.yaml
-	ra|chrome/ingame-fmvplayer.yaml
+	common|chrome/ingame-fmvplayer.yaml
 	d2k|chrome/ingame-menu.yaml
-	ra|chrome/ingame-info.yaml
+	common|chrome/ingame-info.yaml
-	ra|chrome/ingame-infoscripterror.yaml
+	common|chrome/ingame-infoscripterror.yaml
-	ra|chrome/ingame-infobriefing.yaml
+	common|chrome/ingame-infobriefing.yaml
-	ra|chrome/ingame-infoobjectives.yaml
+	common|chrome/ingame-infoobjectives.yaml
 	d2k|chrome/ingame-infostats.yaml
-	d2k|chrome/ingame-observer.yaml
+	common|chrome/ingame-observer.yaml
-	ra|chrome/ingame-observerstats.yaml
+	common|chrome/ingame-observerstats.yaml
 	d2k|chrome/ingame-player.yaml
-	ra|chrome/ingame-perf.yaml
+	common|chrome/ingame-perf.yaml
-	ra|chrome/ingame-debug.yaml
+	common|chrome/ingame-debug.yaml
 	d2k|chrome/mainmenu.yaml
-	ra|chrome/settings.yaml
+	common|chrome/settings.yaml
-	ra|chrome/credits.yaml
+	common|chrome/credits.yaml
-	ra|chrome/lobby.yaml
+	common|chrome/lobby.yaml
-	ra|chrome/lobby-mappreview.yaml
+	common|chrome/lobby-mappreview.yaml
 	d2k|chrome/lobby-players.yaml
 	d2k|chrome/lobby-options.yaml
-	ra|chrome/lobby-music.yaml
+	common|chrome/lobby-music.yaml
-	ra|chrome/lobby-kickdialogs.yaml
+	common|chrome/lobby-kickdialogs.yaml
-	ra|chrome/lobby-globalchat.yaml
+	common|chrome/lobby-globalchat.yaml
-	ra|chrome/color-picker.yaml
+	common|chrome/color-picker.yaml
-	ra|chrome/map-chooser.yaml
+	common|chrome/map-chooser.yaml
-	ra|chrome/multiplayer.yaml
+	common|chrome/multiplayer.yaml
-	ra|chrome/multiplayer-browser.yaml
+	common|chrome/multiplayer-browser.yaml
-	ra|chrome/multiplayer-createserver.yaml
+	common|chrome/multiplayer-createserver.yaml
-	ra|chrome/multiplayer-directconnect.yaml
+	common|chrome/multiplayer-directconnect.yaml
-	ra|chrome/multiplayer-globalchat.yaml
+	common|chrome/multiplayer-globalchat.yaml
-	ra|chrome/connection.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
+	common|chrome/confirmation-dialogs.yaml
-	ra|chrome/editor.yaml
+	common|chrome/editor.yaml
-	ra|chrome/replaybrowser.yaml
+	common|chrome/replaybrowser.yaml
 
 Weapons:
 	d2k|weapons/debris.yaml

mods/ra/mod.yaml

@@ -84,46 +84,46 @@ Assemblies:
 	cnc|OpenRA.Mods.Cnc.dll
 
 ChromeLayout:
-	ra|chrome/ingame.yaml
+	common|chrome/ingame.yaml
-	ra|chrome/ingame-chat.yaml
+	common|chrome/ingame-chat.yaml
-	ra|chrome/ingame-fmvplayer.yaml
+	common|chrome/ingame-fmvplayer.yaml
-	ra|chrome/ingame-info.yaml
+	common|chrome/ingame-info.yaml
-	ra|chrome/ingame-infoscripterror.yaml
+	common|chrome/ingame-infoscripterror.yaml
-	ra|chrome/ingame-infobriefing.yaml
+	common|chrome/ingame-infobriefing.yaml
-	ra|chrome/ingame-infoobjectives.yaml
+	common|chrome/ingame-infoobjectives.yaml
-	ra|chrome/ingame-infostats.yaml
+	common|chrome/ingame-infostats.yaml
-	ra|chrome/ingame-menu.yaml
+	common|chrome/ingame-menu.yaml
 	ra|chrome/ingame-observer.yaml
-	ra|chrome/ingame-observerstats.yaml
+	common|chrome/ingame-observerstats.yaml
-	ra|chrome/ingame-player.yaml
+	common|chrome/ingame-player.yaml
-	ra|chrome/ingame-perf.yaml
+	common|chrome/ingame-perf.yaml
-	ra|chrome/ingame-debug.yaml
+	common|chrome/ingame-debug.yaml
-	ra|chrome/mainmenu.yaml
+	common|chrome/mainmenu.yaml
-	ra|chrome/settings.yaml
+	common|chrome/settings.yaml
-	ra|chrome/credits.yaml
+	common|chrome/credits.yaml
-	ra|chrome/lobby.yaml
+	common|chrome/lobby.yaml
-	ra|chrome/lobby-mappreview.yaml
+	common|chrome/lobby-mappreview.yaml
-	ra|chrome/lobby-players.yaml
+	common|chrome/lobby-players.yaml
-	ra|chrome/lobby-options.yaml
+	common|chrome/lobby-options.yaml
-	ra|chrome/lobby-music.yaml
+	common|chrome/lobby-music.yaml
-	ra|chrome/lobby-kickdialogs.yaml
+	common|chrome/lobby-kickdialogs.yaml
-	ra|chrome/lobby-globalchat.yaml
+	common|chrome/lobby-globalchat.yaml
-	ra|chrome/color-picker.yaml
+	common|chrome/color-picker.yaml
-	ra|chrome/map-chooser.yaml
+	common|chrome/map-chooser.yaml
-	ra|chrome/multiplayer.yaml
+	common|chrome/multiplayer.yaml
-	ra|chrome/multiplayer-browser.yaml
+	common|chrome/multiplayer-browser.yaml
-	ra|chrome/multiplayer-createserver.yaml
+	common|chrome/multiplayer-createserver.yaml
-	ra|chrome/multiplayer-directconnect.yaml
+	common|chrome/multiplayer-directconnect.yaml
-	ra|chrome/multiplayer-globalchat.yaml
+	common|chrome/multiplayer-globalchat.yaml
-	ra|chrome/connection.yaml
+	common|chrome/connection.yaml
-	ra|chrome/replaybrowser.yaml
+	common|chrome/replaybrowser.yaml
-	ra|chrome/dropdowns.yaml
+	common|chrome/dropdowns.yaml
-	ra|chrome/musicplayer.yaml
+	common|chrome/musicplayer.yaml
-	ra|chrome/tooltips.yaml
+	common|chrome/tooltips.yaml
-	ra|chrome/assetbrowser.yaml
+	common|chrome/assetbrowser.yaml
-	ra|chrome/missionbrowser.yaml
+	common|chrome/missionbrowser.yaml
-	ra|chrome/confirmation-dialogs.yaml
+	common|chrome/confirmation-dialogs.yaml
-	ra|chrome/editor.yaml
+	common|chrome/editor.yaml
 
 Weapons:
 	ra|weapons/explosions.yaml

mods/ts/mod.yaml

@@ -15,7 +15,6 @@ Packages:
 	./mods/common: common
 	$ra: ra
 	$cnc: cnc
-	$d2k: d2k
 
 # Tiberian Sun
 	~scores.mix
@@ -131,47 +130,47 @@ Assemblies:
 	cnc|OpenRA.Mods.Cnc.dll
 
 ChromeLayout:
-	ra|chrome/ingame.yaml
+	common|chrome/ingame.yaml
-	ra|chrome/ingame-chat.yaml
+	common|chrome/ingame-chat.yaml
-	ra|chrome/ingame-fmvplayer.yaml
+	common|chrome/ingame-fmvplayer.yaml
-	ra|chrome/ingame-menu.yaml
+	common|chrome/ingame-menu.yaml
 	ts|chrome/ingame-info.yaml
-	ra|chrome/ingame-infoscripterror.yaml
+	common|chrome/ingame-infoscripterror.yaml
-	ra|chrome/ingame-infobriefing.yaml
+	common|chrome/ingame-infobriefing.yaml
-	ra|chrome/ingame-infoobjectives.yaml
+	common|chrome/ingame-infoobjectives.yaml
-	ra|chrome/ingame-infostats.yaml
+	common|chrome/ingame-infostats.yaml
-	d2k|chrome/ingame-observer.yaml
+	common|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
+	common|chrome/settings.yaml
-	ra|chrome/credits.yaml
+	common|chrome/credits.yaml
-	ra|chrome/lobby.yaml
+	common|chrome/lobby.yaml
-	ra|chrome/lobby-mappreview.yaml
+	common|chrome/lobby-mappreview.yaml
-	ra|chrome/lobby-players.yaml
+	common|chrome/lobby-players.yaml
-	ra|chrome/lobby-options.yaml
+	common|chrome/lobby-options.yaml
-	ra|chrome/lobby-music.yaml
+	common|chrome/lobby-music.yaml
-	ra|chrome/lobby-kickdialogs.yaml
+	common|chrome/lobby-kickdialogs.yaml
-	ra|chrome/lobby-globalchat.yaml
+	common|chrome/lobby-globalchat.yaml
 	ts|chrome/color-picker.yaml
-	ra|chrome/map-chooser.yaml
+	common|chrome/map-chooser.yaml
-	ra|chrome/multiplayer.yaml
+	common|chrome/multiplayer.yaml
-	ra|chrome/multiplayer-browser.yaml
+	common|chrome/multiplayer-browser.yaml
-	ra|chrome/multiplayer-createserver.yaml
+	common|chrome/multiplayer-createserver.yaml
-	ra|chrome/multiplayer-directconnect.yaml
+	common|chrome/multiplayer-directconnect.yaml
-	ra|chrome/multiplayer-globalchat.yaml
+	common|chrome/multiplayer-globalchat.yaml
-	ra|chrome/connection.yaml
+	common|chrome/connection.yaml
-	ra|chrome/replaybrowser.yaml
+	common|chrome/replaybrowser.yaml
 	ts|chrome/dropdowns.yaml
-	ra|chrome/musicplayer.yaml
+	common|chrome/musicplayer.yaml
-	ra|chrome/tooltips.yaml
+	common|chrome/tooltips.yaml
-	ra|chrome/assetbrowser.yaml
+	common|chrome/assetbrowser.yaml
-	ra|chrome/missionbrowser.yaml
+	common|chrome/missionbrowser.yaml
-	ra|chrome/confirmation-dialogs.yaml
+	common|chrome/confirmation-dialogs.yaml
-	ra|chrome/editor.yaml
+	common|chrome/editor.yaml
 
 Voices:
 	ts|audio/voices.yaml