Merge pull request #12175 from abcdefg30/d2kChrome

Remove duplicated chrome yaml files from d2k
This commit is contained in:
reaperrr
2016-10-09 22:32:02 +02:00
committed by GitHub
3 changed files with 2 additions and 83 deletions

View File

@@ -1,44 +0,0 @@
Background@COLOR_CHOOSER:
Logic: ColorPickerLogic
Background: dialog2
Width: 326
Height: 140
Children:
Button@RANDOM_BUTTON:
Key: tab
X: 250
Y: 109
Width: 70
Height: 25
Text: Random
Font: Bold
Background@HUEBG:
Background: dialog3
X: 5
Y: 5
Width: 240
Height: 17
Children:
HueSlider@HUE:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Ticks: 5
Background@MIXERBG:
Background: dialog3
X: 5
Y: 27
Width: 240
Height: 107
Children:
ColorMixer@MIXER:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
ActorPreview@PREVIEW:
X: 245
Y: 21
Width: 80
Height: 73

View File

@@ -1,37 +0,0 @@
Container@INGAME_ROOT:
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@MUSICBUTTONS:
Logic: MusicControllerLogic
Children:
LogicKeyListener@MUSICCONTROLLER_KEYHANDLER:
Container@WORLD_ROOT:
Logic: LoadIngamePerfLogic
Children:
LogicTicker@DISCONNECT_WATCHER:
Logic: DisconnectWatcherLogic
WorldInteractionController@INTERACTION_CONTROLLER:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
ViewportController:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
TooltipContainer: TOOLTIP_CONTAINER
WorldCommand:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
StrategicProgress@STRATEGIC_PROGRESS:
X: WINDOW_RIGHT/2
Y: 40
Container@PLAYER_ROOT:
Container@PERF_ROOT:
Container@MENU_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Label@MISSION_TEXT:
X: WINDOW_RIGHT/2 - 256
Y: 22
Width: 512
Height: 25
Font: Bold
Align: Center
Contrast: true

View File

@@ -68,7 +68,7 @@ Assemblies:
d2k|OpenRA.Mods.D2k.dll
ChromeLayout:
d2k|chrome/ingame.yaml
ra|chrome/ingame.yaml
ra|chrome/ingame-chat.yaml
ra|chrome/ingame-fmvplayer.yaml
d2k|chrome/ingame-menu.yaml
@@ -92,7 +92,7 @@ ChromeLayout:
ra|chrome/lobby-music.yaml
ra|chrome/lobby-kickdialogs.yaml
ra|chrome/lobby-globalchat.yaml
d2k|chrome/color-picker.yaml
ra|chrome/color-picker.yaml
ra|chrome/map-chooser.yaml
ra|chrome/multiplayer.yaml
ra|chrome/multiplayer-browser.yaml