More merging.

Themes/_fallback/Scripts/02 Branches.lua

@@ -190,6 +190,8 @@ Branch = {
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
  	AfterSaveSummary = function()
-		return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver"
+		return "ScreenGameOver"
+--		[[ Enable when Finished ]]
+-- 		return GAMESTATE:AnyPlayerHasRankingFeats() and "ScreenNameEntryTraditional" or "ScreenGameOver"
 	end,
 }

Themes/_fallback/metrics.ini

@@ -3175,7 +3175,7 @@ SongOptionsOnCommand=visible,false
 SongOptionsOffCommand=
 #
 DebugX=SCREEN_CENTER_X
-DebugY=SCREEN_BOTTOM-72
+DebugY=SCREEN_BOTTOM-116
 DebugOnCommand=zoom,0.75
 DebugStartOnCommand=stoptweening;diffusealpha,0;linear,1/8;diffusealpha,1
 DebugBackOnCommand=stoptweening;diffusealpha,0;linear,1/8;diffusealpha,1

src/NoteDisplay.cpp

@@ -252,6 +252,7 @@ void NoteDisplay::Load( int iColNum, const PlayerState* pPlayerState, float fYRe
 
 	// "normal" note types
 	m_TapNote.Load(		sButton, "Tap Note" );
+	//m_TapAdd.Load(		sButton, "Tap Addition" );
 	m_TapMine.Load(		sButton, "Tap Mine" );
 	m_TapLift.Load(		sButton, "Tap Lift" );
 	m_TapFake.Load(		sButton, "Tap Fake" );
@@ -744,7 +745,13 @@ void NoteDisplay::DrawTap(const TapNote& tn, int iCol, float fBeat,
 {
 	Actor* pActor = NULL;
 	NotePart part = NotePart_Tap;
-
+	/*
+	if( tn.source == TapNote::addition )
+	{
+		pActor = GetTapActor( m_TapAddition, NotePart_Addition, fBeat );
+		part = NotePart_Addition;
+	}
+	*/
 	if( tn.type == TapNote::lift )
 	{
 		pActor = GetTapActor( m_TapLift, NotePart_Lift, fBeat );