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

[default -> splittiming] merge

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-05-12 23:28:55 +07:00
parent a09e3d51c2 469edbc73c
commit 1501924780
3 changed files with 128 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NoteSkins/dance/midi-note/NoteSkin.lua
+6
View File
@@ -30,6 +30,11 @@ ret.Redir = function(sButton, sElement)
sElement = "Hold Head Inactive"; sElement = "Hold Head Inactive";
end end
if sElement == "Tap Fake"
then
sElement = "Tap Note";
end
sButton = ret.RedirTable[sButton]; sButton = ret.RedirTable[sButton];
return sButton, sElement; return sButton, sElement;
@@ -85,6 +90,7 @@ ret.PartsToRotate =
["Tap Explosion Bright"] = true, ["Tap Explosion Bright"] = true,
["Tap Explosion Dim"] = true, ["Tap Explosion Dim"] = true,
["Tap Note"] = true, ["Tap Note"] = true,
["Tap Fake"] = true,
["Tap Lift"] = true, ["Tap Lift"] = true,
["Hold Head Active"] = true, ["Hold Head Active"] = true,
["Hold Head Inactive"] = true, ["Hold Head Inactive"] = true,
src/NoteField.h
+1 -1
View File
@@ -56,7 +56,7 @@ protected:
void DrawMarkerBar( int fBeat ); void DrawMarkerBar( int fBeat );
void DrawAreaHighlight( int iStartBeat, int iEndBeat ); void DrawAreaHighlight( int iStartBeat, int iEndBeat );
void DrawBPMText( const float fBeat, const float fBPM ); void DrawBPMText( const float fBeat, const float fBPM );
void DrawFreezeText( const float fBeat, const float fBPM, const float bDelay ); void DrawFreezeText( const float fBeat, const float fLength, const float bDelay );
void DrawWarpText( const float fBeat, const float fNewBeat ); void DrawWarpText( const float fBeat, const float fNewBeat );
void DrawTimeSignatureText( const float fBeat, int iNumerator, int iDenominator ); void DrawTimeSignatureText( const float fBeat, int iNumerator, int iDenominator );
void DrawTickcountText( const float fBeat, int iTicks ); void DrawTickcountText( const float fBeat, int iTicks );
src/StepMania-net2008.vcproj
+120
View File
@@ -6586,6 +6586,14 @@
<File <File
RelativePath="..\extern\libpng\include\png.c" RelativePath="..\extern\libpng\include\png.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6610,6 +6618,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngerror.c" RelativePath="..\extern\libpng\include\pngerror.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6622,6 +6638,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngget.c" RelativePath="..\extern\libpng\include\pngget.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6642,6 +6666,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngmem.c" RelativePath="..\extern\libpng\include\pngmem.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6654,6 +6686,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngpread.c" RelativePath="..\extern\libpng\include\pngpread.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6670,6 +6710,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngread.c" RelativePath="..\extern\libpng\include\pngread.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6682,6 +6730,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngrio.c" RelativePath="..\extern\libpng\include\pngrio.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6694,6 +6750,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngrtran.c" RelativePath="..\extern\libpng\include\pngrtran.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6706,6 +6770,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngrutil.c" RelativePath="..\extern\libpng\include\pngrutil.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6718,6 +6790,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngset.c" RelativePath="..\extern\libpng\include\pngset.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6734,6 +6814,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngtrans.c" RelativePath="..\extern\libpng\include\pngtrans.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6746,6 +6834,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngwio.c" RelativePath="..\extern\libpng\include\pngwio.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6758,6 +6854,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngwrite.c" RelativePath="..\extern\libpng\include\pngwrite.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6770,6 +6874,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngwtran.c" RelativePath="..\extern\libpng\include\pngwtran.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >
@@ -6782,6 +6894,14 @@
<File <File
RelativePath="..\extern\libpng\include\pngwutil.c" RelativePath="..\extern\libpng\include\pngwutil.c"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release-SSE2|Win32" Name="Release-SSE2|Win32"
> >