From 785a9f93a5a0b33290dc863911a28006b9b60a7d Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 00:45:25 -0500
Subject: [PATCH 01/17] small todo comment

---
 src/ScreenGameplay.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 6da6822807..ef55cd02c7 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -1681,6 +1681,7 @@ void ScreenGameplay::Update( float fDeltaTime )
 		{
 			m_pSoundMusic->StopPlaying();
 			SCREENMAN->PostMessageToTopScreen( SM_NotesEnded, 0 );
+			// todo: stop lyrics (m_LyricDisplay) from animating -aj
 		}
 
 		// Update living players' alive time

From 17d2423ee4e349200d1310efe148958c48f64315 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 00:45:52 -0500
Subject: [PATCH 02/17] more reverting of the case checking stuff

---
 src/InputMapper.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/InputMapper.cpp b/src/InputMapper.cpp
index 6707cf8408..90e65ae879 100644
--- a/src/InputMapper.cpp
+++ b/src/InputMapper.cpp
@@ -948,7 +948,7 @@ MultiPlayer InputMapper::InputDeviceToMultiPlayer( InputDevice id )
 GameButton InputScheme::ButtonNameToIndex( const RString &sButtonName ) const
 {
 	for( GameButton gb=(GameButton) 0; gb<m_iButtonsPerController; gb=(GameButton)(gb+1) ) 
-		if( sButtonName.EqualsNoCase(GetGameButtonName(gb)) )
+		if( stricmp(GetGameButtonName(gb), sButtonName) == 0 )
 			return gb;
 
 	return GameButton_Invalid;

From dcd086398b882214a29d6659ff623a723b2c7c3b Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 00:46:21 -0500
Subject: [PATCH 03/17] show two different BPMDisplays if two players are
 playing songs with differing timing

---
 .../Graphics/ScreenGameplay BPMDisplay.lua    | 61 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua b/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua
index 4b927fb10a..2b242dd9fb 100644
--- a/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua	
+++ b/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua	
@@ -1,4 +1,7 @@
-return Def.SongBPMDisplay {
+-- check if players are playing steps with different timingdata.
+local numPlayers = GAMESTATE:GetNumPlayersEnabled()
+
+local displaySingle = Def.SongBPMDisplay {
 	File=THEME:GetPathF("BPMDisplay", "bpm");
 	Name="BPMDisplay";
 	InitCommand=cmd(zoom,0.675;shadowlength,1);
@@ -6,3 +9,59 @@ return Def.SongBPMDisplay {
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
 	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
 };
+
+if numPlayers == 1 then
+	return displaySingle
+else
+	-- check if both players are playing the same steps
+	local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
+	local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
+
+	local stP1 = stepsP1:GetStepsType()
+	local stP2 = stepsP2:GetStepsType()
+
+	local diffP1 = stepsP1:GetDifficulty()
+	local diffP2 = stepsP2:GetDifficulty()
+
+	if stP1 == stP2 and diffP1 == diffP2 then
+		-- both players are using the same steps; only need one.
+		return displaySingle
+	end
+
+	-- otherwise, we have some more work to do.
+	local timingP1 = stepsP1:GetTimingData()
+	local timingP2 = stepsP2:GetTimingData()
+
+	local function UpdateBPM(self)
+		local dispP1 = self:GetChild("DisplayP1")
+		local dispP2 = self:GetChild("DisplayP2")
+
+		-- needs current bpm for p1 and p2
+		for pn in ivalues(PlayerNumber) do
+			local bpmDisplay = (pn == PLAYER_1) and dispP1 or dispP2
+			local pState = GAMESTATE:GetPlayerState(pn);
+			local songPosition = pState:GetSongPosition()
+			local bpm = songPosition:GetCurBPS() * 60
+			bpmDisplay:settext( string.format("%.2f",bpm) )
+		end
+	end
+
+	local displayTwoPlayers = Def.ActorFrame{
+		-- manual bpm displays
+		LoadFont("BPMDisplay", "bpm")..{
+			Name="DisplayP1";
+			InitCommand=cmd(x,-32;zoom,0.625;shadowlength,1);
+		};
+		LoadFont("BPMDisplay", "bpm")..{
+			Name="DisplayP2";
+			InitCommand=cmd(x,32;zoom,0.625;shadowlength,1);
+		};
+	};
+
+	displayTwoPlayers.InitCommand=cmd(SetUpdateFunction,UpdateBPM);
+
+	return displayTwoPlayers
+end
+
+-- should not get here
+-- return Def.ActorFrame{}
\ No newline at end of file

From 97a137558698956e3d3b6d07c51d26b754540b02 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 5 Jun 2011 02:13:38 -0400
Subject: [PATCH 04/17] Congrats Thai: you've been promoted.

---
 Themes/default/BGAnimations/ScreenCredits overlay.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenCredits overlay.lua b/Themes/default/BGAnimations/ScreenCredits overlay.lua
index 6221e2c695..6c06c5b06a 100644
--- a/Themes/default/BGAnimations/ScreenCredits overlay.lua	
+++ b/Themes/default/BGAnimations/ScreenCredits overlay.lua	
@@ -25,7 +25,8 @@ local ssc = {
 }
 
 local sm_ssc = {
-	"Jason Felds (wolfman2000)",
+	"Jason Felds (wolfman2000)", -- Timing Segments, Split Timing, optimization
+	"Thai Pangsakulyanont (theDtTvB)", -- BMS, Split Timing, optimization
 	"Alberto Ramos (Daisuke Master)",
 	"Jack Walstrom (FSX)",
 }
@@ -49,7 +50,6 @@ local contrib = {
 	"Kaox", -- pump/default noteskin
 	"NitroX72", -- pump/frame noteskin
 	"sy567", -- beginner helper fix
-	"Thai Pangsakulyanont (theDtTvB)", -- BMS, Split Timing, optimization
 	"v1toko", -- x-mode from StepNXA
 }
 

From 40c1cff88871daab8530b3c38a95eb2d3488d9b3 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 5 Jun 2011 02:25:11 -0400
Subject: [PATCH 05/17] May want to use this name all over.

---
 Xcode/stepmania.xcodeproj/project.pbxproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj
index 83b2d2a8b7..7b7226efd3 100644
--- a/Xcode/stepmania.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania.xcodeproj/project.pbxproj
@@ -7373,7 +7373,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
-				PRODUCT_NAME = png;
+				PRODUCT_NAME = "png-1.5.1sm0.1";
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Native;
@@ -7416,7 +7416,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
-				PRODUCT_NAME = png;
+				PRODUCT_NAME = "png-1.5.1sm0.1";
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = PerformanceDebug;
@@ -7459,7 +7459,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				OTHER_LDFLAGS = "";
 				PREBINDING = NO;
-				PRODUCT_NAME = png;
+				PRODUCT_NAME = "png-1.5.1sm0.1";
 				USER_HEADER_SEARCH_PATHS = "";
 			};
 			name = Universal;

From 0326b54c22f1fe0b84e86595c7340b96a5e2a1b2 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 01:26:00 -0500
Subject: [PATCH 06/17] turns out IE8 doesn't like when class names start with
 a '_' character.

---
 Docs/Luadoc/Lua.xsl | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/Docs/Luadoc/Lua.xsl b/Docs/Luadoc/Lua.xsl
index bf0562f25c..2861185f63 100644
--- a/Docs/Luadoc/Lua.xsl
+++ b/Docs/Luadoc/Lua.xsl
@@ -78,13 +78,13 @@
 				margin: 1px 2px 1px 2px;
 				border: 1px solid #777;
 			}
-			._fallbackTheme{
+			.fallbackTheme{
 				text-align: justify;
 				vertical-align: text-top;
 				background: #DDFFEE url(./bgline.png) repeat-x scroll 0 0;
 				padding: 1px;
 			}
-			fieldset div._fallbackTheme{
+			fieldset div.fallbackTheme{
 				margin: 1px 2px 1px 2px;
 				border: 1px solid #777;
 			}
@@ -235,7 +235,7 @@
 		<legend>Function Colors</legend>
 		<div class="descriptionCell">Available in sm-ssc and StepMania 5</div>
 		<div class="renamed">Renamed or changed from StepMania 4 alphas</div>
-		<div class="_fallbackTheme">Defined in the _fallback theme</div>
+		<div class="fallbackTheme">Defined in the _fallback theme</div>
 		<div class="defaultTheme">Defined in the default theme</div>
 		</fieldset>
 	</div>
@@ -476,21 +476,13 @@
 				<xsl:choose>
 					<!-- "renamed" also covers functions with modified behavior -->
 					<xsl:when test="$elmt/@renamed='true'">renamed</xsl:when>
-					<xsl:when test="$elmt/@theme='_fallback'">_fallbackTheme</xsl:when>
+					<xsl:when test="$elmt/@theme='_fallback'">fallbackTheme</xsl:when>
 					<xsl:when test="$elmt/@theme='default'">defaultTheme</xsl:when>
 					<xsl:otherwise>descriptionCell</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
 			<span class="descriptionName">
-				<xsl:choose>
-					<!-- make commands in certain sections link to the SMTheming
-						 wiki article for said command: -->
-					<xsl:when test="string($class)='Actor'"><a href="http://kki.ajworld.net/wiki/Commands:{@name}" title="'{@name}' on the SMTheming Wiki"><xsl:value-of select="@name" /></a></xsl:when>
-					<xsl:when test="string($class)='ActorFrame'"><a href="http://kki.ajworld.net/wiki/Commands:{@name}" title="'{@name}' on the SMTheming Wiki"><xsl:value-of select="@name" /></a></xsl:when>
-					<xsl:when test="string($class)='Sprite'"><a href="http://kki.ajworld.net/wiki/Commands:{@name}" title="'{@name}' on the SMTheming Wiki"><xsl:value-of select="@name" /></a></xsl:when>
-					<!-- and don't handle wiki links for anything else -->
-					<xsl:otherwise><xsl:value-of select="@name" /></xsl:otherwise>
-				</xsl:choose>
+				<xsl:value-of select="@name" />
 			</span>
 			<span class="descriptionArguments">
 				<xsl:text>( </xsl:text>
@@ -511,9 +503,7 @@
 			<td class="returnTypeCell" />
 			<td>
 			<xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:otherwise>descriptionCell</xsl:otherwise>
-				</xsl:choose>
+				descriptionCell
 			</xsl:attribute>
 				<span class="descriptionName"><xsl:value-of select="@name" /></span>
 			</td>

From cf8e6cd7ab72158c313ea53a3f039d156658f219 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 01:27:40 -0500
Subject: [PATCH 07/17] change product/update URL back to stepmania.com

---
 Installer/{custom-ssc.bmp => custom-sm5.bmp}   | Bin
 Installer/{header-ssc.bmp => header-sm5.bmp}   | Bin
 Installer/{welcome-ssc.bmp => welcome-sm5.bmp} | Bin
 src/ProductInfo.inc                            |   4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename Installer/{custom-ssc.bmp => custom-sm5.bmp} (100%)
 rename Installer/{header-ssc.bmp => header-sm5.bmp} (100%)
 rename Installer/{welcome-ssc.bmp => welcome-sm5.bmp} (100%)

diff --git a/Installer/custom-ssc.bmp b/Installer/custom-sm5.bmp
similarity index 100%
rename from Installer/custom-ssc.bmp
rename to Installer/custom-sm5.bmp
diff --git a/Installer/header-ssc.bmp b/Installer/header-sm5.bmp
similarity index 100%
rename from Installer/header-ssc.bmp
rename to Installer/header-sm5.bmp
diff --git a/Installer/welcome-ssc.bmp b/Installer/welcome-sm5.bmp
similarity index 100%
rename from Installer/welcome-ssc.bmp
rename to Installer/welcome-sm5.bmp
diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc
index d08ad19e51..56c9ce457d 100644
--- a/src/ProductInfo.inc
+++ b/src/ProductInfo.inc
@@ -9,8 +9,8 @@
 !define PRODUCT_DISPLAY "${PRODUCT_ID} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "ssc"
 
-!define PRODUCT_URL "http://code.google.com/p/sm-ssc/"
-!define UPDATES_URL "http://code.google.com/p/sm-ssc/"
+!define PRODUCT_URL "http://www.stepmania.com/"
+!define UPDATES_URL "http://www.stepmania.com/"
 
 ;!define INSTALL_EXTERNAL_PCKS
 ;!define INSTALL_INTERNAL_PCKS

From 22b5244b6e7243f2f7719d402227855a4d63f031 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 01:34:00 -0500
Subject: [PATCH 08/17] change common window icon in default theme

---
 .../default/Graphics/Common window icon.png   | Bin 1158 -> 1319 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Themes/default/Graphics/Common window icon.png b/Themes/default/Graphics/Common window icon.png
index 23750444acb74d22c020d4293ac6cc68bb889282..4a68593c5da0c1c0c4662eae6e4b49e34b07b2cd 100644
GIT binary patch
delta 1311
zcmV+)1>pLI38xB>8Gi-<0047(dh`GQ1nx;hK~#9!y_XA2TU8v!&$)fAE%X7jP_QfD
zP?(Ovgv6N4VYVeR%O)snP8a7gV8}KzCvj$3bORkMF4MSyZc}4od_*Rl(*YAF7)?wZ
z7%|Em>>?tQ#~sg7+TQl|`agYHUTYgVzT`{qZBNhlyXV|<a)169&DK)zdaxcWLE(`N
z+y`y~|Ly++_Pf@AkAQRT(?p`w=tyyx!d?1v*u?(9n8;-_xB@)r4?x0eABa=Np3BS9
zXQb)mXo(16iV90O&+{+_4%FUp(_C2B+S@iTeha=XAP`=FQxLwcW%t^Yh{PBHqVNLZ
zZX+j;Ci_OXoPX-3PJkdIv4<oX!1b-W))-bjxJ-`kRJd<A5Nf;HZO%IL9eEcvleFSY
ztz!Sr`_`ukVeS`0+=K;XooMLzb!ei70953s#BKZR+0}Oo6w*Zja9ZtX>)B@deAhrN
z0XVcyAGM=?=fn4il(NMEU>)em55A{sy9SK}U~Pm*@PF2g!kpAtL$omHPB<rY#385M
zZJyjaIM<6tMDD%qD1m1+!TW_VcCCt?jla?7=^+<@0DNWt3Vm|bqv?8yeD>Z$y5wLP
zIl!FF4xe@ib1rBUidwGGU;M=wy|4UZaB-|MJ2`q!cCuEckYchL>@ZjC6brT?-t%PP
zQt^-1>3_POTSosiS4hCJq9YWK8)DQcN~vVN(1)}Ng^0on+NDZ<x<MOzhmA8AJ=y<D
z!K;ybcbqm8(Aa!D!*JL3B#m~VBT#y^o4(LDVhncIDS?K2D_7_>Pa9$u98R?Nmmd1d
ze@BA?C?V}DmnUep>7&9DPV{_xFMV-fJRpE8{D1X(b(*d5>ac|qz0lD|e>FI9TL4#h
z#j;rKmN=y**p7qMf$RPBCB`%_fGhlHqDEVwRfIj9sEi(@>xU=j1aO7F3iF*G6B%+i
z2iu&0Y<B_lQV&Bnj84r0aEHgMw0Y`?ki+Z7%uJG4D9Myb6oJ~l+&4@&j$5VyJOM60
z9Dl3O<SAt#ha1N&%xi<=z3=IxQZl9DfB=X3$LPx@s}CRoTwkP;B^RmX3898xn6xs-
z7!x_;3D4?O@fk}*0RavVP0-(%Z9ae<F%&K{>Qu{xIJ7PHqS?k&j+#mM`{0syHIcfN
zlE473j7-u^Q>+i*^d_lj<3Xh?F_iGHEq^RiHEto{XTayc?KM$yUAkBp5a7tz6#cE$
z?gRK}yHxZ@u}l*5@L#gpnd4^L5L~_ku14+}qWzRYs#_@%1Ozy0veH*rhY#T729Y55
zpiG<;On5!(VBWCU{lkgKVdnRfa!FjKkWvQfqkM{`o9$e!7a&)KQN<@xNty(^4u2@~
zs=>iACv1+H;a>f)Pb^Hy6$xSk0X%16uXQ^4YA*n(f|?41RARA^S~}mK8abXhY3GLc
zxx<O7QZe5AwnUJMr&nFm)a~TWyIIb6Eca>^_~U#E%buZdf&~3P5^&PvKX>x|A3FI_
zxUKPcE)n?4B@|ZWQ8;d{22dn&Wq+KrtCM$?Xr(hL)4``z2&uCXlB+Qmjq$v_4Gtp1
z2#tD%{nG%Wy9;~(>aNJAFpih{JxDk7^Cr*#(}fV3!Y#<JH1ijEn>T{jfPn>(in0}4
z2c8Htw;pW*zX<aheLqYuKu|XkVtd@bwSddfjN<f8NZ@&hEacv4fx%UtcNqIO`VW?t
V(IB%;t$qLi002ovPDHLkV1gYxhPnU%

delta 1148
zcmV-?1cUph3Wf=g8Gi!+002a!ipBr{0x?ibR7L;){{R30gVFy0002au?EnA(K$P5r
z(f@<d|ANr}g3$kf&i-Vf#dp8#NTKdRl-fq1?k8A;0000*pY1YptS4HA0000*pY6Eh
z|CZSQvEu)o+W(o^|Fz@)q}~6j-~X=R|HbP6!s!28ukviQ@_$XF?pUht-SYp}@c+x~
z|G($|#_Ioq#P^`v|EJ#nui^i;<p0v{|H<qBgVF!6-~O`W|4yXt#OeQ?+yBh#|Jm{X
zVYT(Q<o{{A_i(}bd&>QJ$^4w!|52y!b;bLC&Hm2q|8BqeOQi2>z4%nC^49SGvf}@D
z$NZky{nYRO(0}d!ipTePz4XxT|4gIqS+DcW?EhY~^-!nqh0_1D<NtHR`ewQJW4HEW
zvh$zV{Ys+mSFQ59<^PA$|Gnn_t>FKC%>7NJ@Za<QwBr9#sqtK~^vmo2tl<Avsqb8^
z@s!j3zUTjn)Bl#z`;FB9uHOE^=>L_``=i|dX|wWIsekW_%=&b_^^wy3V6gI&&-%0D
z|75Z9OQY_D!}W;L|E=Bqd%^dA!}pWZ{d2qYUas+Xy!6QG|EJvkv*G@q+yArQ{bsWA
zmCg97*!pU;@=v7hqt*Jn=KoTs?~cg#x#j<$()p3m`>5Uio7MZr=>BlH^RnUoqtyA4
z&H1|H{(o`0^kT2^!Q}l~tnqol_omzZyXOCFw)3am{-@Xakk$W%(f??(@}}MYeZKVW
z`TwZi|IF<Flh*&E+y0o&_<6teRH*MvOkUss000+sQchC<zW`qVulZofegNmA`Q-R}
z-mL(x-(C`|AC3S30qsddK~#8Nh00TRWKj@?;eXxT(b)4HqHV>tZQIV!wr$%se%(|u
zx7ll+o2pv%vi~#3CnRws#GB2GEs;H6IXv?6rHm~bbC-NyREc|Rg@v(Vcg7S)hPybH
zv60L~uFMe=V|gAwmnV;c{K_=0%6tl{YqxXNR#Q+E-NY3wqM)<!4Oe3)1-UJPkbKGs
z1b+k}@CP^~&>ffskSw(1Qcyajs<Uu8u3cAuBh}%$rK;QL?QpoV)u~bn$`hsgzyoje
zk>tc<Z{1T#dWPpOyxuxVN-U=!$8Wp_P8fz{xbXHJ4Fh<8(3t1Xp`a^G4}Srgj_dkm
z0DFJxTYwIIL0T6D-L_E3_iH!sDwKWYDu1v)bN~qbW9z0M%cp5t$JrxrYFgNK2e^9=
z*rP4*Wl_*N6b#M<gHMn;Kh6O=cJ9JUTFFo=1(O5vJ`~!UP%qy+Y%j#8&+@TUz-}*;
z<$*~Gng!+LLnltxhm|ukm}xk#C>Jg^%m9}ZMQEm=KOz=HY}OmoqL|{d`cf286m<(|
zv)&fPNIwM?<3G5@D=3(#`oL8+K|x!1D_6LUg3;m4T*IRjluaMynl7WDPapiqF{t-Z
zu(Bq-J!w(x={2h;Sl!e6jia|`&05CRt&amo+y>J|#$sYDu_lgKOUz$7DnR?xywAD-
O0000<MNUMnLSTX`54W=b


From bd42f04f7408f4ef3b850814da42e15cb6caa024 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 01:35:12 -0500
Subject: [PATCH 09/17] no rotation for big logo on ScreenTitleMenu transition

---
 Themes/default/metrics.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index d3e01fbd43..a520edc68c 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -604,7 +604,7 @@ ShowLogo=true
 LogoX=SCREEN_CENTER_X
 LogoY=SCREEN_CENTER_Y-68
 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,5.25,0;zoom,0;bounceend,0.35;zoom,0.75
-LogoOffCommand=stopeffect;bouncebegin,0.35;rotationz,360;zoom,0
+LogoOffCommand=stopeffect;bouncebegin,0.35;zoom,0
 #
 ShowCurrentGametype=true
 CurrentGametypeX=SCREEN_WIDTH*0.01

From 7b067bcd6fcaeac1b238080a9da53f74e2ca94c1 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 01:37:36 -0500
Subject: [PATCH 10/17] make single player BPMDisplay use steps timing

---
 .../Graphics/ScreenGameplay BPMDisplay.lua    | 56 +++++++++++++------
 1 file changed, 40 insertions(+), 16 deletions(-)

diff --git a/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua b/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua
index 2b242dd9fb..bb61014df0 100644
--- a/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua	
+++ b/Themes/default/Graphics/ScreenGameplay BPMDisplay.lua	
@@ -1,15 +1,36 @@
 -- check if players are playing steps with different timingdata.
 local numPlayers = GAMESTATE:GetNumPlayersEnabled()
 
-local displaySingle = Def.SongBPMDisplay {
-	File=THEME:GetPathF("BPMDisplay", "bpm");
-	Name="BPMDisplay";
-	InitCommand=cmd(zoom,0.675;shadowlength,1);
-	SetCommand=function(self) self:SetFromGameState() end;
-	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
-	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+local function UpdateSingleBPM(self)
+	local bpmDisplay = self:GetChild("BPMDisplay")
+	local pn = GAMESTATE:GetMasterPlayerNumber()
+	local pState = GAMESTATE:GetPlayerState(pn);
+	local songPosition = pState:GetSongPosition()
+	local bpm = songPosition:GetCurBPS() * 60
+	bpmDisplay:settext( string.format("%03.2f",bpm) )
+end
+
+local displaySingle = Def.ActorFrame{
+	-- manual bpm displays
+	LoadFont("BPMDisplay", "bpm")..{
+		Name="BPMDisplay";
+		InitCommand=cmd(zoom,0.675;shadowlength,1);
+	};
+
+	--[[
+	Def.SongBPMDisplay {
+		File=THEME:GetPathF("BPMDisplay", "bpm");
+		Name="BPMDisplay";
+		InitCommand=cmd(zoom,0.675;shadowlength,1);
+		SetCommand=function(self) self:SetFromGameState() end;
+		CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
+		CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
+	};
+	--]]
 };
 
+displaySingle.InitCommand=cmd(SetUpdateFunction,UpdateSingleBPM);
+
 if numPlayers == 1 then
 	return displaySingle
 else
@@ -23,16 +44,19 @@ else
 	local diffP1 = stepsP1:GetDifficulty()
 	local diffP2 = stepsP2:GetDifficulty()
 
-	if stP1 == stP2 and diffP1 == diffP2 then
-		-- both players are using the same steps; only need one.
+	-- get timing data...
+	local timingP1 = stepsP1:GetTimingData()
+	local timingP2 = stepsP2:GetTimingData()
+
+	--if stP1 == stP2 and diffP1 == diffP2 then
+	if timingP1 == timingP2 then
+		-- both players are steps with the same TimingData; only need one.
 		return displaySingle
 	end
 
 	-- otherwise, we have some more work to do.
-	local timingP1 = stepsP1:GetTimingData()
-	local timingP2 = stepsP2:GetTimingData()
 
-	local function UpdateBPM(self)
+	local function Update2PBPM(self)
 		local dispP1 = self:GetChild("DisplayP1")
 		local dispP2 = self:GetChild("DisplayP2")
 
@@ -42,7 +66,7 @@ else
 			local pState = GAMESTATE:GetPlayerState(pn);
 			local songPosition = pState:GetSongPosition()
 			local bpm = songPosition:GetCurBPS() * 60
-			bpmDisplay:settext( string.format("%.2f",bpm) )
+			bpmDisplay:settext( string.format("%03.2f",bpm) )
 		end
 	end
 
@@ -50,15 +74,15 @@ else
 		-- manual bpm displays
 		LoadFont("BPMDisplay", "bpm")..{
 			Name="DisplayP1";
-			InitCommand=cmd(x,-32;zoom,0.625;shadowlength,1);
+			InitCommand=cmd(x,-28;zoom,0.6;shadowlength,1);
 		};
 		LoadFont("BPMDisplay", "bpm")..{
 			Name="DisplayP2";
-			InitCommand=cmd(x,32;zoom,0.625;shadowlength,1);
+			InitCommand=cmd(x,28;zoom,0.6;shadowlength,1);
 		};
 	};
 
-	displayTwoPlayers.InitCommand=cmd(SetUpdateFunction,UpdateBPM);
+	displayTwoPlayers.InitCommand=cmd(SetUpdateFunction,Update2PBPM);
 
 	return displayTwoPlayers
 end

From 87a86b63e731bc2f9133b8dc86e867ae0e6bc495 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 5 Jun 2011 02:38:39 -0400
Subject: [PATCH 11/17] Consistent > vs >= on long songs.

---
 src/Song.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Song.cpp b/src/Song.cpp
index 3aaeee24ac..cc57bccd9b 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -1458,7 +1458,7 @@ float Song::GetStepsSeconds() const
 
 bool Song::IsLong() const
 {
-	return !IsMarathon() && m_fMusicLengthSeconds > g_fLongVerSongSeconds;
+	return !IsMarathon() && m_fMusicLengthSeconds >= g_fLongVerSongSeconds;
 }
 
 bool Song::IsMarathon() const

From 4117ec89a16de3ea6c510814b7e58a14b3247d09 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 5 Jun 2011 03:03:16 -0400
Subject: [PATCH 12/17] Allow double/triple scores for longs/marathons.

This only targets the Extreme scoring system for now.
---
 Themes/_fallback/Scripts/04 Scoring.lua | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Themes/_fallback/Scripts/04 Scoring.lua b/Themes/_fallback/Scripts/04 Scoring.lua
index 120177cd4d..27a1d6155a 100644
--- a/Themes/_fallback/Scripts/04 Scoring.lua	
+++ b/Themes/_fallback/Scripts/04 Scoring.lua	
@@ -86,6 +86,13 @@ r['DDR Extreme'] = function(params, pss)
 	local radarValues = steps:GetRadarValues(params.Player);
 	local baseScore = (steps:IsAnEdit() and 
 		5 or steps:GetMeter()) * 1000000;
+	if (GAMESTATE:GetCurrentSong():IsMarathon()) then
+		baseScore = baseScore * 3;
+	else
+		if (GAMESTATE:GetCurrentSong():IsLong()) then
+			baseScore = baseScore * 2;
+		end;
+	end;
 	local totalItems = GetTotalItems(radarValues);
 	local singleStep = (1 + totalItems) * totalItems / 2;
 	if (not Shared.CurrentStep) then

From 7dbedc8dff100377ca154844805e87e1e18773f7 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 03:48:07 -0500
Subject: [PATCH 13/17] fix up version info on title menu

---
 Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua | 9 +++------
 Themes/default/metrics.ini                              | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua b/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua
index 8f35d2a5fb..e491d7a94f 100644
--- a/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua	
@@ -5,16 +5,13 @@ return Def.ActorFrame {
 	LoadFont("Common Normal") .. {
 		Text=ProductID();
 		AltText="";
-		InitCommand=cmd(x,-72;y,-1;horizalign,left;zoom,0.75);
+		InitCommand=cmd(y,-3;zoom,0.75);
 		OnCommand=cmd(shadowlength,1);
 	};
 	LoadFont("Common Normal") .. {
-		Text=ProductVersion() .. "\n" .. VersionDate(); 
+		Text=ProductVersion() .. " (".. VersionDate() ..")";
 		AltText="";
-		InitCommand=cmd(x,72*0.35;zoom,0.5);
+		InitCommand=cmd(y,13;zoom,0.5);
 		OnCommand=cmd(shadowlength,1;skewx,-0.125);
 	};
---[[ 	LoadFont("Common Normal") .. {
-		OnCommand=cmd(settext,"You're using " ..ProductID().." "..ProductVersion().."\nBuilt on "..VersionDate().." at "..VersionTime();horizalign,right;vertalign,bottom;zoom,0.5;);
-	}; --]]
 };
\ No newline at end of file
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index a520edc68c..65558ea9ca 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -631,15 +631,15 @@ SystemDirectionOnCommand=
 SystemDirectionOffCommand=
 #
 ShowVersionInfo=true
-VersionInfoX=SCREEN_RIGHT-84
+VersionInfoX=SCREEN_RIGHT-90
 VersionInfoY=SCREEN_BOTTOM-64
 VersionInfoOnCommand=
 VersionInfoOffCommand=
 #
 ShowNetworkStatus=true
-NetworkStatusX=SCREEN_WIDTH*0.0125
+NetworkStatusX=SCREEN_LEFT+12
 NetworkStatusY=SCREEN_HEIGHT*0.85
-NetworkStatusOnCommand=horizalign,left;
+NetworkStatusOnCommand=halign,0;
 NetworkStatusOffCommand=linear,0.5;cropright,1
 #
 HelpY=SCREEN_BOTTOM-24

From c3e1d439c5f1088eb7ab6525aaba589a22503f6f Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 03:51:16 -0500
Subject: [PATCH 14/17] slight version info tweaks on ScreenTitleMenu

---
 Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua b/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua
index e491d7a94f..aa46df3859 100644
--- a/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua	
+++ b/Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua	
@@ -1,17 +1,17 @@
 return Def.ActorFrame {
 	LoadActor(THEME:GetPathG("ScreenTitleMenu","PreferenceFrame")) .. {
-		OnCommand=cmd(diffuse,Color("Orange");diffusetopedge,Color("Yellow");diffusealpha,0.25);
+		OnCommand=cmd(diffuse,color("#f7941d");diffusetopedge,color("#fff200");diffusealpha,0.25);
 	};
 	LoadFont("Common Normal") .. {
 		Text=ProductID();
 		AltText="";
-		InitCommand=cmd(y,-3;zoom,0.75);
+		InitCommand=cmd(y,-5;zoom,0.6);
 		OnCommand=cmd(shadowlength,1);
 	};
 	LoadFont("Common Normal") .. {
 		Text=ProductVersion() .. " (".. VersionDate() ..")";
 		AltText="";
-		InitCommand=cmd(y,13;zoom,0.5);
+		InitCommand=cmd(y,8;zoom,0.45);
 		OnCommand=cmd(shadowlength,1;skewx,-0.125);
 	};
 };
\ No newline at end of file

From 8c4d69167ebe24d69714f467d982ab748ee89558 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 04:19:10 -0500
Subject: [PATCH 15/17] new ranking bullets graphic

---
 .../Graphics/ScreenRanking bullets 1x5.png    | Bin 4032 -> 5942 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Themes/default/Graphics/ScreenRanking bullets 1x5.png b/Themes/default/Graphics/ScreenRanking bullets 1x5.png
index f7693d07890e44a96a00ea2247fc8eb333c73773..659aa8f2b824d693e234d81e575e6e38a24e194a 100644
GIT binary patch
literal 5942
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
S_)hsB4$!%wk1j^ph5Zk<!wvWV

literal 4032
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


From 517c085762c5903fcfbc6ba8d5618aee2048dbf1 Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sun, 5 Jun 2011 05:36:05 -0500
Subject: [PATCH 16/17] change missing graphic

---
 Themes/_fallback/Graphics/_missing.png | Bin 104 -> 316 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Themes/_fallback/Graphics/_missing.png b/Themes/_fallback/Graphics/_missing.png
index b193cde18899ad0856b7a541e8cc3c8fc07158ef..ee2cf8d6b7f950efbea51ca6fdbaaf0b4b34128b 100644
GIT binary patch
literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq002M$001Ba0{{R3P_tvV0000FP)t-s{{a90
z004jh01ONa|NsBSrAJ!;0004WQchC<K<3zH0002nNkl<ZcwW8J(P;!R420pNgQSJA
zD)6WR`|rP|U?DbKk~=OhH!oVm2R38&?G<_de2|X=^dJoa0u-z>5J7!j06TXsOq?;9
zv5h@1FcmvClRTrqS?YO^1Q^H~zrm#MklPdg4f=@U{|3Rn1^J@~*|I$5n3ihT`tIR=
zo&_OAwa*d=h$RF|4VJ3?ehcA5<hIp-=xRo8`Dj*Ease7B&h}_-z}^M=4h4eTtP6|+
zG8(xGsJgv?3iP|*2Z&sEK)1gq7$^m9AgkNAhUc*7*^H;(;_;93f_wqH%7j$J-jFx|
O0000<MNUMnLSTY{`h)cV

literal 104
zcmeAS@N?(olHy`uVBq!ia0vp^EI`b}$P6T1)7~opDdqs55ZC|z|1UoxeFDg3ED7=p
xW^j0RBMrzA_H=O!sfgn}z{m*XHB9)oei|Fl1jfRLH6MTi44$rjF6*2UngGQO8rc8<


From e641a88daf020a60ec9345619abdeb8eae873704 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 5 Jun 2011 10:20:31 -0400
Subject: [PATCH 17/17] Let's make sure libmad isn't used up too.

---
 Xcode/stepmania.xcodeproj/project.pbxproj | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj
index 7b7226efd3..fbe2913e32 100644
--- a/Xcode/stepmania.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania.xcodeproj/project.pbxproj
@@ -1524,7 +1524,7 @@
 		AAA071940CE7B50B005A3060 /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = AAA070C00CE7B3AD005A3060 /* decoder.c */; };
 		AAA071950CE7B50C005A3060 /* bit.h in Headers */ = {isa = PBXBuildFile; fileRef = AAA070B50CE7B3AD005A3060 /* bit.h */; };
 		AAA071960CE7B50D005A3060 /* bit.c in Sources */ = {isa = PBXBuildFile; fileRef = AAA070B40CE7B3AD005A3060 /* bit.c */; };
-		AAA071B40CE7C9C9005A3060 /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA070A90CE7B0DF005A3060 /* libmad.a */; };
+		AAA071B40CE7C9C9005A3060 /* libmad-sm5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AAA070A90CE7B0DF005A3060 /* libmad-sm5.a */; };
 		AAA372D40909934500141131 /* MovieTexture_Generic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA372D00909934500141131 /* MovieTexture_Generic.cpp */; };
 		AAA372D60909934500141131 /* MovieTexture_Theora.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA372D20909934500141131 /* MovieTexture_Theora.cpp */; };
 		AAA6BFEC0644AB3700AFBBC8 /* ScreenWithMenuElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA6BFEA0644AB3700AFBBC8 /* ScreenWithMenuElements.cpp */; };
@@ -2774,7 +2774,7 @@
 		AA9EC2F0055F5126007E5098 /* RageTextureID.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageTextureID.cpp; path = ../src/RageTextureID.cpp; sourceTree = "<group>"; };
 		AA9EC2F1055F5126007E5098 /* RageTextureID.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageTextureID.h; path = ../src/RageTextureID.h; sourceTree = "<group>"; };
 		AAA0704D0CE5082D005A3060 /* libffmpeg_link.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffmpeg_link.a; sourceTree = "<group>"; };
-		AAA070A90CE7B0DF005A3060 /* libmad.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmad.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		AAA070A90CE7B0DF005A3060 /* libmad-sm5.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libmad-sm5.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		AAA070B40CE7B3AD005A3060 /* bit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bit.c; sourceTree = "<group>"; };
 		AAA070B50CE7B3AD005A3060 /* bit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bit.h; sourceTree = "<group>"; };
 		AAA070C00CE7B3AD005A3060 /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = "<group>"; };
@@ -3122,7 +3122,7 @@
 				AA7C8D1F0B6748E300FD9940 /* libtommath.a in Frameworks */,
 				AA059E2C0B8F0C67006F8139 /* libz_link.a in Frameworks */,
 				AAA0704E0CE5082E005A3060 /* libffmpeg_link.a in Frameworks */,
-				AAA071B40CE7C9C9005A3060 /* libmad.a in Frameworks */,
+				AAA071B40CE7C9C9005A3060 /* libmad-sm5.a in Frameworks */,
 				2B17AB9F13981271001AE57D /* libpng-1.5.1sm0.1.a in Frameworks */,
 				2B17ABCF139815E0001AE57D /* libglew.a in Frameworks */,
 				2B17ABFC139817D5001AE57D /* libpcre.a in Frameworks */,
@@ -3240,7 +3240,7 @@
 				AA7A2BAB0AE09CD50054C5BA /* luac */,
 				AA7C895F0B67444700FD9940 /* libtommath.a */,
 				AA7C8B8B0B67460600FD9940 /* libtomcrypt.a */,
-				AAA070A90CE7B0DF005A3060 /* libmad.a */,
+				AAA070A90CE7B0DF005A3060 /* libmad-sm5.a */,
 				2B17AB7213980FDF001AE57D /* libpng-1.5.1sm0.1.a */,
 				2B17ABC013981521001AE57D /* libglew.a */,
 				2B17ABE013981756001AE57D /* libpcre.a */,
@@ -5849,7 +5849,7 @@
 			);
 			name = mad;
 			productName = mad;
-			productReference = AAA070A90CE7B0DF005A3060 /* libmad.a */;
+			productReference = AAA070A90CE7B0DF005A3060 /* libmad-sm5.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		AAE7817D0AC7E37B00AEFC64 /* lua-5.1 */ = {
@@ -8377,7 +8377,7 @@
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b";
 				INSTALL_PATH = /usr/local/lib;
 				PREBINDING = NO;
-				PRODUCT_NAME = mad;
+				PRODUCT_NAME = "mad-sm5";
 			};
 			name = Native;
 		};
@@ -8413,7 +8413,7 @@
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b";
 				INSTALL_PATH = /usr/local/lib;
 				PREBINDING = NO;
-				PRODUCT_NAME = mad;
+				PRODUCT_NAME = "mad-sm5";
 			};
 			name = PerformanceDebug;
 		};
@@ -8449,7 +8449,7 @@
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b";
 				INSTALL_PATH = /usr/local/lib;
 				PREBINDING = NO;
-				PRODUCT_NAME = mad;
+				PRODUCT_NAME = "mad-sm5";
 			};
 			name = Universal;
 		};
@@ -8488,7 +8488,7 @@
 				HEADER_SEARCH_PATHS = "$(SRCROOT)/../src/mad-0.15.1b";
 				INSTALL_PATH = /usr/local/lib;
 				PREBINDING = NO;
-				PRODUCT_NAME = mad;
+				PRODUCT_NAME = "mad-sm5";
 			};
 			name = Debug;
 		};