CONFLICT RESOLUTION (view entire LOG message to see):
GAMEMANAGER. we did different fixes. I merged the best of both ;) EZ2DANCER columns now aligned correctly EZ2DANCER stage screen stylization now underway NOTE: This Release WILL NOT COMPILE. Some Members of RAGELOG and RAGESOUND have disappeared, and I don't know where to.
This commit is contained in:
@@ -219,7 +219,7 @@ bool Background::LoadFromSong( Song* pSong, bool bDisableVisualizations )
|
||||
break;
|
||||
|
||||
// Generate a plan.
|
||||
for( int i=0; i<pSong->m_fLastBeat; i+=16 )
|
||||
for( i=0; i<pSong->m_fLastBeat; i+=16 )
|
||||
m_aAnimSegs.Add( AnimSeg((float)i,rand()%m_BackgroundAnimations.GetSize()) ); // change BG every 4 bars
|
||||
|
||||
for( i=0; i<pSong->m_BPMSegments.GetSize(); i++ )
|
||||
|
||||
Reference in New Issue
Block a user