merger

Docs/Changelog_sm5.txt

@@ -4,9 +4,19 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
+2012/05/17
+----------
+* [LoadingWindow_Gtk] Actually resolve the path to the Splash file. [djpohly]
+
+2012/05/16
+----------
+* [ScreenWithMenuElements] Added DelayMusicSeconds metric. [AJ]
+* [ScreenOptionsMasterPrefs] Allow for FastLoadAdditionalSongs preference
+  to be called via the "conf" command. [AJ]
+
 2012/05/14
 ----------
-* [Course] Added AllSongsAreFixed() Lua binding.
+* [Course] Added AllSongsAreFixed() Lua binding. [AJ]
 
 ================================================================================
 StepMania 5.0 alpha 2 | 20120504

Docs/credits.txt

@@ -141,6 +141,9 @@ Deamon007
 cvpcs
  * Updated ffmpeg support to v0.10
 
+djpohly
+ * Various patches/fixes
+
 ==the beta testers==
 [SSC Beta Testing Team]
 KeithD

Themes/_fallback/Languages/en.ini

@@ -378,6 +378,7 @@ EventMode=When set to &oq;ON&cq;, and you can continue playing forever.  Failing
 Exit=
 Fail=Fail
 FastLoad=If enabled, don't check songs for changes on load.
+FastLoadAdditionalSongs=If enabled, don't check songs for changes to Additional Songs on load.
 Fill Machine Stats=
 Game=Change the current game type with this option.
 GetRankingName=Determines if name entry should never be shown, always be shown, or shown when the course is listed on the high scores screen.
@@ -916,6 +917,7 @@ Exit=Exit
 Fail=Fail
 Fakes=Fakes
 FastLoad=Fast\nLoad
+FastLoadAdditionalSongs=Fast Load\nAdditional Songs
 File1 Global BGAnimation=File1 Global BGAnimation
 File1 Global Movie=File1 Global Movie
 File1 Global Movie (Group + Genre)=File1 Global Movie (Group + Genre)

Themes/_fallback/metrics.ini

@@ -1578,6 +1578,7 @@ TimerSeconds=-1
 FirstUpdateCommand=
 PlayMusic=true
 MusicAlignBeat=true
+DelayMusicSeconds=0
 StopMusicOnBack=false
 WaitForChildrenBeforeTweeningOut=false
 CancelTransitionsOut=false
@@ -2887,7 +2888,7 @@ Line20="conf,VisualDelaySeconds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="Score,3,4,8,11,13,14,15,16,28,29,30"
+LineNames="Score,3,4,8,11,13,14,15,16,28,29,30,31"
 LineScore="lua,UserPrefScoringMode()"
 Line3="conf,TimingWindowScale"
 Line4="conf,LifeDifficulty"
@@ -2900,6 +2901,7 @@ Line16="conf,UseUnlockSystem"
 Line28="conf,AutogenSteps"
 Line29="conf,AutogenGroupCourses"
 Line30="conf,FastLoad"
+Line31="conf,FastLoadAdditionalSongs"
 
 # unused options
 #Line2="conf,ScoringType"

Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua

@@ -6,25 +6,34 @@ local t = Def.ActorFrame {};
 t[#t+1] = Def.ActorFrame {
 	LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",64,12);
 	LoadFont("Common Normal") .. {
-		InitCommand=cmd(y,-1;shadowlength,1;playcommand,"Set");
-        SetCommand=function(self)
-          if GAMESTATE:GetCurrentCourse() then
-            self:settext( GAMESTATE:GetCurrentStageIndex()+1 .. " / " .. GAMESTATE:GetCurrentCourse():GetEstimatedNumStages() );
-          elseif GAMESTATE:IsEventMode() then
-            self:settextf("Stage %s", curStageIndex+1);
-          else
-            if THEME:GetMetric(curScreen,"StageDisplayUseShortString") then
-              self:settextf("%s", ToEnumShortString(curStage));
-              self:zoom(0.75);
-            else
-              self:settextf("%s Stage", ToEnumShortString(curStage));
-              self:zoom(1);
-            end;
-          end;
-          -- StepMania is being stupid so we have to do this here;
-          self:diffuse(StageToColor(curStage));
-          self:diffusetopedge(ColorLightTone(StageToColor(curStage)));
-        end;
+		InitCommand=cmd(y,-1;shadowlength,1;);
+		BeginCommand=function(self)
+			local top = SCREENMAN:GetTopScreen()
+			if top then
+				if not string.find(top:GetName(),"ScreenEvaluation") then
+					curStageIndex = curStageIndex + 1
+				end
+			end
+			self:playcommand("Set")
+		end;
+		SetCommand=function(self)
+			if GAMESTATE:GetCurrentCourse() then
+				self:settext( curStageIndex+1 .. " / " .. GAMESTATE:GetCurrentCourse():GetEstimatedNumStages() );
+			elseif GAMESTATE:IsEventMode() then
+				self:settextf("Stage %s", curStageIndex);
+			else
+				if THEME:GetMetric(curScreen,"StageDisplayUseShortString") then
+				  self:settextf("%s", ToEnumShortString(curStage));
+				  self:zoom(0.75);
+				else
+				  self:settextf("%s Stage", ToEnumShortString(curStage));
+				  self:zoom(1);
+				end;
+			end;
+			-- StepMania is being stupid so we have to do this here;
+			self:diffuse(StageToColor(curStage));
+			self:diffusetopedge(ColorLightTone(StageToColor(curStage)));
+		end;
 	};
 };
 return t

