[default -> splittiming] Right, forgot this.
This commit is contained in:
@@ -10,6 +10,8 @@ StepMania 5.0 $NEXT | 20110xyy
|
|||||||
|
|
||||||
2011/05/16
|
2011/05/16
|
||||||
----------
|
----------
|
||||||
|
* [ProfileManager] Added ProfileWasLoadedFromMemoryCard(PlayerNumber)
|
||||||
|
Lua binding. [AJ]
|
||||||
* Added #FAKES to the SSC format. Similar to the fake arrows, these blocks
|
* Added #FAKES to the SSC format. Similar to the fake arrows, these blocks
|
||||||
prevent all judgments within the range. [Wolfman2000]
|
prevent all judgments within the range. [Wolfman2000]
|
||||||
* Changed the syntax of #WARPS slightly. Now the second value is the relative
|
* Changed the syntax of #WARPS slightly. Now the second value is the relative
|
||||||
@@ -18,6 +20,9 @@ StepMania 5.0 $NEXT | 20110xyy
|
|||||||
|
|
||||||
2011/05/15
|
2011/05/15
|
||||||
----------
|
----------
|
||||||
|
* [ScreenGameplay] Removed hardcoded commands for Debug (give up text) and
|
||||||
|
replace them with DebugStartOnCommand, DebugBackOnCommand, and
|
||||||
|
DebugTweenOffCommand. [AJ]
|
||||||
* Added #SPEEDS to the SSC format. This multiplies your scrolling speed during
|
* Added #SPEEDS to the SSC format. This multiplies your scrolling speed during
|
||||||
gameplay, not replaces it (see mod attacks for replacing). [Wolfman2000]
|
gameplay, not replaces it (see mod attacks for replacing). [Wolfman2000]
|
||||||
|
|
||||||
|
|||||||
@@ -1626,12 +1626,11 @@
|
|||||||
<!-- XXX: What is the edit course entry index? -->
|
<!-- XXX: What is the edit course entry index? -->
|
||||||
</Function>
|
</Function>
|
||||||
<Function name='GetEditLocalProfile' return='Profile' arguments=''>
|
<Function name='GetEditLocalProfile' return='Profile' arguments=''>
|
||||||
<!-- XXX: What is the EditLocalProfile? -->
|
Return the Edit Local <Link class='Profile' /> (during Profile editing)
|
||||||
Return the Edit Local <Link class='Profile' /> or <code>nil</code> if
|
or <code>nil</code> if it does not exist.
|
||||||
it does not exist.
|
|
||||||
</Function>
|
</Function>
|
||||||
<Function name='GetEditLocalProfileID' return='string' arguments=''>
|
<Function name='GetEditLocalProfileID' return='string' arguments=''>
|
||||||
<!-- XXX: What is the EditLocalProfileID? -->
|
Returns the ID of the Edit Local <Link class='Profile' /> (during Profile editing).
|
||||||
</Function>
|
</Function>
|
||||||
<Function name='GetEditSourceSteps' return='Steps' arguments=''>
|
<Function name='GetEditSourceSteps' return='Steps' arguments=''>
|
||||||
Return the source <Link class='Steps' /> for the editor or <code>nil</code>
|
Return the source <Link class='Steps' /> for the editor or <code>nil</code>
|
||||||
|
|||||||
@@ -3217,6 +3217,9 @@ SongOptionsOffCommand=
|
|||||||
DebugX=SCREEN_CENTER_X
|
DebugX=SCREEN_CENTER_X
|
||||||
DebugY=SCREEN_BOTTOM-72
|
DebugY=SCREEN_BOTTOM-72
|
||||||
DebugOnCommand=zoom,0.75
|
DebugOnCommand=zoom,0.75
|
||||||
|
DebugStartOnCommand=stoptweening;diffusealpha,0;linear,1/8;diffusealpha,1
|
||||||
|
DebugBackOnCommand=stoptweening;diffusealpha,0;linear,1/8;diffusealpha,1
|
||||||
|
DebugTweenOffCommand=stoptweening;linear,1/8;diffusealpha,0
|
||||||
#
|
#
|
||||||
SongNumberFormat="%d"
|
SongNumberFormat="%d"
|
||||||
SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
|
SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ OptionsCursor::OptionsCursor( const OptionsCursor &cpy ):
|
|||||||
m_iOriginalCanGoLeftX( cpy.m_iOriginalCanGoLeftX ),
|
m_iOriginalCanGoLeftX( cpy.m_iOriginalCanGoLeftX ),
|
||||||
m_iOriginalCanGoRightX( cpy.m_iOriginalCanGoRightX )
|
m_iOriginalCanGoRightX( cpy.m_iOriginalCanGoRightX )
|
||||||
{
|
{
|
||||||
/* Re-add children, or m_SubActors will point to cpy's children and not our own. */
|
// Re-add children, or m_SubActors will point to cpy's children and not our own.
|
||||||
m_SubActors.clear();
|
m_SubActors.clear();
|
||||||
this->AddChild( m_sprMiddle );
|
this->AddChild( m_sprMiddle );
|
||||||
this->AddChild( m_sprLeft );
|
this->AddChild( m_sprLeft );
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ protected:
|
|||||||
AutoActor m_sprCanGoLeft;
|
AutoActor m_sprCanGoLeft;
|
||||||
AutoActor m_sprCanGoRight;
|
AutoActor m_sprCanGoRight;
|
||||||
|
|
||||||
// save the metrics-set X because it gets oblitterated on a call to SetBarWidth
|
// save the metrics-set X because it gets obliterated on a call to SetBarWidth
|
||||||
int m_iOriginalLeftX;
|
int m_iOriginalLeftX;
|
||||||
int m_iOriginalRightX;
|
int m_iOriginalRightX;
|
||||||
int m_iOriginalCanGoLeftX;
|
int m_iOriginalCanGoLeftX;
|
||||||
|
|||||||
@@ -833,6 +833,7 @@ public:
|
|||||||
static int GetNumLocalProfiles( T* p, lua_State *L ) { lua_pushnumber(L, p->GetNumLocalProfiles() ); return 1; }
|
static int GetNumLocalProfiles( T* p, lua_State *L ) { lua_pushnumber(L, p->GetNumLocalProfiles() ); return 1; }
|
||||||
static int GetProfileDir( T* p, lua_State *L ) { lua_pushstring(L, p->GetProfileDir(Enum::Check<ProfileSlot>(L, 1)) ); return 1; }
|
static int GetProfileDir( T* p, lua_State *L ) { lua_pushstring(L, p->GetProfileDir(Enum::Check<ProfileSlot>(L, 1)) ); return 1; }
|
||||||
static int IsSongNew( T* p, lua_State *L ) { lua_pushboolean(L, p->IsSongNew(Luna<Song>::check(L,1)) ); return 1; }
|
static int IsSongNew( T* p, lua_State *L ) { lua_pushboolean(L, p->IsSongNew(Luna<Song>::check(L,1)) ); return 1; }
|
||||||
|
static int ProfileWasLoadedFromMemoryCard( T* p, lua_State *L ) { lua_pushboolean(L, p->ProfileWasLoadedFromMemoryCard(Enum::Check<PlayerNumber>(L, 1)) ); return 1; }
|
||||||
|
|
||||||
LunaProfileManager()
|
LunaProfileManager()
|
||||||
{
|
{
|
||||||
@@ -847,6 +848,7 @@ public:
|
|||||||
ADD_METHOD( GetNumLocalProfiles );
|
ADD_METHOD( GetNumLocalProfiles );
|
||||||
ADD_METHOD( GetProfileDir );
|
ADD_METHOD( GetProfileDir );
|
||||||
ADD_METHOD( IsSongNew );
|
ADD_METHOD( IsSongNew );
|
||||||
|
ADD_METHOD( ProfileWasLoadedFromMemoryCard );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
+3
-14
@@ -2156,11 +2156,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
|
|||||||
else if( input.type==IET_FIRST_PRESS && m_GiveUpTimer.IsZero() )
|
else if( input.type==IET_FIRST_PRESS && m_GiveUpTimer.IsZero() )
|
||||||
{
|
{
|
||||||
m_textDebug.SetText( GIVE_UP_START_TEXT );
|
m_textDebug.SetText( GIVE_UP_START_TEXT );
|
||||||
// todo: un-hardcode commands and move to metrics -aj
|
m_textDebug.PlayCommand( "StartOn" );
|
||||||
m_textDebug.StopTweening();
|
|
||||||
m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
|
|
||||||
m_textDebug.BeginTweening( 1/8.f );
|
|
||||||
m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
|
|
||||||
m_GiveUpTimer.Touch(); // start the timer
|
m_GiveUpTimer.Touch(); // start the timer
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2187,18 +2183,11 @@ void ScreenGameplay::Input( const InputEventPlus &input )
|
|||||||
else if( PREFSMAN->m_bDelayedBack && input.type==IET_FIRST_PRESS )
|
else if( PREFSMAN->m_bDelayedBack && input.type==IET_FIRST_PRESS )
|
||||||
{
|
{
|
||||||
m_textDebug.SetText( GIVE_UP_BACK_TEXT );
|
m_textDebug.SetText( GIVE_UP_BACK_TEXT );
|
||||||
// todo: un-hardcode commands and move to metrics -aj
|
m_textDebug.PlayCommand( "BackOn" );
|
||||||
m_textDebug.StopTweening();
|
|
||||||
m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
|
|
||||||
m_textDebug.BeginTweening( 1/8.f );
|
|
||||||
m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
|
|
||||||
}
|
}
|
||||||
else if( PREFSMAN->m_bDelayedBack && input.type==IET_RELEASE )
|
else if( PREFSMAN->m_bDelayedBack && input.type==IET_RELEASE )
|
||||||
{
|
{
|
||||||
// todo: un-hardcode commands and move to metrics -aj
|
m_textDebug.PlayCommand( "TweenOff" );
|
||||||
m_textDebug.StopTweening();
|
|
||||||
m_textDebug.BeginTweening( 1/8.f );
|
|
||||||
m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -144,8 +144,7 @@ void ScreenHowToPlay::Init()
|
|||||||
const Style* pStyle = GAMESTATE->GetCurrentStyle();
|
const Style* pStyle = GAMESTATE->GetCurrentStyle();
|
||||||
|
|
||||||
Steps *pSteps = SongUtil::GetStepsByDescription( &m_Song, pStyle->m_StepsType, "" );
|
Steps *pSteps = SongUtil::GetStepsByDescription( &m_Song, pStyle->m_StepsType, "" );
|
||||||
// todo: make StepsType human readable. -aj
|
ASSERT_M( pSteps != NULL, ssprintf("No playable steps of StepsType '%s' for ScreenHowToPlay", StringConversion::ToString(pStyle->m_StepsType).c_str()) );
|
||||||
ASSERT_M( pSteps != NULL, "No playable steps for ScreenHowToPlay" );
|
|
||||||
|
|
||||||
NoteData tempNoteData;
|
NoteData tempNoteData;
|
||||||
pSteps->GetNoteData( tempNoteData );
|
pSteps->GetNoteData( tempNoteData );
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ static void GameSel( int &sel, bool ToSel, const ConfOption *pConfOption )
|
|||||||
|
|
||||||
sel = 0;
|
sel = 0;
|
||||||
for(unsigned i = 0; i < choices.size(); ++i)
|
for(unsigned i = 0; i < choices.size(); ++i)
|
||||||
if( !choices[i].EqualsNoCase(sCurGameName) )
|
if( !stricmp(choices[i], sCurGameName) )
|
||||||
sel = i;
|
sel = i;
|
||||||
} else {
|
} else {
|
||||||
vector<const Game*> aGames;
|
vector<const Game*> aGames;
|
||||||
@@ -222,12 +222,12 @@ static void Language( int &sel, bool ToSel, const ConfOption *pConfOption )
|
|||||||
{
|
{
|
||||||
sel = -1;
|
sel = -1;
|
||||||
for( unsigned i=0; sel == -1 && i < vs.size(); ++i )
|
for( unsigned i=0; sel == -1 && i < vs.size(); ++i )
|
||||||
if( !vs[i].EqualsNoCase(THEME->GetCurLanguage()) )
|
if( !stricmp(vs[i], THEME->GetCurLanguage()) )
|
||||||
sel = i;
|
sel = i;
|
||||||
|
|
||||||
// If the current language doesn't exist, we'll show BASE_LANGUAGE, so select that.
|
// If the current language doesn't exist, we'll show BASE_LANGUAGE, so select that.
|
||||||
for( unsigned i=0; sel == -1 && i < vs.size(); ++i )
|
for( unsigned i=0; sel == -1 && i < vs.size(); ++i )
|
||||||
if( !vs[i].EqualsNoCase(SpecialFiles::BASE_LANGUAGE) )
|
if( !stricmp(vs[i], SpecialFiles::BASE_LANGUAGE) )
|
||||||
sel = i;
|
sel = i;
|
||||||
|
|
||||||
if( sel == -1 )
|
if( sel == -1 )
|
||||||
@@ -276,7 +276,7 @@ static void RequestedTheme( int &sel, bool ToSel, const ConfOption *pConfOption
|
|||||||
{
|
{
|
||||||
sel = 0;
|
sel = 0;
|
||||||
for( unsigned i=1; i<vsThemeNames.size(); i++ )
|
for( unsigned i=1; i<vsThemeNames.size(); i++ )
|
||||||
if( !vsThemeNames[i].EqualsNoCase(PREFSMAN->m_sTheme.Get()) )
|
if( !stricmp(vsThemeNames[i], PREFSMAN->m_sTheme.Get()) )
|
||||||
sel = i;
|
sel = i;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -302,7 +302,7 @@ static void Announcer( int &sel, bool ToSel, const ConfOption *pConfOption )
|
|||||||
{
|
{
|
||||||
sel = 0;
|
sel = 0;
|
||||||
for( unsigned i=1; i<choices.size(); i++ )
|
for( unsigned i=1; i<choices.size(); i++ )
|
||||||
if( !choices[i].EqualsNoCase(ANNOUNCER->GetCurAnnouncerName()) )
|
if( !stricmp(choices[i], ANNOUNCER->GetCurAnnouncerName()) )
|
||||||
sel = i;
|
sel = i;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -329,7 +329,7 @@ static void DefaultNoteSkin( int &sel, bool ToSel, const ConfOption *pConfOption
|
|||||||
po.FromString( PREFSMAN->m_sDefaultModifiers );
|
po.FromString( PREFSMAN->m_sDefaultModifiers );
|
||||||
sel = 0;
|
sel = 0;
|
||||||
for( unsigned i=0; i < choices.size(); i++ )
|
for( unsigned i=0; i < choices.size(); i++ )
|
||||||
if( !choices[i].EqualsNoCase(po.m_sNoteSkin) )
|
if( !stricmp(choices[i], po.m_sNoteSkin) )
|
||||||
sel = i;
|
sel = i;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
Reference in New Issue
Block a user