All about the gravy^H^H^H^H^Hmerge train!

This commit is contained in:
Jason Felds
2011-04-01 01:35:57 -04:00
+5 -5
View File
@@ -830,24 +830,24 @@ Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsExtended" NextScreen="ScreenOptionsExtended"
PrevScreen="ScreenOptionsExtended" PrevScreen="ScreenOptionsExtended"
LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter" LineNames="gNotePos,gAuto,gScore,gSScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,GameplayFooter"
LinegNotePos="lua,GamePrefNotePosition()" LinegNotePos="lua,UserPrefNotePosition()"
LinegScore="lua,UserPrefGameplayShowScore()" LinegScore="lua,UserPrefGameplayShowScore()"
LinegSScore="lua,UserPrefSpecialScoringMode()" LinegSScore="lua,UserPrefSpecialScoringMode()"
LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()" LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()"
LinegOpts="lua,UserPrefShowLotsaOptions()" LinegOpts="lua,UserPrefShowLotsaOptions()"
LinegAuto="lua,GamePrefAutoSetStyle()" LinegAuto="lua,UserPrefAutoSetStyle()"
LinegLongFail="lua,UserPrefLongFail()" LinegLongFail="lua,UserPrefLongFail()"
LinegComboUnderField="lua,GamePrefComboUnderField()" LinegComboUnderField="lua,UserPrefComboUnderField()"
LineFlashyCombo="lua,UserPrefFlashyCombo()" LineFlashyCombo="lua,UserPrefFlashyCombo()"
LineGameplayFooter="lua,UserPrefGameplayFooter()" LineGameplayFooter="lua,UserPrefGameplayFooter()"
[ScreenOptionsSystemDirection] [ScreenOptionsSystemDirection]
LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22" LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22"
LineLF="lua,UserPrefLongFail()" LineLF="lua,UserPrefLongFail()"
LineRollCombo="lua,GamePrefComboOnRolls()" LineRollCombo="lua,UserPrefComboOnRolls()"
LineFlashyCombo="lua,UserPrefFlashyCombo()" LineFlashyCombo="lua,UserPrefFlashyCombo()"
[ScreenOptionsAdvanced] [ScreenOptionsAdvanced]
LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo" LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
LineRollCombo="lua,GamePrefComboOnRolls()" LineRollCombo="lua,UserPrefComboOnRolls()"
[ScreenOptionsService] [ScreenOptionsService]
ShowHeader=false ShowHeader=false