epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Color picker update with team color presets. Bots added will use available team color presets by default

Browse Source
This commit is contained in:
David Wilson
2018-02-25 12:09:53 +10:00
committed by Paul Chote
parent b383b9abc9
commit 9bc9ce4577
12 changed files with 534 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
mods/cnc/chrome/color-picker.yaml
View File

@@ -1,44 +1,138 @@
Background@COLOR_CHOOSER:
Logic: ColorPickerLogic
PaletteColumns: 8
PalettePresetRows: 2
PaletteCustomRows: 1
Background: panel-black
Width: 311
Height: 140
Height: 148
Children:
Button@RANDOM_BUTTON:
Key: tab
X: 235
Y: 109
Width: 70
X: 229
Y: 89
Width: 77
Height: 25
Text: Random
Background@HUEBG:
Button@STORE_BUTTON:
X: 229
Y: 118
Width: 77
Height: 25
Text: Store
Font: Bold
ActorPreview@PREVIEW:
X: 232
Y: 7
Width: 77
Height: 73
Animate: true
Button@MIXER_TAB_BUTTON:
X: 5
Y: PARENT_BOTTOM - 30
Height: 25
Width: 80
Text: Mixer
Font: Bold
Button@PALETTE_TAB_BUTTON:
X: 90
Y: PARENT_BOTTOM - 30
Height: 25
Width: 80
Text: Palette
Font: Bold
Container@MIXER_TAB:
X: 5
Y: 5
Width: PARENT_RIGHT - 91
Height: PARENT_BOTTOM - 34
Children:
Background@HUEBG:
Background: panel-black
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 17
Children:
HueSlider@HUE:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Ticks: 5
Background@MIXERBG:
Background: panel-black
X: 0
Y: 22
Width: PARENT_RIGHT
Height: 92
Children:
ColorMixer@MIXER:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Background@PALETTE_TAB:
Background: panel-black
X: 5
Y: 5
Width: 225
Height: 17
Width: PARENT_RIGHT - 91
Height: PARENT_BOTTOM - 34
Visible: false
Children:
HueSlider@HUE:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Ticks: 5
Background@MIXERBG:
Background: panel-black
X: 5
Y: 27
Width: 225
Height: 107
Children:
ColorMixer@MIXER:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
ActorPreview@PREVIEW:
X: 230
Y: 21
Width: 80
Height: 73
Animate: true
Container@PALETTE_TAB_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Background@PRESET_HEADER:
Background: panel-black
Width: PARENT_RIGHT - 4
Height: 13
X: 2
Y: 2
Children:
Label@LABEL:
Font: TinyBold
Width: PARENT_RIGHT
Height: 10
Align: Center
Text: Preset Colors
Container@PRESET_AREA:
Width: PARENT_RIGHT - 4
Height: 58
X: 2
Y: 16
Children:
ColorBlock@COLORPRESET:
X: 0
Y: 0
Width: 27
Height: 27
Visible: false
Background@CUSTOM_HEADER:
Background: panel-black
Width: PARENT_RIGHT - 4
Height: 13
X: 2
Y: 71
Children:
Label@LABEL:
Font: TinyBold
Width: PARENT_RIGHT
Height: 10
Align: Center
Text: Custom Colors
Container@CUSTOM_AREA:
Width: PARENT_RIGHT - 4
Height: 31
X: 2
Y: 85
Children:
ColorBlock@COLORCUSTOM:
X: 0
Y: 0
Width: 27
Height: 27
Visible: false

1
mods/cnc/mod.yaml
View File

@@ -235,6 +235,7 @@ GameSpeeds:
OrderLatency: 6
ColorValidator:
TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, b6f706, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 380135, 1d06f7, 328dff, 78dbf8, cef6b1, 000000
ModContent:
InstallPromptMessage: Tiberian Dawn requires artwork and audio from the original game.\n\nQuick Install will automatically download this content (without music\nor videos) from a mirror of the 2007 C&C Gold freeware release.\n\nAdvanced Install includes options for downloading the music and for\ncopying the videos and other content from an original game disc.

154
mods/common/chrome/color-picker.yaml
View File

