actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[default -> loading window] lots of stuff.

Browse Source
This commit is contained in:
Jason Felds
2011-06-05 10:20:53 -04:00
parent 584c2ee613 e641a88daf
commit 0a663c372d
17 changed files with 130 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Luadoc/Lua.xsl
+6 -16
View File
@@ -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>
Installer/custom-ssc.bmp → Installer/custom-sm5.bmp
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Installer/header-ssc.bmp → Installer/header-sm5.bmp
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Installer/welcome-ssc.bmp → Installer/welcome-sm5.bmp
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Themes/_fallback/Graphics/_missing.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 B

After

Width:  |  Height:  |  Size: 316 B

Themes/_fallback/Scripts/04 Scoring.lua
+7
View File
@@ -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
Themes/default/BGAnimations/ScreenCredits overlay.lua
+2 -2
View File
@@ -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
}
Themes/default/Graphics/Common window icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Themes/default/Graphics/ScreenGameplay BPMDisplay.lua
+90 -7
View File
@@ -1,8 +1,91 @@
return 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");
-- check if players are playing steps with different timingdata.
local numPlayers = GAMESTATE:GetNumPlayersEnabled()
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
-- 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()
-- 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 function Update2PBPM(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("%03.2f",bpm) )
end
end
local displayTwoPlayers = Def.ActorFrame{
-- manual bpm displays
LoadFont("BPMDisplay", "bpm")..{
Name="DisplayP1";
InitCommand=cmd(x,-28;zoom,0.6;shadowlength,1);
};
LoadFont("BPMDisplay", "bpm")..{
Name="DisplayP2";
InitCommand=cmd(x,28;zoom,0.6;shadowlength,1);
};
};
displayTwoPlayers.InitCommand=cmd(SetUpdateFunction,Update2PBPM);
return displayTwoPlayers
end
-- should not get here
-- return Def.ActorFrame{}
Themes/default/Graphics/ScreenRanking bullets 1x5.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Themes/default/Graphics/ScreenTitleMenu VersionInfo.lua
+4 -7
View File
@@ -1,20 +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(x,-72;y,-1;horizalign,left;zoom,0.75);
InitCommand=cmd(y,-5;zoom,0.6);
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,8;zoom,0.45);
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;);
}; --]]
};
Themes/default/metrics.ini
+4 -4
View File
@@ -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
@@ -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
Xcode/stepmania.xcodeproj/project.pbxproj
+12 -12
View File
@@ -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 */; };
@@ -2776,7 +2776,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>"; };
@@ -3126,7 +3126,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 */,
@@ -3244,7 +3244,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 */,
@@ -5856,7 +5856,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 */ = {
@@ -7381,7 +7381,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;
@@ -7424,7 +7424,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;
@@ -7467,7 +7467,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;
@@ -8385,7 +8385,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;
};
@@ -8421,7 +8421,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;
};
@@ -8457,7 +8457,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;
};
@@ -8496,7 +8496,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;
};
src/InputMapper.cpp
+1 -1
View File
@@ -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;
src/ProductInfo.inc
+2 -2
View File
@@ -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
src/ScreenGameplay.cpp
+1
View File
@@ -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
src/Song.cpp
+1 -1
View File
@@ -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