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

[splittiming] merge (81)

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-05-10 21:24:34 +07:00
parent b8a4521f9c cb52b2b1ed
commit 5209585cdc
2 changed files with 212 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Sprite.cpp
+1 -1
View File
@@ -1130,7 +1130,7 @@ public:
static int setstate( T* p, lua_State *L ) { p->SetState( IArg(1) ); return 0; } static int setstate( T* p, lua_State *L ) { p->SetState( IArg(1) ); return 0; }
static int GetState( T* p, lua_State *L ) { lua_pushnumber( L, p->GetState() ); return 1; } static int GetState( T* p, lua_State *L ) { lua_pushnumber( L, p->GetState() ); return 1; }
static int GetAnimationLengthSeconds( T* p, lua_State *L ) { lua_pushnumber( L, p->GetAnimationLengthSeconds() ); return 1; } static int GetAnimationLengthSeconds( T* p, lua_State *L ) { lua_pushnumber( L, p->GetAnimationLengthSeconds() ); return 1; }
static int SetSecondsIntoAnimation( T* p, lua_State *L ) { p->SetSecondsIntoAnimation(FArg(0)) return 0; } static int SetSecondsIntoAnimation( T* p, lua_State *L ) { p->SetSecondsIntoAnimation(FArg(0)); return 0; }
static int SetTexture( T* p, lua_State *L ) static int SetTexture( T* p, lua_State *L )
{ {
RageTexture *pTexture = Luna<RageTexture>::check(L, 1); RageTexture *pTexture = Luna<RageTexture>::check(L, 1);
src/StepMania-net2008.vcproj
+211 -23
View File
@@ -6564,29 +6564,217 @@
RelativePath="glext.h" RelativePath="glext.h"
> >
</File> </File>
<Filter Name="libpng"> <Filter
<File RelativePath="..\extern\libpng\include\png.c"></File> Name="libpng"
<File RelativePath="..\extern\libpng\include\png.h"></File> >
<File RelativePath="..\extern\libpng\include\pngconf.h"></File> <File
<File RelativePath="..\extern\libpng\include\pngdebug.h"></File> RelativePath="..\extern\libpng\include\png.c"
<File RelativePath="..\extern\libpng\include\pngerror.c"></File> >
<File RelativePath="..\extern\libpng\include\pngget.c"></File> <FileConfiguration
<File RelativePath="..\extern\libpng\include\pnginfo.h"></File> Name="Release-SSE2|Win32"
<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File> >
<File RelativePath="..\extern\libpng\include\pngmem.c"></File> <Tool
<File RelativePath="..\extern\libpng\include\pngpread.c"></File> Name="VCCLCompilerTool"
<File RelativePath="..\extern\libpng\include\pngpriv.h"></File> UsePrecompiledHeader="0"
<File RelativePath="..\extern\libpng\include\pngread.c"></File> />
<File RelativePath="..\extern\libpng\include\pngrio.c"></File> </FileConfiguration>
<File RelativePath="..\extern\libpng\include\pngrtran.c"></File> </File>
<File RelativePath="..\extern\libpng\include\pngrutil.c"></File> <File
<File RelativePath="..\extern\libpng\include\pngset.c"></File> RelativePath="..\extern\libpng\include\png.h"
<File RelativePath="..\extern\libpng\include\pngstruct.h"></File> >
<File RelativePath="..\extern\libpng\include\pngtrans.c"></File> </File>
<File RelativePath="..\extern\libpng\include\pngwio.c"></File> <File
<File RelativePath="..\extern\libpng\include\pngwrite.c"></File> RelativePath="..\extern\libpng\include\pngconf.h"
<File RelativePath="..\extern\libpng\include\pngwtran.c"></File> >
<File RelativePath="..\extern\libpng\include\pngwutil.c"></File> </File>
<File
RelativePath="..\extern\libpng\include\pngdebug.h"
>
</File>
<File
RelativePath="..\extern\libpng\include\pngerror.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngget.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pnginfo.h"
>
</File>
<File
RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"
>
</File>
<File
RelativePath="..\extern\libpng\include\pngmem.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngpread.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngpriv.h"
>
</File>
<File
RelativePath="..\extern\libpng\include\pngread.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngrio.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngrtran.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngrutil.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngset.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngstruct.h"
>
</File>
<File
RelativePath="..\extern\libpng\include\pngtrans.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngwio.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngwrite.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngwtran.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\extern\libpng\include\pngwutil.c"
>
<FileConfiguration
Name="Release-SSE2|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
</Filter> </Filter>
<Filter <Filter
Name="pcre" Name="pcre"