From a436e043105c4f7428a921d4b99b51965be35fdb Mon Sep 17 00:00:00 2001 From: sigatrev Date: Sun, 1 Jun 2014 19:22:24 -0500 Subject: [PATCH 1/4] fix judgment message param Tracks for holds --- src/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Player.cpp b/src/Player.cpp index cd43a57840..1ae3a295c1 100644 --- a/src/Player.cpp +++ b/src/Player.cpp @@ -2809,7 +2809,7 @@ void Player::UpdateJudgedRows() { const TapNote &tn = m_NoteData.GetTapNote( iTrack, iRow ); if (tn.type == TapNote::tap || tn.type == TapNote::lift || - ( tn.type == TapNote::hold_head && !REQUIRE_STEP_ON_HOLD_HEADS ) ) + ( tn.type == TapNote::hold_head && REQUIRE_STEP_ON_HOLD_HEADS ) ) { viColsWithTaps.push_back( iTrack ); }; From 7d13a9963b896175406376cee513d3cf7f2fba77 Mon Sep 17 00:00:00 2001 From: Dan Guzek Date: Sun, 1 Jun 2014 21:28:17 -0400 Subject: [PATCH 2/4] allow button messages in SSM's SelectMenu This allows themers to make use of SelectMenuInputMessageCommand even if they have SelectMenuChangesDifficulty set to true in their Metrics. Neither _fallback nor Default use SelectMenuInputMessageCommand and, for that matter, no theme I'm aware of does (perhaps because it's essentially inaccessible as it is). I use this to detect if a player presses START while holding SELECT on SSM. This is possible with the existing code system, but that CodeMessage does not fire until the player lets go of both buttons. This allows the themer to check for that button combination more imm ediately. --- src/ScreenSelectMusic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp index 89045a53b2..c8c7644f44 100644 --- a/src/ScreenSelectMusic.cpp +++ b/src/ScreenSelectMusic.cpp @@ -572,7 +572,7 @@ bool ScreenSelectMusic::Input( const InputEventPlus &input ) default: break; } } - else if( input.type == IET_FIRST_PRESS && input.MenuI != GAME_BUTTON_SELECT ) + if( input.type == IET_FIRST_PRESS && input.MenuI != GAME_BUTTON_SELECT ) { Message msg("SelectMenuInput"); msg.SetParam( "Player", input.pn ); From 86e8f5d2a0f77a194c6046a56e5c5eba73f38544 Mon Sep 17 00:00:00 2001 From: freem Date: Fri, 6 Jun 2014 15:24:59 -0500 Subject: [PATCH 3/4] update URL to github address --- Docs/Luadoc/Lua.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/Luadoc/Lua.xsl b/Docs/Luadoc/Lua.xsl index 8824b3df88..64986a12d7 100644 --- a/Docs/Luadoc/Lua.xsl +++ b/Docs/Luadoc/Lua.xsl @@ -209,7 +209,7 @@
From acdb2962768c1ffbcebf99998791e29f0d4d2730 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sun, 15 Jun 2014 00:44:05 -0400 Subject: [PATCH 4/4] Set up ActorMultiVertex for other VS projects. --- src/StepMania-net2011.vcxproj | 4 +++- src/StepMania-net2011.vcxproj.filters | 8 +++++++- src/StepMania-net2013.vcxproj | 4 +++- src/StepMania-net2013.vcxproj.filters | 6 ++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/StepMania-net2011.vcxproj b/src/StepMania-net2011.vcxproj index 846feec821..901f8608db 100644 --- a/src/StepMania-net2011.vcxproj +++ b/src/StepMania-net2011.vcxproj @@ -774,6 +774,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + @@ -1655,6 +1656,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + @@ -1935,4 +1937,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - \ No newline at end of file + diff --git a/src/StepMania-net2011.vcxproj.filters b/src/StepMania-net2011.vcxproj.filters index 9b43a92ff6..22f3d05525 100644 --- a/src/StepMania-net2011.vcxproj.filters +++ b/src/StepMania-net2011.vcxproj.filters @@ -1239,6 +1239,9 @@ Actors + + Actors + Actors @@ -2621,6 +2624,9 @@ Actors + + Actors + Actors @@ -2869,4 +2875,4 @@ BaseClasses - \ No newline at end of file + diff --git a/src/StepMania-net2013.vcxproj b/src/StepMania-net2013.vcxproj index 95f8a99813..8121d7e9cb 100644 --- a/src/StepMania-net2013.vcxproj +++ b/src/StepMania-net2013.vcxproj @@ -773,6 +773,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + @@ -2094,6 +2095,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" + @@ -2395,4 +2397,4 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)" - \ No newline at end of file + diff --git a/src/StepMania-net2013.vcxproj.filters b/src/StepMania-net2013.vcxproj.filters index 5ece508628..4254fdd875 100644 --- a/src/StepMania-net2013.vcxproj.filters +++ b/src/StepMania-net2013.vcxproj.filters @@ -1251,6 +1251,9 @@ Actors + + Actors + Actors @@ -2783,6 +2786,9 @@ Actors + + Actors + Actors