Merge pull request #9324 from atlimit8/ColorSpacePrefixes

Hex Color Parsing
This commit is contained in:
Oliver Brakmann
2015-11-02 20:28:04 +01:00
221 changed files with 12295 additions and 11794 deletions

View File

@@ -1,4 +1,4 @@
MapFormat: 7
MapFormat: 8
RequiresMod: ts

View File

@@ -1,4 +1,4 @@
MapFormat: 7
MapFormat: 8
RequiresMod: ts

View File

@@ -1,4 +1,4 @@
MapFormat: 7
MapFormat: 8
RequiresMod: ts

View File

@@ -1,4 +1,4 @@
MapFormat: 7
MapFormat: 8
RequiresMod: ts

View File

@@ -1,4 +1,4 @@
MapFormat: 7
MapFormat: 8
RequiresMod: ts

View File

@@ -3,36 +3,37 @@
Metrics:
ButtonDepth: 1
ButtonFont: Regular
ButtonTextColor: 255,255,255
ButtonTextColorDisabled: 128,128,128
ButtonTextColor: FFFFFF
ButtonTextColorDisabled: 808080
ButtonTextContrast: false
ButtonTextContrastColor: 0,0,0
ButtonTextContrastColor: 000000
ButtonBaseLine: 0
CheckboxPressedState: false
HotkeyFont: Regular
HotkeyColor: 255,255,255
HotkeyColorDisabled: 128,128,128
HotkeyColor: FFFFFF
HotkeyColorDisabled: 808080
TextfieldFont: Regular
TextfieldColor: 255,255,255
TextfieldColorDisabled: 128,128,128
TextfieldColorInvalid: 255,192,192
TextfieldColor: FFFFFF
TextfieldColorDisabled: 808080
TextfieldColorInvalid: FFC0C0
TextFont: Regular
TextColor: 255,255,255
TextColor: FFFFFF
TextContrast: false
TextContrastColor: 0,0,0
TextContrastColor: 000000
ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
ColorPickerActorType: ^mmch.colorpicker
SpawnFont: TinyBold
SpawnColor: 255,255,255
SpawnContrastColor: 0,0,0
SpawnColor: FFFFFF
SpawnContrastColor: 000000
SpawnLabelOffset: 0,1
IncompatibleVersionColor: 255,0,0
IncompatibleGameColor: 169,169,169
ProtectedGameColor: 255,0,0
IncompatibleProtectedGameColor: 139,0,0
WaitingGameColor: 0,255,0
IncompatibleWaitingGameColor: 50,205,50
GameStartedColor: 255,165,0
IncompatibleGameStartedColor: 210,105,30
GlobalChatTextColor: 255,255,255
GlobalChatNotificationColor: 211,211,211
IncompatibleVersionColor: FF0000
IncompatibleGameColor: A9A9A9
ProtectedGameColor: FF0000
IncompatibleProtectedGameColor: 8B0000
WaitingGameColor: 00FF00
IncompatibleWaitingGameColor: 32CD32
GameStartedColor: FFA500
IncompatibleGameStartedColor: D2691E
GlobalChatTextColor: FFFFFF
GlobalChatNotificationColor: D3D3D3

View File

@@ -59,7 +59,7 @@
UpgradeMinEnabledLevel: 1
TimedUpgradeBar@EMPDISABLE:
Upgrade: empdisable
Color: 255,255,255
Color: FFFFFF
WithDecoration@EMPDISABLE:
Image: emp
Sequence: idle

View File

@@ -94,12 +94,12 @@
FixedColorPalette@GreenTiberium:
Base: player
Name: greentiberium
Color: 64, 255, 128
Color: 7EFF01
RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
FixedColorPalette@BlueTiberium:
Base: player
Name: bluetiberium
Color: 160, 255, 172
Color: 5980FF
RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
PlayerColorPalette:
BasePalette: player

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@ LtRail:
Speed: 1c682
BeamWidth: 1
BeamDuration: 10
Color: 200,0,128,255
Color: 0080FFC8
Warhead@1Dam: SpreadDamage
Spread: 42
Damage: 150
@@ -25,7 +25,7 @@ MechRailgun:
BurstDelay: 60
Report: RAILUSE5.AUD
Projectile: LaserZap
Color: 200,0,255,255
Color: 00FFFFC8
BeamWidth: 3
Warhead@1Dam: SpreadDamage
Spread: 42
@@ -44,7 +44,7 @@ SonicZap:
Charges: yes
Report: SONIC4.AUD
Projectile: LaserZap
Color: 200,0,255,255
Color: 00FFFFC8
BeamWidth: 12
BeamDuration: 50
Warhead@1Dam: SpreadDamage