go die in a fire, merging

This commit is contained in:
AJ Kelly
2011-02-27 22:05:31 -06:00
+2 -2
View File
@@ -140,7 +140,7 @@ Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcol
[MusicWheel] [MusicWheel]
FadeSeconds=1 FadeSeconds=1
SwitchSeconds=0.10 SwitchSeconds=0.08
RandomPicksLockedSongs=true RandomPicksLockedSongs=true
RouletteSwitchSeconds=0.05 RouletteSwitchSeconds=0.05
RouletteSlowDownSwitches=5 RouletteSlowDownSwitches=5
@@ -162,7 +162,7 @@ ScrollBarOnCommand=visible,false
; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \ ; self:rotationx( rotationx_radians * 180/math.pi ); --[[ to degrees end]] \
; end; ; end;
ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end
NumWheelItems=13 NumWheelItems=11
MusicWheelSortOnCommand=fov,90; MusicWheelSortOnCommand=fov,90;
MusicWheelSortOffCommand=fov,90; MusicWheelSortOffCommand=fov,90;
MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1