src/ScreenOptionsMasterPrefs.cpp

@@ -678,6 +678,7 @@ static void InitializeConfOptions()
 
 	ADD( ConfOption( "AutogenGroupCourses",		MovePref<bool>,		"Off","On" ) );
 	ADD( ConfOption( "FastLoad",			MovePref<bool>,		"Off","On" ) );
+	ADD( ConfOption( "FastLoadAdditionalSongs",			MovePref<bool>,		"Off","On" ) );
 
 	// Background options
 	ADD( ConfOption( "RandomBackgroundMode",	MovePref<RandomBackgroundMode>, "Off","Animations","Random Movies" ) );

src/ScreenWithMenuElements.cpp

@@ -31,6 +31,7 @@ void ScreenWithMenuElements::Init()
 {
 	PLAY_MUSIC.Load( m_sName, "PlayMusic" );
 	MUSIC_ALIGN_BEAT.Load( m_sName, "MusicAlignBeat" );
+	DELAY_MUSIC_SECONDS.Load( m_sName, "DelayMusicSeconds" );
 	CANCEL_TRANSITIONS_OUT.Load( m_sName, "CancelTransitionsOut" );
 	TIMER_SECONDS.Load( m_sName, "TimerSeconds" );
 	TIMER_METRICS_GROUP.Load( m_sName, "TimerMetricsGroup" );
@@ -217,7 +218,11 @@ void ScreenWithMenuElements::StartPlayingMusic()
 					{
 						pmp.sFile = sMusicPathFromLua;
 						pmp.bAlignBeat = MUSIC_ALIGN_BEAT;
+
 						// TODO: load other params into pmp here -aj
+						if( DELAY_MUSIC_SECONDS > 0.0f )
+							pmp.fStartSecond = -DELAY_MUSIC_SECONDS;
+
 						SOUND->PlayMusic( pmp );
 					}
 					else
@@ -238,6 +243,10 @@ void ScreenWithMenuElements::StartPlayingMusic()
 		{
 			pmp.sFile = m_sPathToMusic;
 			pmp.bAlignBeat = MUSIC_ALIGN_BEAT;
+
+			if( DELAY_MUSIC_SECONDS > 0.0f )
+				pmp.fStartSecond = -DELAY_MUSIC_SECONDS;
+
 			SOUND->PlayMusic( pmp );
 		}
 	}

src/ScreenWithMenuElements.h

@@ -49,6 +49,7 @@ protected:
 
 	ThemeMetric<bool>		PLAY_MUSIC;
 	ThemeMetric<bool>		MUSIC_ALIGN_BEAT;
+	ThemeMetric<float>		DELAY_MUSIC_SECONDS;
 	ThemeMetric<bool>		CANCEL_TRANSITIONS_OUT;
 	ThemeMetric<float>		TIMER_SECONDS;
 	ThemeMetric<RString>	TIMER_METRICS_GROUP;

src/arch/LoadingWindow/LoadingWindow_Gtk.cpp

@@ -92,7 +92,7 @@ void LoadingWindow_Gtk::SetIcon( const RageSurface *pIcon )
 
 void LoadingWindow_Gtk::SetSplash( const RString str )
 {
-	Module_SetSplash( str );
+	Module_SetSplash( FILEMAN->ResolvePath(str) );
 }
 
 void LoadingWindow_Gtk::SetProgress( const int progress )