diff --git a/stepmania/README-FIRST.TXT b/stepmania/README-FIRST.TXT index 3269d3659e..3247f846f2 100644 --- a/stepmania/README-FIRST.TXT +++ b/stepmania/README-FIRST.TXT @@ -1055,6 +1055,38 @@ creates your home directory and is required for things to start working. * Done! Enjoy staying on the bleeding edge of StepMania releases!  +* Optional: Create the SSH keypair for painless access to CVS server via SSH. + +Open a command prompt and enter this to create a new key pair: + +ssh-keygen -C -f identity + + is an identifier placed in the public key. I used my email address. +Just press enter when it asks you for a passphrase. You don't want a +passphrase. BTW, without the -C option the program will fail and you won't get +a new key pair. I couldn't use any other ssh-keygen utility except for this +one. Any other (SecureCRT, or the linux server) and ssh.exe wouldn't read it. + +Next, on your user account page at SourceForge, you should find a box to enter +your SSH public key. Copy the entire contents of the identity.pub file +(located in your .ssh directory) into the text entry box on the page -- be +sure not to add any line breaks or it will not work. After a 6 hour wait, you +should be able to use CVS with SSH without using your password. + +(Meanwhile) Create a new file called ssh.bat in your WinCVS directory with +notepad (or whatever editor) and dump these contents into it: + +@echo off +rem echo %0 %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt +ssh.exe -C -l %3 -i c:\ssh\.ssh\identity %1 %4 + +Edit paths as appropriate. Use of the .bat file is mainly for the ability to +manipulate the command line that ssh gets. These options aren't in WinCVS yet. +On the Ports tab of WinCvs preferences, select 'Check for an alternate RSH +name' and put "ssh.bat" into the editbox. + +WinCVS will create a new console window in your taskbar when running ssh.bat, +but you won't ever see any output as it's redirected. ************************************************************ 22. Thanks diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 519856cd52..82a3df0434 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -27,8 +27,8 @@ DefaultScrollDirection=0 [ScreenTitleMenu] ChoicesX=320 -ChoicesStartY=54 -ChoicesSpacingY=42 +ChoicesStartY=74 +ChoicesSpacingY=48 ChoicesShadowLength=5 HelpX=320 HelpY=440 @@ -461,9 +461,9 @@ HelpText=&UP; &DOWN; change line &LEFT; &RIGHT; change value START to con StatsX=632 StatsY=10 CreditsP1X=120 -CreditsP1Y=472 +CreditsP1Y=470 CreditsP2X=520 -CreditsP2Y=472 +CreditsP2Y=470 CreditsColor=1,1,1,1 CreditsShadowLength=0 CreditsZoom=1.0 @@ -768,7 +768,7 @@ NextScreen=ScreenRanking [ScreenRanking] SecondsToShow=0 // ignored in favor of SecsBetweenPages below -NextScreen=ScreenMemoryCard +NextScreen=ScreenWarning CategoryX=520 CategoryY=32 TypeX=520 @@ -800,7 +800,7 @@ NextScreen=ScreenCompany [ScreenCompany] SecondsToShow=5 -NextScreen=ScreenAlbums +NextScreen=ScreenLogo [ScreenAlbums] SecondsToShow=10 @@ -818,7 +818,7 @@ NextScreen=ScreenDemonstration [ScreenDemonstration] SecondsToShow=30 -NextScreen=ScreenHowToPlay +NextScreen=ScreenRanking [ScreenHowToPlay] SecondsToShow=30 diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 72963b4bce..ba67acb4e0 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -37,7 +37,7 @@ PrefsManager::PrefsManager() m_iDisplayWidth = 640; m_iDisplayHeight = 480; m_iDisplayColorDepth = 16; - m_iTextureColorDepth = 32; + m_iTextureColorDepth = 16; // default to 16 for better preformance on slower cards m_iMaxTextureResolution = 2048; m_iRefreshRate = REFRESH_DEFAULT; m_bIgnoreJoyAxes = false; // when did this get changed to ON by default? diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp index aa529143f5..568ed75658 100644 --- a/stepmania/src/ScreenDemonstration.cpp +++ b/stepmania/src/ScreenDemonstration.cpp @@ -153,6 +153,8 @@ ScreenDemonstration::ScreenDemonstration() : ScreenGameplay(SetUpSongOptions()) m_sprDemonstrationBlink.SetEffectBlinking(); this->AddChild( &m_sprDemonstrationBlink ); + this->MoveToTail( &m_Fade ); + m_Fade.OpenWipingRight(); ClearMessageQueue(); // remove all of the messages set in ScreenGameplay that animate "ready", "here we go", etc. diff --git a/stepmania/src/ScreenManager.cpp b/stepmania/src/ScreenManager.cpp index e8a6c11084..4c33ee275f 100644 --- a/stepmania/src/ScreenManager.cpp +++ b/stepmania/src/ScreenManager.cpp @@ -382,7 +382,7 @@ void ScreenManager::RefreshCreditsMessages() m_textCreditInfo[p].SetXY( CREDITS_X(p), CREDITS_Y(p) ); m_textCreditInfo[p].SetZoom( CREDITS_ZOOM ); m_textCreditInfo[p].SetDiffuse( CREDITS_COLOR ); -// m_textCreditInfo[p].SetShadowLength( CREDITS_SHADOW_LENGTH ); + m_textCreditInfo[p].SetShadowLength( CREDITS_SHADOW_LENGTH ); switch( PREFSMAN->m_CoinMode ) { diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 96df78eaf9..e202255d68 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -86,7 +86,9 @@ static void ChangeToDirOfExecutable(const char *argv0) void ApplyGraphicOptions() { - bool ReloadTextures = DISPLAY->SetVideoMode( + bool bNeedReload = false; + + bNeedReload |= DISPLAY->SetVideoMode( PREFSMAN->m_bWindowed, PREFSMAN->m_iDisplayWidth, PREFSMAN->m_iDisplayHeight, @@ -94,12 +96,12 @@ void ApplyGraphicOptions() PREFSMAN->m_iRefreshRate, PREFSMAN->m_bVsync ); - bool bTexturesInvalidated = TEXTUREMAN->SetPrefs( + bNeedReload |= TEXTUREMAN->SetPrefs( PREFSMAN->m_iTextureColorDepth, PREFSMAN->m_iUnloadTextureDelaySeconds, PREFSMAN->m_iMaxTextureResolution ); - if( bTexturesInvalidated ) + if( bNeedReload ) TEXTUREMAN->ReloadAll(); } diff --git a/stepmania/src/Transition.cpp b/stepmania/src/Transition.cpp index 3e9cdf72ef..407d4a9b7d 100644 --- a/stepmania/src/Transition.cpp +++ b/stepmania/src/Transition.cpp @@ -36,8 +36,6 @@ void Transition::Update( float fDeltaTime ) case opening_left: case closing_right: case closing_left: - m_fPercentThroughTransition += fDeltaTime/m_fTransitionTime; - if( m_fPercentThroughTransition > 1.0f ) // the wipe is over { m_fPercentThroughTransition = 0.0; @@ -54,8 +52,10 @@ void Transition::Update( float fDeltaTime ) } SCREENMAN->SendMessageToTopScreen( m_MessageToSendWhenDone, 0 ); - } + + m_fPercentThroughTransition += fDeltaTime/m_fTransitionTime; + break; } }