@@ -1,44 +1,138 @@
Background@COLOR_CHOOSER:
Logic: ColorPickerLogic
PaletteColumns: 8
PalettePresetRows: 2
PaletteCustomRows: 1
Background: dialog2
Width: 326
Height: 140
Height: 154
Children:
Button@RANDOM_BUTTON:
Key: tab
X: 250
Y: 109
Width: 70
X: 245
Y: 95
Width: 76
Height: 25
Text: Random
Font: Bold
Background@HUEBG:
Button@STORE_BUTTON:
X: 245
Y: 124
Width: 76
Height: 25
Text: Store
Font: Bold
ActorPreview@PREVIEW:
X: 245
Y: 13
Width: 76
Height: 73
Button@MIXER_TAB_BUTTON:
X: 5
Y: PARENT_BOTTOM - 30
Height: 25
Width: 80
Text: Mixer
Font: Bold
Button@PALETTE_TAB_BUTTON:
X: 85
Y: PARENT_BOTTOM - 30
Height: 25
Width: 80
Text: Palette
Font: Bold
Container@MIXER_TAB:
X: 5
Y: 5
Width: PARENT_RIGHT - 90
Height: PARENT_BOTTOM - 34
Children:
Background@HUEBG:
Background: dialog3
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 17
Children:
HueSlider@HUE:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Ticks: 5
Background@MIXERBG:
Background: dialog3
X: 0
Y: 22
Width: PARENT_RIGHT
Height: PARENT_BOTTOM - 22
Children:
ColorMixer@MIXER:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Background@PALETTE_TAB:
Background: dialog3
X: 5
Y: 5
Width: 240
Height: 17
Width: PARENT_RIGHT - 90
Height: PARENT_BOTTOM - 34
Visible: false
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
Container@PALETTE_TAB_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Background@PRESET_HEADER:
Background: dialog2
Width: PARENT_RIGHT - 4
Height: 13
X: 2
Y: 2
Children:
Label@LABEL:
Font: TinyBold
Width: PARENT_RIGHT
Height: 10
Align: Center
Text: Preset Colors
Container@PRESET_AREA:
Width: PARENT_RIGHT - 4
Height: 58
X: 2
Y: 16
Children:
ColorBlock@COLORPRESET:
X: 0
Y: 0
Width: 29
Height: 29
Visible: false
Background@CUSTOM_HEADER:
Background: dialog2
Width: PARENT_RIGHT - 4
Height: 13
X: 2
Y: 75
Children:
Label@LABEL:
Font: TinyBold
Width: PARENT_RIGHT
Height: 10
Align: Center
Text: Custom Colors
Container@CUSTOM_AREA:
Width: PARENT_RIGHT - 4
Height: 31
X: 2
Y: 89
Children:
ColorBlock@COLORCUSTOM:
X: 0
Y: 0
Width: 29
Height: 29
Visible: false

1
mods/d2k/mod.yaml
View File

@@ -212,6 +212,7 @@ GameSpeeds:
OrderLatency: 6
ColorValidator:
TeamColorPresets: ffc9ca, f53333, ffae00, fff830, 87f506, f872ad, da06f3, ddb8ff, def7b2, 39c46f, 200738, 280df6, 2f86f2, 76d2f8, 498221, 000000
ModContent:
InstallPromptMessage: Dune 2000 requires artwork and audio from the original game.\n\nQuick Install will automatically download this content (without\nmusic or videos) from an online mirror of the game files.\n\nAdvanced Install includes options for copying the music, videos,\nand other content from an original game disc.

1
mods/ra/mod.yaml
View File

@@ -237,6 +237,7 @@ GameSpeeds:
OrderLatency: 6
ColorValidator:
TeamColorPresets: ffc9ca, f50606, 98331f, f57606, f7bb06, f861a4, da06f3, ddb8ff, 06f739, cef7b2, 200738, 280df6, 2f86f2, 76d2f8, 34ba93, 000000
ModContent:
InstallPromptMessage: Red Alert requires artwork and audio from the original game.\n\nQuick Install will automatically download this content (without music\nor videos) from a mirror of the 2008 Red Alert freeware release.\n\nAdvanced Install includes options for downloading the music and for\ncopying the videos and other content from an original game disc.

