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

merge

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-09-10 01:21:19 +07:00
parent b26dc2b3bd 71ec0fc66b
commit 1362cab86b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm5.txt
+4
View File
@@ -8,6 +8,10 @@ ________________________________________________________________________________
StepMania 5.0 $next | 2011???? StepMania 5.0 $next | 2011????
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
2011/09/08
----------
* [GameManager] Fix shifting of 2P notes in beat mode. [1a2a3a2a1a]
2011/09/07 2011/09/07
---------- ----------
* [Model] Added GetDefaultAnimation() Lua binding. [AJ] * [Model] Added GetDefaultAnimation() Lua binding. [AJ]
src/GameManager.cpp
+4 -4
View File
@@ -1697,6 +1697,7 @@ static const Style g_Style_Beat_Single7 =
{ TRACK_7, +BEAT_COL_SPACING*4.0f, NULL }, { TRACK_7, +BEAT_COL_SPACING*4.0f, NULL },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_8, +BEAT_COL_SPACING*4.0f, "scratch" },
{ TRACK_1, -BEAT_COL_SPACING*3.5f, NULL }, { TRACK_1, -BEAT_COL_SPACING*3.5f, NULL },
{ TRACK_2, -BEAT_COL_SPACING*2.5f, NULL }, { TRACK_2, -BEAT_COL_SPACING*2.5f, NULL },
{ TRACK_3, -BEAT_COL_SPACING*1.5f, NULL }, { TRACK_3, -BEAT_COL_SPACING*1.5f, NULL },
@@ -1704,12 +1705,11 @@ static const Style g_Style_Beat_Single7 =
{ TRACK_5, +BEAT_COL_SPACING*0.5f, NULL }, { TRACK_5, +BEAT_COL_SPACING*0.5f, NULL },
{ TRACK_6, +BEAT_COL_SPACING*1.5f, NULL }, { TRACK_6, +BEAT_COL_SPACING*1.5f, NULL },
{ TRACK_7, +BEAT_COL_SPACING*2.5f, NULL }, { TRACK_7, +BEAT_COL_SPACING*2.5f, NULL },
{ TRACK_8, +BEAT_COL_SPACING*4.0f, "scratch" },
}, },
}, },
{ // m_iInputColumn[NUM_GameController][NUM_GameButton] { // m_iInputColumn[NUM_GameController][NUM_GameButton]
{ 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING }, { 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING },
{ 0, 1, 2, 3, 4, 5, 6, 7, 7, Style::END_MAPPING }, { 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7 0,1,2,3,4,5,6,7
@@ -1741,6 +1741,7 @@ static const Style g_Style_Beat_Versus7 =
{ TRACK_7, +BEAT_COL_SPACING*4.0f, NULL }, { TRACK_7, +BEAT_COL_SPACING*4.0f, NULL },
}, },
{ // PLAYER_2 { // PLAYER_2
{ TRACK_8, +BEAT_COL_SPACING*4.0f, "scratch" },
{ TRACK_1, -BEAT_COL_SPACING*3.5f, NULL }, { TRACK_1, -BEAT_COL_SPACING*3.5f, NULL },
{ TRACK_2, -BEAT_COL_SPACING*2.5f, NULL }, { TRACK_2, -BEAT_COL_SPACING*2.5f, NULL },
{ TRACK_3, -BEAT_COL_SPACING*1.5f, NULL }, { TRACK_3, -BEAT_COL_SPACING*1.5f, NULL },
@@ -1748,12 +1749,11 @@ static const Style g_Style_Beat_Versus7 =
{ TRACK_5, +BEAT_COL_SPACING*0.5f, NULL }, { TRACK_5, +BEAT_COL_SPACING*0.5f, NULL },
{ TRACK_6, +BEAT_COL_SPACING*1.5f, NULL }, { TRACK_6, +BEAT_COL_SPACING*1.5f, NULL },
{ TRACK_7, +BEAT_COL_SPACING*2.5f, NULL }, { TRACK_7, +BEAT_COL_SPACING*2.5f, NULL },
{ TRACK_8, +BEAT_COL_SPACING*4.0f, "scratch" },
}, },
}, },
{ // m_iInputColumn[NUM_GameController][NUM_GameButton] { // m_iInputColumn[NUM_GameController][NUM_GameButton]
{ 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING }, { 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING },
{ 0, 1, 2, 3, 4, 5, 6, 7, 7, Style::END_MAPPING }, { 1, 2, 3, 4, 5, 6, 7, 0, 0, Style::END_MAPPING },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7 0,1,2,3,4,5,6,7