undo the removal of all the metrics that happened when john_reactor committed stuff. learn to hg pull -u

This commit is contained in:
AJ Kelly
2011-08-16 13:04:58 -05:00
parent 893866338c
commit 51fff29d0b
+12 -7
View File
@@ -38,11 +38,11 @@ NumRainbowColors=1
RainbowColor1=Color("Black");
[BPMDisplay]
SetNoBpmCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875);
SetNormalCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875);
SetChangeCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);
SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5);
SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5);
SetNoBpmCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875);
SetNormalCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875);
SetChangeCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875);
SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,color("Green");textglowmode,'TextGlowMode_Inner';glowshift;effectcolor1,color("1,1,1,0.05");effectcolor2,color("1,1,1,0.325");
SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5);diffuseshift;effectcolor1,color("1,1,1,1");effectcolor2,color("0.475,0.475,0.475,1");
RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster
[CodeDetector]
@@ -924,6 +924,10 @@ BPMLabelY=SCREEN_TOP+160+(36/2)+6
BPMLabelOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X
BPMLabelOffCommand=bouncebegin,0.15;zoomx,0;
#
ShowSegmentDisplay=not GAMESTATE:IsCourseMode()
SegmentDisplayX=SCREEN_CENTER_X-160
SegmentDisplayY=SCREEN_TOP+160-36+4
#
ShowDifficultyList=not GAMESTATE:IsCourseMode();
DifficultyListX=SCREEN_CENTER_X-160
DifficultyListY=SCREEN_TOP+216
@@ -1252,7 +1256,7 @@ LineRollCombo="lua,UserPrefComboOnRolls()"
Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended"
LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter"
LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter",FancyUIBG
LinegNotePos="lua,UserPrefNotePosition()"
LinegScore="lua,UserPrefGameplayShowScore()"
LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()"
@@ -1262,6 +1266,7 @@ LinegLongFail="lua,UserPrefLongFail()"
LinegComboUnderField="lua,UserPrefComboUnderField()"
LineFlashyCombo="lua,UserPrefFlashyCombo()"
LineGameplayFooter="lua,UserPrefGameplayFooter()"
LineFancyUIBG="lua,UserPrefFancyUIBG()"
[ScreenSelectGame]
@@ -2097,7 +2102,7 @@ LogoOffCommand=stopeffect;bouncebegin,0.35;rotationz,360;zoom,0
VersionInfoX=SCREEN_CENTER_X+114
VersionInfoY=SCREEN_CENTER_Y+44
VersionInfoOnCommand=settext,ProductVersion();horizalign,right;vertalign,bottom;bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.65;shadowlength,1;shadowcolor,color("0.2,0.2,0.2,0.925");
VersionInfoOnCommand=horizalign,right;vertalign,bottom;bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.65;shadowlength,1;shadowcolor,color("0.2,0.2,0.2,0.925");
ScrollerOnCommand=visible,false;
ArcadeOverlay.TextY=SCREEN_BOTTOM-128