156
mods/ts/chrome/color-picker.yaml
View File

@@ -1,45 +1,139 @@
Background@COLOR_CHOOSER:
Logic: ColorPickerLogic
PaletteColumns: 8
PalettePresetRows: 2
PaletteCustomRows: 1
Background: dialog2
Width: 326
Height: 140
Height: 154
Children:
Button@RANDOM_BUTTON:
Key: tab
X: 250
Y: 109
Width: 70
X: 245
Y: 95
Width: 76
Height: 25
Text: Random
Font: Bold
Background@HUEBG:
Button@STORE_BUTTON:
X: 245
Y: 124
Width: 76
Height: 25
Text: Store
Font: Bold
ActorPreview@PREVIEW:
X: 245
Y: 16
Width: 76
Height: 74
Animate: true
Button@MIXER_TAB_BUTTON:
X: 5
Y: PARENT_BOTTOM - 30
Height: 25
Width: 80
Text: Mixer
Font: Bold
Button@PALETTE_TAB_BUTTON:
X: 85
Y: PARENT_BOTTOM - 30
Height: 25
Width: 80
Text: Palette
Font: Bold
Container@MIXER_TAB:
X: 5
Y: 5
Width: PARENT_RIGHT - 90
Height: PARENT_BOTTOM - 34
Children:
Background@HUEBG:
Background: dialog3
X: 0
Y: 0
Width: PARENT_RIGHT
Height: 17
Children:
HueSlider@HUE:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Ticks: 5
Background@MIXERBG:
Background: dialog3
X: 0
Y: 22
Width: PARENT_RIGHT
Height: PARENT_BOTTOM - 22
Children:
ColorMixer@MIXER:
X: 2
Y: 2
Width: PARENT_RIGHT - 4
Height: PARENT_BOTTOM - 4
Background@PALETTE_TAB:
Background: dialog3
X: 5
Y: 5
Width: 240
Height: 17
Width: PARENT_RIGHT - 90
Height: PARENT_BOTTOM - 34
Visible: false
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: 11
Width: 80
Height: 74
Animate: true
Container@PALETTE_TAB_PANEL:
X: 0
Y: 0
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
Children:
Background@PRESET_HEADER:
Background: dialog2
Width: PARENT_RIGHT - 4
Height: 13
X: 2
Y: 2
Children:
Label@LABEL:
Font: TinyBold
Width: PARENT_RIGHT
Height: 10
Align: Center
Text: Preset Colors
Container@PRESET_AREA:
Width: PARENT_RIGHT - 4
Height: 58
X: 2
Y: 16
Children:
ColorBlock@COLORPRESET:
X: 0
Y: 0
Width: 29
Height: 29
Visible: false
Background@CUSTOM_HEADER:
Background: dialog2
Width: PARENT_RIGHT - 4
Height: 13
X: 2
Y: 75
Children:
Label@LABEL:
Font: TinyBold
Width: PARENT_RIGHT
Height: 10
Align: Center
Text: Custom Colors
Container@CUSTOM_AREA:
Width: PARENT_RIGHT - 4
Height: 31
X: 2
Y: 89
Children:
ColorBlock@COLORCUSTOM:
X: 0
Y: 0
Width: 29
Height: 29
Visible: false

1
mods/ts/mod.yaml
View File

@@ -273,6 +273,7 @@ GameSpeeds:
OrderLatency: 6
ColorValidator:
TeamColorPresets: f70606, ff7a22, f8d3b3, f8e947, b6f706, f335a0, a64d6c, ce08f9, f5b2db, 12b572, 380135, 1d06f7, 328dff, 78dbf8, cef6b1, 000000
ModContent:
InstallPromptMessage: Tiberian Sun requires artwork and audio from the original game.\n\nQuick Install will automatically download this content (without music\nor videos) from a mirror of the 2012 Tiberian Sun freeware release.\n\nAdvanced Install includes options for downloading the music and for\ncopying the videos and other content from an original game disc.