From b0a3735aedb4966f21af751c7ae5bbf56776941a Mon Sep 17 00:00:00 2001 From: caiohsr14 Date: Tue, 13 Nov 2018 16:09:09 -0300 Subject: [PATCH 01/17] Fix the notefield Y for reverse on customize gameplay (#357) --- Themes/Til Death/Scripts/02 CustomizeGameplay.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Themes/Til Death/Scripts/02 CustomizeGameplay.lua b/Themes/Til Death/Scripts/02 CustomizeGameplay.lua index 3b74a48838..b2cbaff20a 100644 --- a/Themes/Til Death/Scripts/02 CustomizeGameplay.lua +++ b/Themes/Til Death/Scripts/02 CustomizeGameplay.lua @@ -1,5 +1,6 @@ local keymode local allowedCustomization +local usingReverse local WIDESCREENWHY = -5 local WIDESCREENWHX = -5 @@ -7,6 +8,7 @@ MovableValues = {} local function loadValuesTable() allowedCustomization = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).CustomizeGameplay + usingReverse = GAMESTATE:GetPlayerState(PLAYER_1):GetCurrentPlayerOptions():UsingReverse() MovableValues.JudgeX = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates[keymode].JudgeX MovableValues.JudgeY = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates[keymode].JudgeY MovableValues.JudgeZoom = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes[keymode].JudgeZoom From bf5411ffc1144a100ad4e37905850af4a5ac4b04 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 14:23:15 -0500 Subject: [PATCH 02/17] remove hibernate call in diffcultylist tweenon --- src/DifficultyList.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/DifficultyList.cpp b/src/DifficultyList.cpp index f730226bc9..8491ee2c43 100644 --- a/src/DifficultyList.cpp +++ b/src/DifficultyList.cpp @@ -320,7 +320,6 @@ StepsDisplayList::TweenOnScreen() for (int m = 0; m < MAX_METERS; ++m) ON_COMMAND(m_Lines[m].m_Meter); - this->SetHibernate(0.5f); m_bShown = true; for (unsigned m = 0; m < m_Rows.size(); ++m) { Line& l = m_Lines[m]; From d116c02c92317431f36be7d12d9a5aeadea9b948 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 14:24:54 -0500 Subject: [PATCH 03/17] hello 2003 this is range loops you can have iterators back --- src/ActorFrame.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/ActorFrame.cpp b/src/ActorFrame.cpp index 745b226e8f..11aadeb3d3 100644 --- a/src/ActorFrame.cpp +++ b/src/ActorFrame.cpp @@ -499,12 +499,8 @@ ActorFrame::UpdateInternal(float fDeltaTime) Actor::UpdateInternal(fDeltaTime); // update all sub-Actors - for (vector::iterator it = m_SubActors.begin(); - it != m_SubActors.end(); - it++) { - Actor* pActor = *it; - pActor->Update(fDeltaTime); - } + for (auto* a : m_SubActors) + a->Update(fDeltaTime); if (unlikely(!m_UpdateFunction.IsNil())) { Lua* L = LUA->Get(); From 28d63b500fda09bda64f620ff6ba63aba4617928 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 14:25:19 -0500 Subject: [PATCH 04/17] fix leaderboard percent grade diffuse https://github.com/etternagame/etterna/issues/356 --- .../BGAnimations/ScreenGameplay overlay/leaderboard.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua index c388386fd3..be11a63d7f 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/leaderboard.lua @@ -174,7 +174,7 @@ function scoreEntry(i) addLabel( "wife", function(self, hs) - self:settextf("%05.2f%%", hs:GetWifeScore() * 100):diffuse(byGrade(hs:GetWifeGrade())) + self:settextf("%05.2f%%", hs:GetWifeScore() * 100):diffuse(byGrade(GetGradeFromPercent(hs:GetWifeScore()))) end, 1.8 * WIDTH ) From 546a1dd7fcc1612aeab343bd0d290147f106a3f8 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 14:33:01 -0500 Subject: [PATCH 05/17] dont display stepslist when changing tabs on a pack --- .../BGAnimations/ScreenSelectMusic decorations/default.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua index eb3b79f0b8..507f0cf294 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -29,7 +29,7 @@ t[#t + 1] = end, TabChangedMessageCommand = function(self) self:finishtweening() - if getTabIndex() < 3 then + if getTabIndex() < 3 and GAMESTATE:GetCurrentSong() then self:playcommand("On") else self:playcommand("Off") From 86eafd0ff425690e9dc5785e47336d4b05e78cc9 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 14:35:12 -0500 Subject: [PATCH 06/17] account for 4:3 in chartpreview to match cdgrpah adjustment --- Themes/Til Death/BGAnimations/_chartpreview.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/BGAnimations/_chartpreview.lua b/Themes/Til Death/BGAnimations/_chartpreview.lua index 1c72bb9e83..a827d576c4 100644 --- a/Themes/Til Death/BGAnimations/_chartpreview.lua +++ b/Themes/Til Death/BGAnimations/_chartpreview.lua @@ -4,7 +4,7 @@ local prevZoom = 0.65 local musicratio = 1 -- hurrrrr nps quadzapalooza -mina -local wodth = 300 +local wodth = capWideScale(280, 300) local hidth = 40 local yeet local cd From 8bfd6d32d89c928e1e4cd9c9da77816b7aad3e98 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 15:01:01 -0500 Subject: [PATCH 07/17] color config needs to be redesigned --- Themes/Til Death/Graphics/ScreenTitleMenu scroll.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Themes/Til Death/Graphics/ScreenTitleMenu scroll.lua b/Themes/Til Death/Graphics/ScreenTitleMenu scroll.lua index c4c6e1313b..338ba6e292 100644 --- a/Themes/Til Death/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/Til Death/Graphics/ScreenTitleMenu scroll.lua @@ -11,7 +11,7 @@ return Def.ActorFrame { self:zoom(0.57):diffuse(getMainColor('positive')) end, LoseFocusCommand = function(self) - self:zoom(0.55):diffuse(color("#b87cf0")) + self:zoom(0.55):diffuse(getTitleColor('Line_Left')) end } } From f550b00f93b3b6df70aae10c9b9fe44320c8865d Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 15:11:21 -0500 Subject: [PATCH 08/17] move cdtitle and stepsdisplay when preview is on when using 4:3 --- .../BGAnimations/ScreenSelectMusic decorations/default.lua | 6 ++++++ .../ScreenSelectMusic decorations/wifeTwirl.lua | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua index 507f0cf294..d0ee07d08e 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -50,6 +50,12 @@ t[#t + 1] = DLMAN:RequestChartLeaderBoardFromOnline(chartkey) end end, + ChartPreviewOnMessageCommand=function(self) + self:addx(capWideScale(12, 0)):addy(capWideScale(18, 0)) + end, + ChartPreviewOffMessageCommand=function(self) + self:addx(capWideScale(-12, 0)):addy(capWideScale(-18, 0)) + end, Def.StepsDisplayList { Name = "StepsDisplayListRow", CursorP1 = Def.ActorFrame { diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua index ae4089b50d..ea4d72b89d 100644 --- a/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua +++ b/Themes/Til Death/BGAnimations/ScreenSelectMusic decorations/wifeTwirl.lua @@ -583,6 +583,12 @@ t[#t + 1] = end, RefreshChartInfoMessageCommand = function(self) self:queuecommand("Set") + end, + ChartPreviewOnMessageCommand=function(self) + self:addx(capWideScale(34,0)) + end, + ChartPreviewOffMessageCommand=function(self) + self:addx(capWideScale(-34,0)) end } From dd02cfa48b57deecfe21c3b26eeb27686a961042 Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 13 Nov 2018 20:27:28 -0600 Subject: [PATCH 09/17] Use MultiVertex instead of 500 Quads to draw the density graph --- .../BGAnimations/_chorddensitygraph.lua | 109 ++++++++++-------- 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/Themes/Til Death/BGAnimations/_chorddensitygraph.lua b/Themes/Til Death/BGAnimations/_chorddensitygraph.lua index d601155e0a..ae9b03a0c7 100644 --- a/Themes/Til Death/BGAnimations/_chorddensitygraph.lua +++ b/Themes/Til Death/BGAnimations/_chorddensitygraph.lua @@ -1,3 +1,4 @@ +local cdg -- hurrrrr nps quadzapalooza -mina local imcrazy = 500 @@ -16,46 +17,67 @@ local function textmover(self) end end -local function updateGraph(self) - local steps = GAMESTATE:GetCurrentSteps(PLAYER_1) +local function makeABar(vertices, x, y, barWidth, barHeight, prettycolor) + vertices[#vertices + 1] = {{x,y-barHeight,0},prettycolor} + vertices[#vertices + 1] = {{x-barWidth,y-barHeight,0},prettycolor} + vertices[#vertices + 1] = {{x-barWidth,y,0},prettycolor} + vertices[#vertices + 1] = {{x,y,0},prettycolor} +end + +local function getColorForDensity(density) + if density == 1 then + return color(".75,.75,.75") -- nps color + elseif density == 2 then + return color(".5,.5,.5") -- jumps color + elseif density == 3 then + return color(".25,.25,.25") -- hands color + else + return color(".1,.1,.1") -- quads color + end +end + +local function updateGraphMultiVertex(parent, realgraph) + local steps = GAMESTATE:GetCurrentSteps(PLAYER_1) if steps then - local groot = steps:GetCDGraphVectors() - if groot == nil then - for j=1,4 do - for i=1,imcrazy do - self:GetChild(i..j):visible(false) - end - end - return + local graphVectors = steps:GetCDGraphVectors() + if graphVectors == nil then + -- reset everything if theres nothing to show + realgraph:SetVertices({}) + realgraph:SetDrawState( {Mode = "DrawMode_Quads", First = 0, Num = 0} ) + realgraph:visible(false) + return end - - local moot = groot[1] - local thingers = math.min(imcrazy,#moot) - local wid = wodth/thingers + + local npsVector = graphVectors[1] -- refers to the cps vector for 1 (tap notes) + local numberOfColumns = math.min(imcrazy,#npsVector) + local columnWidth = wodth/numberOfColumns + + -- set height scale of graph relative to the max nps local hodth = 0 - for i=1,#moot do - if moot[i] * 2 > hodth then - hodth = moot[i] * 2 + for i=1,#npsVector do + if npsVector[i] * 2 > hodth then + hodth = npsVector[i] * 2 end end - self:GetChild("npsline"):y(-hidth * 0.7) - self:GetChild("npstext"):settext(hodth/2 * 0.7 .. "nps"):y(-hidth * 0.9) + parent:GetChild("npsline"):y(-hidth * 0.7) + parent:GetChild("npstext"):settext(hodth / 2 * 0.7 .. "nps"):y(-hidth * 0.9) hodth = hidth/hodth - for j=1,4 do - for i=1,imcrazy do - if i <= thingers then - if groot[j][i] > 0 then - self:GetChild(i..j):x(i * wid):zoomto(wid,groot[j][i]*2*hodth) - self:GetChild(i..j):visible(true) - else - self:GetChild(i..j):visible(false) + local verts = {} -- reset the vertices for the graph + local yOffset = 0 -- completely unnecessary, just a Y offset from the graph + for density = 1,4 do + for column = 1,imcrazy do + if column <= numberOfColumns then + if graphVectors[density][column] > 0 then + local barColor = getColorForDensity(density) + makeABar(verts, column * columnWidth, yOffset, columnWidth, graphVectors[density][column] * 2 * hodth, barColor) end - else - self:GetChild(i..j):visible(false) end end end + + realgraph:SetVertices(verts) + realgraph:SetDrawState( {Mode = "DrawMode_Quads", First = 1, Num = #verts} ) end end @@ -63,15 +85,11 @@ local t = Def.ActorFrame { Name = "ChordDensityGraph", InitCommand=function(self) self:SetUpdateFunction(textmover) + cdg = self end, DelayedChartUpdateMessageCommand = function(self) self:queuecommand("GraphUpdate") end, - GraphUpdateCommand = function(self) - if self:GetVisible() then - updateGraph(self) - end - end, Def.Quad { Name = "cdbg", InitCommand = function(self) @@ -80,22 +98,15 @@ local t = Def.ActorFrame { } } -local function makeaquad(i,n, col) - local o = Def.Quad { - Name = i..n, - InitCommand = function(self) - self:zoomto(20, 0):valign(1):diffuse(color(col)):halign(1) - end, +t[#t+1] = + Def.ActorMultiVertex { + Name = "CDGraphDrawer", + GraphUpdateCommand = function(self) + if self:GetVisible() then + updateGraphMultiVertex(cdg, self) + end + end } - return o -end - -for i=1,imcrazy do - t[#t + 1] = makeaquad(i,1, ".75,.75,.75") -- nps - t[#t + 1] = makeaquad(i,2, ".5,.5,.5") -- jumps - t[#t + 1] = makeaquad(i,3, ".25,.25,.25") -- hands - t[#t + 1] = makeaquad(i,4, ".1,.1,.1") -- quads -end -- down here for draw order t[#t + 1] = Def.Quad { From df7c12b57f5120c4504a27987dec0f5f3e94bdd8 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 21:45:06 -0500 Subject: [PATCH 10/17] ranger looper --- src/NoteDisplay.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/NoteDisplay.cpp b/src/NoteDisplay.cpp index bf948f03be..409d67f6dd 100644 --- a/src/NoteDisplay.cpp +++ b/src/NoteDisplay.cpp @@ -734,14 +734,9 @@ NoteDisplay::Update(float fDeltaTime) { /* This function is static: it's called once per game loop, not once per * NoteDisplay. Update each cached item exactly once. */ - map>::iterator it2; - map::iterator it; - for (it2 = g_NoteResource.begin(); it2 != g_NoteResource.end(); it2++) { - for (it = it2->second.begin(); it != it2->second.end(); it++) { - NoteResource* pRes = it->second; - pRes->m_pActor->Update(fDeltaTime); - } - } + for (auto& c : g_NoteResource) + for (auto& a : c.second) + a.second->m_pActor->Update(fDeltaTime); } void From 5c0fed2e8c798c8f818632758daa1eec397831ae Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Tue, 13 Nov 2018 21:46:44 -0500 Subject: [PATCH 11/17] clarity for posterity --- Themes/Til Death/BGAnimations/_chorddensitygraph.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Themes/Til Death/BGAnimations/_chorddensitygraph.lua b/Themes/Til Death/BGAnimations/_chorddensitygraph.lua index ae9b03a0c7..80fc8ab849 100644 --- a/Themes/Til Death/BGAnimations/_chorddensitygraph.lua +++ b/Themes/Til Death/BGAnimations/_chorddensitygraph.lua @@ -1,7 +1,6 @@ local cdg -- hurrrrr nps quadzapalooza -mina -local imcrazy = 500 local wodth = capWideScale(280, 300) local hidth = 40 local txtoff = 10 @@ -49,7 +48,7 @@ local function updateGraphMultiVertex(parent, realgraph) end local npsVector = graphVectors[1] -- refers to the cps vector for 1 (tap notes) - local numberOfColumns = math.min(imcrazy,#npsVector) + local numberOfColumns = #npsVector local columnWidth = wodth/numberOfColumns -- set height scale of graph relative to the max nps @@ -66,13 +65,11 @@ local function updateGraphMultiVertex(parent, realgraph) local verts = {} -- reset the vertices for the graph local yOffset = 0 -- completely unnecessary, just a Y offset from the graph for density = 1,4 do - for column = 1,imcrazy do - if column <= numberOfColumns then + for column = 1,numberOfColumns do if graphVectors[density][column] > 0 then local barColor = getColorForDensity(density) makeABar(verts, column * columnWidth, yOffset, columnWidth, graphVectors[density][column] * 2 * hodth, barColor) end - end end end From 6c1790e1b0995f8fabcac8ac590de99c3930da6e Mon Sep 17 00:00:00 2001 From: poco0317 Date: Tue, 13 Nov 2018 21:02:31 -0600 Subject: [PATCH 12/17] Mouse visibility in customize gameplay & replays (fullscreen) --- .../BGAnimations/ScreenGameplay overlay/default.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/default.lua b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/default.lua index 82821bcea2..c1003b51e3 100644 --- a/Themes/Til Death/BGAnimations/ScreenGameplay overlay/default.lua +++ b/Themes/Til Death/BGAnimations/ScreenGameplay overlay/default.lua @@ -1,12 +1,17 @@ -- Everything relating to the gameplay screen is gradually moved to WifeJudgmentSpotting.lua +local inReplay = GAMESTATE:GetPlayerState(PLAYER_1):GetPlayerController() == "PlayerController_Replay" +local inCustomize = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).CustomizeGameplay local t = Def.ActorFrame {} t[#t + 1] = LoadActor("WifeJudgmentSpotting") t[#t + 1] = LoadActor("titlesplash") t[#t + 1] = LoadActor("leaderboard") -if GAMESTATE:GetPlayerState(PLAYER_1):GetPlayerController() == "PlayerController_Replay" then +if inReplay then t[#t + 1] = LoadActor("replayscrolling") end -if playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).CustomizeGameplay then +if inCustomize then t[#t + 1] = LoadActor("messagebox") end +if inReplay or inCustomize then + t[#t + 1] = LoadActor("../_cursor") +end return t From 08798a28d87e24ed98d362c292c8919ea8dbeeac Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Wed, 14 Nov 2018 02:49:13 -0500 Subject: [PATCH 13/17] dont load noteskin resources for every color as far as i can tell the color has no impact on what resource gets loaded, meaning we load the same resources 9x over when we could just refpass them after loading the first group needs investigation? --- src/NoteDisplay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NoteDisplay.cpp b/src/NoteDisplay.cpp index 409d67f6dd..b8ca279b66 100644 --- a/src/NoteDisplay.cpp +++ b/src/NoteDisplay.cpp @@ -217,7 +217,7 @@ MakeNoteResource(const RString& sButton, NOTESKIN->GetCurrentNoteSkin(), sElementAndType, pn, gc); map::iterator it = - g_NoteResource[Color].find(nsap); + g_NoteResource["4th"].find(nsap); // i cant figure out how color changes what actors are loaded... -mina if (it == g_NoteResource[Color].end()) { auto* pRes = new NoteResource(nsap); From db436fa6de1852ff0282f383f6a962b01396f5ad Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Wed, 14 Nov 2018 03:15:20 -0500 Subject: [PATCH 14/17] iterate version tags to 0.62.1 --- CMake/SMDefs.cmake | 2 +- src/GameState.h | 2 +- src/ProductInfo.inc | 2 +- stepmania.nsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake index 0abe50e483..bac18cdd9f 100644 --- a/CMake/SMDefs.cmake +++ b/CMake/SMDefs.cmake @@ -1,7 +1,7 @@ # Set up version numbers according to the new scheme. set(SM_VERSION_MAJOR 0) set(SM_VERSION_MINOR 62) -set(SM_VERSION_PATCH 0) +set(SM_VERSION_PATCH 1) set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}") execute_process(COMMAND git rev-parse --short HEAD diff --git a/src/GameState.h b/src/GameState.h index b83dcda69e..5a1bd55d31 100644 --- a/src/GameState.h +++ b/src/GameState.h @@ -224,7 +224,7 @@ class GameState bool m_bLoadingNextSong; int GetLoadingCourseSongIndex() const; - RString GetEtternaVersion() { return "0.62.0"; } + RString GetEtternaVersion() { return "0.62.1"; } bool isplaylistcourse = false; bool IsPlaylistCourse() { return isplaylistcourse; } bool CountNotesSeparately(); diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc index eb32b562fe..dc58167261 100644 --- a/src/ProductInfo.inc +++ b/src/ProductInfo.inc @@ -6,7 +6,7 @@ !define PRODUCT_ID "Etterna" ; TODO: This needs to be updated with the git rev hash -!define PRODUCT_VER "v0.62.0" +!define PRODUCT_VER "v0.62.1" !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}" !define PRODUCT_BITMAP "ett" diff --git a/stepmania.nsi b/stepmania.nsi index 8efc34446c..2cc46af75b 100644 --- a/stepmania.nsi +++ b/stepmania.nsi @@ -43,7 +43,7 @@ ; don't forget to change this before releasing a new version. ; wish this could be automated, but it requires "X.Y.Z.a" format. -aj - VIProductVersion "0.62.0.0" + VIProductVersion "0.62.1.0" VIAddVersionKey "ProductName" "${PRODUCT_ID}" VIAddVersionKey "FileVersion" "${PRODUCT_VER}" VIAddVersionKey "FileDescription" "${PRODUCT_ID} Installer" From 2c81ea0fa82819ab4a0aadaffffb32300c24d79f Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Wed, 14 Nov 2018 03:21:04 -0500 Subject: [PATCH 15/17] remove -1 diff profile crash assert and replace it with force value set --- src/XMLProfile.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/XMLProfile.cpp b/src/XMLProfile.cpp index c3d4087b11..14eb7ca933 100644 --- a/src/XMLProfile.cpp +++ b/src/XMLProfile.cpp @@ -621,11 +621,12 @@ XMLProfile::SaveEttGeneralDataCreateNode(const Profile* profile) const pGeneralDataNode->AppendChild("SortOrder", SortOrderToString(profile->m_SortOrder)); - ASSERT_M(profile->m_LastDifficulty >= 0, - ssprintf("congrats you just confirmed the cause of a rare " - "non-repdroducible bug. pd: %i", - GAMESTATE->m_pCurSteps[PLAYER_1]->GetDifficulty())); - if (profile->m_LastDifficulty < Difficulty_Invalid) + if (profile->m_LastDifficulty < 0) // force set difficulty to current steps if this is somehow -1 for ??? reasons -mina + pGeneralDataNode->AppendChild( + "LastDifficulty", + DifficultyToString( + GAMESTATE->m_pCurSteps[PLAYER_1]->GetDifficulty())); + else if (profile->m_LastDifficulty < Difficulty_Invalid) pGeneralDataNode->AppendChild( "LastDifficulty", DifficultyToString(profile->m_LastDifficulty)); if (profile->m_LastStepsType != StepsType_Invalid) From 35740aafb581e1beb4c8242359187cd6dc1e8677 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Wed, 14 Nov 2018 07:00:37 -0500 Subject: [PATCH 16/17] splishy splashy --- Data/splash.png | Bin 11032 -> 9261 bytes Themes/_fallback/Graphics/Common splash.png | Bin 11032 -> 9261 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Data/splash.png b/Data/splash.png index afc303bbc2c32a6b64ae7408adce57f4e16043bd..ced5e95e5d17dfec6503580f578712b1236d95e1 100644 GIT binary patch literal 9261 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 literal 11032 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 X>C%ryGkc=P!B-_Yb=fj$v!MS2`S(q< diff --git a/Themes/_fallback/Graphics/Common splash.png b/Themes/_fallback/Graphics/Common splash.png index afc303bbc2c32a6b64ae7408adce57f4e16043bd..ced5e95e5d17dfec6503580f578712b1236d95e1 100644 GIT binary patch literal 9261 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 literal 11032 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 X>C%ryGkc=P!B-_Yb=fj$v!MS2`S(q< From 56aaf5fd397b5a26000a2df4420b51e3b3a56eb3 Mon Sep 17 00:00:00 2001 From: "born a rick, raised a morty, died a jerry" Date: Wed, 14 Nov 2018 07:21:06 -0500 Subject: [PATCH 17/17] /0 hurrrrrrrrrrrrrrrrrrrrrrr --- Themes/Til Death/BGAnimations/offsetplot.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Themes/Til Death/BGAnimations/offsetplot.lua b/Themes/Til Death/BGAnimations/offsetplot.lua index 3d4b294bc1..eb95cc6824 100644 --- a/Themes/Til Death/BGAnimations/offsetplot.lua +++ b/Themes/Til Death/BGAnimations/offsetplot.lua @@ -32,6 +32,7 @@ local handspecific = false local left = false local function fitX(x) -- Scale time values to fit within plot width. + if finalSecond == 0 then return 0 end return x / finalSecond * plotWidth - plotWidth / 2 end