diff --git a/Data/AI.ini b/Data/AI.ini index 7ca232dfac..421c8757b7 100644 --- a/Data/AI.ini +++ b/Data/AI.ini @@ -39,17 +39,17 @@ WeightW2=30 WeightW1=50 [Skill5] -WeightMiss=8 -WeightW5=1 -WeightW4=1 +WeightMiss=2 +WeightW5=3 +WeightW4=5 WeightW3=5 WeightW2=30 WeightW1=55 [Skill6] -WeightMiss=8 -WeightW5=1 -WeightW4=1 +WeightMiss=2 +WeightW5=3 +WeightW4=5 WeightW3=5 WeightW2=30 WeightW1=55 diff --git a/Installer/custom-sm5.bmp b/Installer/custom-sm5.bmp index 4d4a4490d8..17c427c6b4 100644 Binary files a/Installer/custom-sm5.bmp and b/Installer/custom-sm5.bmp differ diff --git a/Installer/header-sm5.bmp b/Installer/header-sm5.bmp index 8b5662310f..73a0be357f 100644 Binary files a/Installer/header-sm5.bmp and b/Installer/header-sm5.bmp differ diff --git a/Installer/install.ico b/Installer/install.ico index 6a5de183f0..60a8122e56 100644 Binary files a/Installer/install.ico and b/Installer/install.ico differ diff --git a/Installer/welcome-sm5.bmp b/Installer/welcome-sm5.bmp index e460d85781..08b7d503bf 100644 Binary files a/Installer/welcome-sm5.bmp and b/Installer/welcome-sm5.bmp differ diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 84f42d7af3..9f85bed459 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -372,7 +372,7 @@ MaxTextureResolution=Choose the maximum texture resolution. Setting this to any MenuTimer=When &oq;ON&cq;, menus have a time limit. Mines=Mines MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel. -MovieColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer. +MovieColorDepth=Choose the color depth of movies. 32 bit textures use more memory, but look nicer. MusicWheelSwitchSpeed=Adjusts the speed of the music wheel. MusicWheelUsesSections=&oq;Always&cq; means sections in group + ABC; &oq;Never&cq; means no sections; &oq;Title Only&cq; shows sections in ABC order. Network Options=Connect to a server or change server options. diff --git a/Themes/_fallback/Scripts/03 Gameplay.lua b/Themes/_fallback/Scripts/03 Gameplay.lua index 3fd0d83e4b..629453ff5a 100644 --- a/Themes/_fallback/Scripts/03 Gameplay.lua +++ b/Themes/_fallback/Scripts/03 Gameplay.lua @@ -187,7 +187,11 @@ function HoldTiming() end function ShowHoldJudgments() - return not GAMESTATE:GetCurrentGame():GetName() == "pump" + if GAMESTATE:GetCurrentGame():GetName() == "pump" then + return false + else + return true + end end function HoldHeadStep() @@ -271,4 +275,4 @@ end function ComboUnderField() return GetUserPrefB("UserPrefComboUnderField") -end \ No newline at end of file +end diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 497c15706c..7255b9a842 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -28,7 +28,7 @@ ScreenHeight=480 AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle") # Default modifiers and noteskin. -DefaultModifiers="" +DefaultModifiers="1x" DefaultNoteSkinName="default" # Difficulties to show. Useful for custom games where you want to hide these. @@ -200,6 +200,8 @@ DrunkOffsetFrequency=10 DrunkArrowMagnitude=0.5 BeatOffsetHeight=15 BeatPIHeight=2 +MiniPercentBase=0.5 +MiniPercentGate=1 TinyPercentBase=0.5 TinyPercentGate=1 DizzyHoldHeads=false diff --git a/sm-ssc.nsi b/sm-ssc.nsi index 4655f8e1ba..f0644064db 100644 --- a/sm-ssc.nsi +++ b/sm-ssc.nsi @@ -52,8 +52,16 @@ SetDateSave on ; (can be on to have files restored to their orginal date) ; I think it may need actual admin privs for writing to the registry... -aj - ; RequestExecutionLevel user - ; this folder may not be the best idea for Windows Vista/7. -aj + ;RequestExecutionLevel user + + ;GetVersion::WindowsServicePackMajor + ;Pop $R0 + ;${If} $R0 >= 6 + ; vista & 7 + ;${Else} + ; xp and below + ;${EndIf} + InstallDir "$PROGRAMFILES\${PRODUCT_ID}" InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${PRODUCT_ID}" "" @@ -846,8 +854,37 @@ Section "Uninstall" RMDir "$INSTDIR" ; will delete only if empty SetShellVarContext current - Delete "$DESKTOP\Play StepMania CVS.lnk" - Delete "$DESKTOP\${PRODUCT_DISPLAY}.lnk" + + ; kill shortcuts + !ifdef MAKE_DESKTOP_SHORTCUT + Delete "$DESKTOP\$(TEXT_IO_RUN).lnk" + !endif + !ifdef MAKE_DESKTOP_SHORTCUT + Delete "$DESKTOP\$(TEXT_IO_RUN).lnk" + !endif + + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN).lnk" + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN_WITHOUT_SSE2).lnk" + + !ifdef MAKE_OPEN_PROGRAM_FOLDER_SHORTCUT + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_PROGRAM_FOLDER).lnk" + !endif + !ifdef MAKE_OPEN_SETTINGS_FOLDER_SHORTCUT + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_SETTINGS_FOLDER).lnk" + !endif + + ;Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_VIEW_STATISTICS).lnk" + ;Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TOOLS).lnk" + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_MANUAL).lnk" + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_UNINSTALL).lnk" + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_WEB_SITE).lnk" + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TEXTURE_FONT_GENERATOR).lnk" + !ifdef MAKE_UPDATES_SHORTCUT + Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_CHECK_FOR_UPDATES).lnk" + !endif + Delete "$INSTDIR\${PRODUCT_ID}.lnk" + Delete "$INSTDIR\${PRODUCT_ID} (non-SSE2).lnk" + ; I'm being paranoid here: Delete "$SMPROGRAMS\${PRODUCT_ID}\*.*" RMDir "$SMPROGRAMS\${PRODUCT_ID}" diff --git a/src/Player.cpp b/src/Player.cpp index 01220e9067..77a2b73698 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2965,12 +2965,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now ) if( iCheckpointFrequencyRows > 0 ) { // "the first row after the start of the range that lands on a beat" - int iFirstCheckpointInRange = QuantizeUp(m_iFirstUncrossedRow, - iCheckpointFrequencyRows); + int iFirstCheckpointInRange = ((m_iFirstUncrossedRow+iCheckpointFrequencyRows-1) + /iCheckpointFrequencyRows) * iCheckpointFrequencyRows; // "the last row or first row earlier that lands on a beat" - int iLastCheckpointInRange = QuantizeDown(iLastRowCrossed, - iCheckpointFrequencyRows); + int iLastCheckpointInRange = ((iLastRowCrossed)/iCheckpointFrequencyRows) + * iCheckpointFrequencyRows; for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows ) { @@ -2992,12 +2992,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now ) int iTrack = nIter.Track(); // "the first row after the hold head that lands on a beat" - int iFirstCheckpointOfHold = QuantizeUp(iStartRow, - iCheckpointFrequencyRows); + int iFirstCheckpointOfHold = ((iStartRow+iCheckpointFrequencyRows)/iCheckpointFrequencyRows) + * iCheckpointFrequencyRows; // "the end row or the first earlier row that lands on a beat" - int iLastCheckpointOfHold = QuantizeDown(iEndRow, - iCheckpointFrequencyRows); + int iLastCheckpointOfHold = ((iEndRow)/iCheckpointFrequencyRows) + * iCheckpointFrequencyRows; // count the end of the hold as a checkpoint bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r && r <= iLastCheckpointOfHold; diff --git a/src/ScreenOptionsToggleSongs.cpp b/src/ScreenOptionsToggleSongs.cpp index b5d79a4306..f3b42b6aed 100644 --- a/src/ScreenOptionsToggleSongs.cpp +++ b/src/ScreenOptionsToggleSongs.cpp @@ -11,7 +11,6 @@ // main page (group list) REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongs ); -REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage ); void ScreenOptionsToggleSongs::BeginScreen() { @@ -49,8 +48,7 @@ void ScreenOptionsToggleSongs::ProcessMenuStart( const InputEventPlus &input ) // switch to the subpage with the specified group int iRow = GetCurrentRow(); - OptionRow &row = *m_pRows[iRow]; - if( row.GetRowType() == OptionRow::RowType_Exit ) + if( m_pRows[iRow]->GetRowType() == OptionRow::RowType_Exit ) { ScreenOptions::ProcessMenuStart( input ); return; @@ -70,6 +68,7 @@ void ScreenOptionsToggleSongs::ExportOptions( int row, const vectorm_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size(); } + LOG->Trace("Adding stats to machine profile..."); AddPlayerStatsToProfile( pMachineProfile, *pSS, pn ); if( pPlayerProfile ) + { + LOG->Trace("Adding stats to player profile..."); AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn ); + } CHECKPOINT; } diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj index de9c6271f7..fa58c85a68 100644 --- a/src/StepMania-net2008.vcproj +++ b/src/StepMania-net2008.vcproj @@ -2,7 +2,7 @@ - sm-ssc + StepMania {AF209DBD-24BD-4356-8DFE-41751B221195} StepMania MFCProj diff --git a/src/StepMania.cpp b/src/StepMania.cpp index a3d4af5c6f..955fa1466e 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -1106,7 +1106,7 @@ int main(int argc, char* argv[]) STATSMAN = new StatsManager; // Initialize which courses are ranking courses here. - pLoadingWindow->SetText("Updating cource rankings..."); + pLoadingWindow->SetText("Updating course rankings..."); SONGMAN->UpdateRankingCourses(); SAFE_DELETE( pLoadingWindow ); // destroy this before init'ing Display diff --git a/src/TimingSegments.h b/src/TimingSegments.h index ee594c77ac..09ea2782f1 100644 --- a/src/TimingSegments.h +++ b/src/TimingSegments.h @@ -356,7 +356,7 @@ struct ComboSegment : public TimingSegment * It is best to override the values as soon as possible. */ ComboSegment() : - TimingSegment(-1), combo(1) { } + TimingSegment(-1), combo(1), missCombo(1) { } ComboSegment(const ComboSegment &other) : TimingSegment(other.GetRow()), diff --git a/src/sm-ssc-net2003.sln b/src/sm5-net2003.sln similarity index 100% rename from src/sm-ssc-net2003.sln rename to src/sm5-net2003.sln diff --git a/src/sm-ssc-net2005.sln b/src/sm5-net2005.sln similarity index 100% rename from src/sm-ssc-net2005.sln rename to src/sm5-net2005.sln diff --git a/src/sm-ssc-net2008.sln b/src/sm5-net2008.sln similarity index 100% rename from src/sm-ssc-net2008.sln rename to src/sm5-net2008.sln diff --git a/src/sm-ssc-net2010.sln b/src/sm5-net2010.sln similarity index 100% rename from src/sm-ssc-net2010.sln rename to src/sm5-net2010.sln