From 3f18f3628a832bd845145e5a83a3958545acb2e4 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 13 Nov 2019 21:56:12 +1100 Subject: [PATCH 1/6] worklog --- WORKLOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WORKLOG.md b/WORKLOG.md index 52e0b9c8..2f3463b2 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -6,6 +6,9 @@ * can't reset password without knowing password =\ * ws gzip encoding +* skip faceoff for practice +* concede round + * Graphics * Img * Skill Icons From 44ae33d8ea2dd474abf7af3c95633bdb14394224 Mon Sep 17 00:00:00 2001 From: Mashy Date: Wed, 13 Nov 2019 21:15:46 +1000 Subject: [PATCH 2/6] log --- WORKLOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WORKLOG.md b/WORKLOG.md index 2f3463b2..767c9b4e 100644 --- a/WORKLOG.md +++ b/WORKLOG.md @@ -9,6 +9,8 @@ * skip faceoff for practice * concede round +* look into ruin event bug + * Graphics * Img * Skill Icons From 496c57ea776d8fd2f903cd6a813c0cef39268561 Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 14 Nov 2019 21:21:49 +1000 Subject: [PATCH 3/6] hotfix tutorial bits stage bug --- client/src/tutorial.utils.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/tutorial.utils.jsx b/client/src/tutorial.utils.jsx index b3569b26..e5846b39 100644 --- a/client/src/tutorial.utils.jsx +++ b/client/src/tutorial.utils.jsx @@ -21,7 +21,7 @@ function tutorialVbox(player, store, tutorial) { let stage = tutorial; const { vbox } = player; if (stage === 1) { - if (vbox.bits < 17) { + if (vbox.bits < 29) { stage += 1; } else { vbox.free[0] = vbox.free[0].slice(0, 2); @@ -54,7 +54,7 @@ function tutorialVbox(player, store, tutorial) { } if (stage === 4) { - if (!vbox.free[2][0] || vbox.bits < 12) { + if (!vbox.free[2][0] || vbox.bits < 24) { stage += 1; } else { vbox.free[0] = []; @@ -86,7 +86,7 @@ function tutorialVbox(player, store, tutorial) { } if (stage === 7) { - if (vbox.bits < 13) { + if (vbox.bits < 25) { stage += 1; } else { vbox.free[0] = []; From 94b6f6b18f247239aa1eacd9b97b7a348961821b Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 14 Nov 2019 21:23:52 +1000 Subject: [PATCH 4/6] 1.8.4 --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index fe4e75fb..7b378be3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.3 \ No newline at end of file +1.8.4 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 18b68a3f..44afd85c 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.8.3", + "version": "1.8.4", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 96747156..f8df9997 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.8.3", + "version": "1.8.4", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index 654b3f8e..89b0dd0b 100644 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.8.3", + "version": "1.8.4", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 46acb90a..ca7845d4 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.8.3" +version = "1.8.4" authors = ["ntr "] [dependencies] From 3aafbefa7e08c87e96d4cbf506a8554e035c1443 Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 14 Nov 2019 21:24:32 +1000 Subject: [PATCH 5/6] changelog --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a21137..4c06d28a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -## [1.8.3] - 2019-11-10 +## [1.8.3] - 2019-11-14 +### Fixed +- Bug with tutorial introduced in last patch + +## [1.8.3] - 2019-11-13 ### Added - Preview combos by hovering over recipes - Condensed recipe display From 2f9c608e6bee921446b982dd8cf1bc8569c0ed91 Mon Sep 17 00:00:00 2001 From: Mashy Date: Thu, 14 Nov 2019 21:26:02 +1000 Subject: [PATCH 6/6] changelog --- client/changelog.html | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/client/changelog.html b/client/changelog.html index 68719026..9dfc59eb 100644 --- a/client/changelog.html +++ b/client/changelog.html @@ -731,7 +731,14 @@ pre { } } CHANGELOG

-[1.8.3] - 2019-11-10

+[1.8.3] - 2019-11-14 +

+Fixed

+
    +
  • Bug with tutorial introduced in last patch
    • +
+

+[1.8.3] - 2019-11-13

Added

    @@ -739,7 +746,7 @@ pre {
  • Condensed recipe display

-Fixed

+Fixed
  • Construct display on info / demo page
  • Case where a skill could send multiple ko events to target
    • @@ -754,7 +761,7 @@ pre {
  • Purify
    • Now removes all effects on target
      • -
    • Applies "Purified" increasing healing taken
      • +
    • Applies "Pure" increasing healing taken
  • Purge @@ -766,14 +773,14 @@ pre {

    [1.8.2] - 2019-11-10

    -Fixed

    +Fixed
    • Duplicate button issue in reshape tab

    [1.8.1] - 2019-11-09

    -Fixed

    +Fixed
    • An issue where skills would not be put on cooldown after being used.
    @@ -1070,7 +1077,7 @@ pre {

    [1.6.5] - 2019-10-25

    -Fixed

    +Fixed
    • Stripe being blocked no longer causes unrecoverable error
    • Automatic ready up is now throttled after abandons
      • @@ -1102,7 +1109,7 @@ pre {

    -Fixed

    +Fixed
    • Fixed issue where dots / hots would not trigger when reapplied at a higher speed
    • Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.
      • @@ -1113,7 +1120,7 @@ pre {

      [1.6.2] - 2019-10-20

      -Fixed

      +Fixed
      • Combiner bug where it would preview items for different combinations
      • Skill descriptions are cleared when animations start
        • @@ -1152,7 +1159,7 @@ pre {

      -Fixed

      +Fixed
      • Matchmaking bug where server matches you with yourself