actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 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
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
+57 -57
View File
@@ -1,57 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>smzip</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>smicon.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/zip</string>
</array>
<key>CFBundleTypeName</key>
<string>SMZip</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSTypeIsPackage</key>
<false/>
<key>NSPersistentStoreTypeKey</key>
<string>Binary</string>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>EXECUTABLE_NAME</string>
<key>CFBundleGetInfoString</key>
<string>PRODUCT_FAMILY_BARE PRODUCT_VER_BARE</string>
<key>CFBundleIconFile</key>
<string>smicon.icns</string>
<key>CFBundleIdentifier</key>
<string>com.PRODUCT_ID_BARE</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>PRODUCT_FAMILY_BARE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>PRODUCT_VER_BARE</string>
<key>CFBundleSignature</key>
<string>Step</string>
<key>CFBundleVersion</key>
<string>PRODUCT_VER_BARE</string>
<key>LSMinimumSystemVersion</key>
<string>10.4.10</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2010</string>
<key>NSPrincipalClass</key>
<string>SMApplication</string>
</dict>
</plist>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>smzip</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>smicon.icns</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>application/zip</string>
</array>
<key>CFBundleTypeName</key>
<string>SMZip</string>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>LSTypeIsPackage</key>
<false/>
<key>NSPersistentStoreTypeKey</key>
<string>Binary</string>
</dict>
</array>
<key>CFBundleExecutable</key>
<string>EXECUTABLE_NAME</string>
<key>CFBundleGetInfoString</key>
<string>PRODUCT_FAMILY_BARE PRODUCT_VER_BARE</string>
<key>CFBundleIconFile</key>
<string>smicon.icns</string>
<key>CFBundleIdentifier</key>
<string>com.PRODUCT_ID_BARE</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>PRODUCT_FAMILY_BARE</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>PRODUCT_VER_BARE</string>
<key>CFBundleSignature</key>
<string>Step</string>
<key>CFBundleVersion</key>
<string>PRODUCT_VER_BARE</string>
<key>LSMinimumSystemVersion</key>
<string>10.4.10</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2011</string>
<key>NSPrincipalClass</key>
<string>SMApplication</string>
</dict>
</plist>
src/ProductInfo.h
+1 -1
View File
@@ -35,7 +35,7 @@
* </li></ul>
*/
#ifndef PRODUCT_VER_BARE
#define PRODUCT_VER_BARE v1.2.2
#define PRODUCT_VER_BARE v1.2.3
#endif
/**
src/ProductInfo.inc
+1 -1
View File
@@ -5,7 +5,7 @@
; see ProductInfo.h for use descriptions
!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_BITMAP "ssc"
src/StepMania-net2008.vcproj
+6 -7
View File
@@ -1480,15 +1480,14 @@
RelativePath="NotesWriterSM.h"
>
</File>
<File
RelativePath="NotesWriterSSC.cpp"
<File
RelativePath="NotesWriterSSC.cpp"
>
</File>
<File
RelativePath="NotesWriterSSC.h"
</File>
<File
RelativePath="NotesWriterSSC.h"
>
</File>
</File>
<File
RelativePath="NoteTypes.cpp"
>
src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+2
View File
@@ -28,6 +28,7 @@ namespace avcodec
#endif
};
/*
#if defined(_MSC_VER) && !defined(XBOX)
#pragma comment(lib, "ffmpeg/lib/avcodec.lib")
#pragma comment(lib, "ffmpeg/lib/avformat.lib")
@@ -35,6 +36,7 @@ namespace avcodec
#pragma comment(lib, "ffmpeg/lib/swscale.lib")
#endif
#endif // _MSC_VER && !XBOX
*/
#if defined(XBOX)
/* NOTES: ffmpeg static libraries arent included in SVN. You have to build