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

Welcome to the world of merging.

Browse Source
This commit is contained in:
Jason Felds
2012-01-08 21:40:36 -05:00
parent e73d3c33c3 077cb394eb
commit 28679c0f3d
27 changed files with 648 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NoteSkins/common/_Editor/_DownLeftP1 Tap Lift 6x9 (res 384x576).png.png → NoteSkins/common/_Editor/_DownLeftP1 Tap Lift 6x9 (res 384x576).png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 KiB

After

Width:  |  Height:  |  Size: 223 KiB

NoteSkins/common/_Editor/metrics.ini
+6 -6
View File
@@ -79,24 +79,24 @@ RollTailAnimationIsVivid=0
TapNoteAdditionTextureCoordOffsetX=0.5 TapNoteAdditionTextureCoordOffsetX=0.5
TapNoteAdditionTextureCoordOffsetY=0 TapNoteAdditionTextureCoordOffsetY=0
TapNoteNoteColorTextureCoordSpacingX=0 TapNoteNoteColorTextureCoordSpacingX=0
TapNoteNoteColorTextureCoordSpacingY=0.111111 TapNoteNoteColorTextureCoordSpacingY=0.0625
TapMineAdditionTextureCoordOffsetX=0 TapMineAdditionTextureCoordOffsetX=0
TapMineAdditionTextureCoordOffsetY=0 TapMineAdditionTextureCoordOffsetY=0
TapMineNoteColorTextureCoordSpacingX=0 TapMineNoteColorTextureCoordSpacingX=0
TapMineNoteColorTextureCoordSpacingY=0.111111 TapMineNoteColorTextureCoordSpacingY=0.0625
TapLiftAdditionTextureCoordOffsetX=0 TapLiftAdditionTextureCoordOffsetX=0
TapLiftAdditionTextureCoordOffsetY=0 TapLiftAdditionTextureCoordOffsetY=0
TapLiftNoteColorTextureCoordSpacingX=0 TapLiftNoteColorTextureCoordSpacingX=0
TapLiftNoteColorTextureCoordSpacingY=0.111111 TapLiftNoteColorTextureCoordSpacingY=0.0625
TapFakeAdditionTextureCoordOffsetX=0 TapFakeAdditionTextureCoordOffsetX=0
TapFakeAdditionTextureCoordOffsetY=0 TapFakeAdditionTextureCoordOffsetY=0
TapFakeNoteColorTextureCoordSpacingX=0 TapFakeNoteColorTextureCoordSpacingX=0
TapFakeNoteColorTextureCoordSpacingY=0.111111 TapFakeNoteColorTextureCoordSpacingY=0.0625
##Hold Parts ##Hold Parts
HoldHeadAdditionTextureCoordOffsetX=0 HoldHeadAdditionTextureCoordOffsetX=0
HoldHeadAdditionTextureCoordOffsetY=0 HoldHeadAdditionTextureCoordOffsetY=0
HoldHeadNoteColorTextureCoordSpacingX=0 HoldHeadNoteColorTextureCoordSpacingX=0
HoldHeadNoteColorTextureCoordSpacingY=0.111111 HoldHeadNoteColorTextureCoordSpacingY=0.0625
HoldTopCapAdditionTextureCoordOffsetX=0 HoldTopCapAdditionTextureCoordOffsetX=0
HoldTopCapAdditionTextureCoordOffsetY=0 HoldTopCapAdditionTextureCoordOffsetY=0
HoldTopCapNoteColorTextureCoordSpacingX=0 HoldTopCapNoteColorTextureCoordSpacingX=0
@@ -117,7 +117,7 @@ HoldTailNoteColorTextureCoordSpacingY=0
RollHeadAdditionTextureCoordOffsetX=0 RollHeadAdditionTextureCoordOffsetX=0
RollHeadAdditionTextureCoordOffsetY=0 RollHeadAdditionTextureCoordOffsetY=0
RollHeadNoteColorTextureCoordSpacingX=0 RollHeadNoteColorTextureCoordSpacingX=0
RollHeadNoteColorTextureCoordSpacingY=0.111111 RollHeadNoteColorTextureCoordSpacingY=0.0625
RollTopCapAdditionTextureCoordOffsetX=0 RollTopCapAdditionTextureCoordOffsetX=0
RollTopCapAdditionTextureCoordOffsetY=0 RollTopCapAdditionTextureCoordOffsetY=0
RollTopCapNoteColorTextureCoordSpacingX=0 RollTopCapNoteColorTextureCoordSpacingX=0
Themes/default/Graphics/CombinedLifeMeterTug stream p1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

Themes/default/Graphics/CombinedLifeMeterTug stream p2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

Themes/default/Graphics/ScoreDisplayRave frame base p1.redir
+1
View File
@@ -0,0 +1 @@
_rave meter base
Themes/default/Graphics/ScoreDisplayRave frame base p2.redir
+1
View File
@@ -0,0 +1 @@
_rave meter base
Themes/default/Graphics/_rave meter base.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

Themes/default/metrics.ini
+6 -4
View File
@@ -199,11 +199,13 @@ RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_1)
LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2) LeftOnCommand=horizalign,right;diffuse,PlayerColor(PLAYER_2)
MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2) MiddleOnCommand=;diffuse,PlayerColor(PLAYER_2)
RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2) RightOnCommand=horizalign,left;diffuse,PlayerColor(PLAYER_2)
[MenuTimer] [MenuTimer]
Text1OnCommand=stopeffect;stoptweening;shadowlength,0;strokecolor,Color("Outline") Text1OnCommand=stopeffect;stoptweening;halign,1;shadowlength,0;strokecolor,Color("Outline")
Text1FormatFunction=function(fSeconds) \ Text1FormatFunction=function(fSeconds) fSeconds=math.floor(fSeconds); return string.format("%02.0f",fSeconds) end
return string.format("%0.1f", fSeconds); \
end Text2OnCommand=x,2;y,-3;stopeffect;stoptweening;halign,0;shadowlength,0;strokecolor,Color("Outline");zoom,0.65
Text2FormatFunction=function(fSeconds) local remainder=fSeconds-math.floor(fSeconds); local digit=math.floor(remainder*100); return string.format("%02.0f",digit) end
Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1"); Warning10Command=diffuseshift;effectperiod,1;effectcolor2,Color("Red");effectcolor1,color("0.5,0,0,1");