Merge branch 'changes-beta4' of https://github.com/Midiman/stepmania

Themes/_fallback/Scripts/02 Branches.lua

@@ -59,6 +59,13 @@ Branch = {
 			return "ScreenTitleJoin"
 		end
 	end,
+	AfterTitleMenu = function()
+		if PREFSMAN:GetPreference("ShowCaution") then
+			return "ScreenCaution"
+		else
+			return Branch.StartGame()
+		end
+	end,
 	StartGame = function()
 		-- Check to see if there are 0 songs installed. Also make sure to check
 		-- that the additional song count is also 0, because there is
@@ -119,12 +126,12 @@ Branch = {
 		if GAMESTATE:IsEventMode() then
 			return SelectMusicOrCourse()
 		elseif STATSMAN:GetCurStageStats():AllFailed() then
-			return "ScreenGameOver"
+			return "ScreenContinue"
 		elseif GAMESTATE:GetSmallestNumStagesLeftForAnyHumanPlayer() == 0 then
-			if IsCourse() then
+			if not GAMESTATE:IsCourseMode() then
 				return "ScreenEvaluationSummary"
 			else
-				return "ScreenGameOver"
+				return "ScreenContinue"
 			end
 		else
 			return SelectMusicOrCourse()
@@ -215,8 +222,19 @@ Branch = {
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
  	AfterSaveSummary = function()
-		return "ScreenGameOver"
+		return "ScreenContinue"
 --		[[ Enable when Finished ]]
 -- 		return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver"
 	end,
+	AfterContinue = function()
+		if GAMESTATE:GetNumPlayersEnabled() == 0 then
+			return "ScreenGameOver"
+		end
+
+		if STATSMAN:GetStagesPlayed() == 0 then
+			return "ScreenSelectPlayMode"
+		end
+
+		return "ScreenProfileLoad"
+	end
 }

Themes/_fallback/Scripts/02 Colors.lua

@@ -12,7 +12,7 @@ Color = {
 	Yellow		=	color("#fff200"),
 	Orange		=	color("#f7941d"),
 	Purple		=	color("#92278f"),
-	Outline		=	color("0,0,0,0.5"),
+	Outline		=	color("0,0,0,0.675"),
 	Invisible	=	color("1,1,1,0"),
 	Stealth		=	color("0,0,0,0"),
 -- Android Design Stencil Colors
@@ -402,4 +402,4 @@ function Alpha(color,percent)
 	end;
 	c.Alpha = percent;
 	return HSVToColor(c);
-end;
+end;

Themes/_fallback/Scripts/03 Gameplay.lua

@@ -153,6 +153,10 @@ function FailCombo()
 	return ComboThresholds["default"].Fail
 end
 
+function TwoPartSelection()
+	return GAMESTATE:GetCurrentGame():GetName() == "pump" and true or false 
+end 
+
 local RoutineSkins = {
 	dance	= { P1 = "midi-routine-p1", P2 = "midi-routine-p2" },
 	pump	= { P1 = "cmd-routine-p1", P2 = "cmd-routine-p2" },