From 0326b54c22f1fe0b84e86595c7340b96a5e2a1b2 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 5 Jun 2011 01:26:00 -0500 Subject: [PATCH 1/5] 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 @@ Function Colors
Available in sm-ssc and StepMania 5
Renamed or changed from StepMania 4 alphas
-
Defined in the _fallback theme
+
Defined in the _fallback theme
Defined in the default theme
@@ -476,21 +476,13 @@ renamed - _fallbackTheme + fallbackTheme defaultTheme descriptionCell - - - - - - - - + ( @@ -511,9 +503,7 @@ - - descriptionCell - + descriptionCell From cf8e6cd7ab72158c313ea53a3f039d156658f219 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 5 Jun 2011 01:27:40 -0500 Subject: [PATCH 2/5] 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 Date: Sun, 5 Jun 2011 01:34:00 -0500 Subject: [PATCH 3/5] 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|)B@deAhrN z0XVcyAGM=?=fn4il(NMEU>)em55A{sy9SK}U~Pm*@PF2g!kpAtL$omHPBZ$y5wLP zIl!FF4xe@ib1rBUidwGGU;M=wy|4UZaB-|MJ2`q!cCuEckYchL>@ZjC6brT?-t%PP zQt^-1>3_POTSosiS4hCJq9YWK8)DQcN~vVN(1)}Ng^0on+NDZPa9$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&0YQu{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^_~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#T{jfPn>(in0}4 z2c8Htw;pW*zXQJ$^4w!|52y!b;bLC&Hm2q|8BqeOQi2>z4%nC^49SGvf}@D z$NZky{nYRO(0}d!ipTePz4XxT|4gIqS+DcW?EhY~^-!nqh0_1DFKC%>7NJ@ZaL_``=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|IFtZQIV!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)ffskSw(1QcyajstcJg^%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 Date: Sun, 5 Jun 2011 01:35:12 -0500 Subject: [PATCH 4/5] 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 Date: Sun, 5 Jun 2011 01:37:36 -0500 Subject: [PATCH 5/5] 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