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

sync branch with 1.2.3

Browse Source
This commit is contained in:
Colby Klein
2011-03-13 23:18:08 -07:00
parent aef8661bb6 c110f30f2a
commit 066695a5a7
8 changed files with 68 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+1 -1
View File
@@ -10,7 +10,7 @@ supported but exist anyways.)
_____________________________________________________________________________ _____________________________________________________________________________
================================================================================ ================================================================================
sm-ssc v1.2.3 | 201103?? sm-ssc v1.2.3 | 20110323
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
20110309 20110309
Themes/default/Graphics/CombinedLifeMeterTug stream p1.redir
-1
View File
@@ -1 +0,0 @@
_CombinedLifeMeterTug stream p1
Themes/default/Graphics/CombinedLifeMeterTug stream p2.redir
-1
View File
@@ -1 +0,0 @@
_CombinedLifeMeterTug stream p2
Xcode/Info-StepMania.plist
+1 -1
View File
@@ -50,7 +50,7 @@
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>10.4.10</string> <string>10.4.10</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2010</string> <string>Copyright 2001-2011</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
<string>SMApplication</string> <string>SMApplication</string>
</dict> </dict>
src/ProductInfo.h
+1 -1
View File
@@ -35,7 +35,7 @@
* </li></ul> * </li></ul>
*/ */
#ifndef PRODUCT_VER_BARE #ifndef PRODUCT_VER_BARE
#define PRODUCT_VER_BARE v1.2.2 #define PRODUCT_VER_BARE v1.2.3
#endif #endif
/** /**
src/ProductInfo.inc
+1 -1
View File
@@ -5,7 +5,7 @@
; see ProductInfo.h for use descriptions ; see ProductInfo.h for use descriptions
!define PRODUCT_ID "sm-ssc" !define PRODUCT_ID "sm-ssc"
!define PRODUCT_VER "v1.2.2" !define PRODUCT_VER "v1.2.3"
!define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}" !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
!define PRODUCT_BITMAP "ssc" !define PRODUCT_BITMAP "ssc"
src/StepMania-net2008.vcproj
-1
View File
@@ -1488,7 +1488,6 @@
RelativePath="NotesWriterSSC.h" RelativePath="NotesWriterSSC.h"
> >
</File> </File>
<File <File
RelativePath="NoteTypes.cpp" RelativePath="NoteTypes.cpp"
> >
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+2
View File
@@ -28,6 +28,7 @@ namespace avcodec
#endif #endif
}; };
/*
#if defined(_MSC_VER) && !defined(XBOX) #if defined(_MSC_VER) && !defined(XBOX)
#pragma comment(lib, "ffmpeg/lib/avcodec.lib") #pragma comment(lib, "ffmpeg/lib/avcodec.lib")
#pragma comment(lib, "ffmpeg/lib/avformat.lib") #pragma comment(lib, "ffmpeg/lib/avformat.lib")
@@ -35,6 +36,7 @@ namespace avcodec
#pragma comment(lib, "ffmpeg/lib/swscale.lib") #pragma comment(lib, "ffmpeg/lib/swscale.lib")
#endif #endif
#endif // _MSC_VER && !XBOX #endif // _MSC_VER && !XBOX
*/
#if defined(XBOX) #if defined(XBOX)
/* NOTES: ffmpeg static libraries arent included in SVN. You have to build /* NOTES: ffmpeg static libraries arent included in SVN. You have to build