actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'changes-beta4' of https://github.com/Midiman/stepmania

Browse Source
This commit is contained in:
Colby Klein
2014-09-01 04:49:24 -07:00
parent de36029650 4fdbb3dff6
commit d1cdd04099
16 changed files with 198 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Scripts/02 Colors.lua
+7 -7
View File
@@ -12,7 +12,7 @@ Color = {
Yellow = color("#fff200"),
Orange = color("#f7941d"),
Purple = color("#92278f"),
Outline = color("0,0,0,0.675"),
Outline = color("0,0,0,0.5"),
Invisible = color("1,1,1,0"),
Stealth = color("0,0,0,0"),
-- Android Design Stencil Colors
@@ -47,8 +47,8 @@ setmetatable(Color, { __call = function(self, c) return self[c] end })
GameColor = {
PlayerColors = {
PLAYER_1 = color("#ef403d"),
PLAYER_2 = color("#0089cf"),
PLAYER_1 = color("#ff4444"),
PLAYER_2 = color("#5d9cec"),
},
Difficulty = {
--[[ These are for 'Custom' Difficulty Ranks. It can be very useful
@@ -126,13 +126,13 @@ function ColorDarkTone(c)
end
function PlayerColor( pn )
if pn == PLAYER_1 then return color("#ef403d") end -- pink-red
if pn == PLAYER_2 then return color("#0089cf") end -- sea-blue
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
return color("1,1,1,1")
end
function PlayerScoreColor( pn )
if pn == PLAYER_1 then return color("#ef403d") end -- pink-red
if pn == PLAYER_2 then return color("#0089cf") end -- sea-blue
if pn == PLAYER_1 then return GameColor.PlayerColors["PLAYER_1"] end -- pink-red
if pn == PLAYER_2 then return GameColor.PlayerColors["PLAYER_2"] end -- sea-blue
return color("1,1,1,1")
end