ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/1.8.4'

Browse Source
This commit is contained in:
Mashy 2019-11-14 23:10:19 +10:00
commit 9418e2cd41
9 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -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

2
VERSION
View File

@ -1 +1 @@
1.8.3
1.8.4

5
WORKLOG.md
View File

@ -6,6 +6,11 @@
* can't reset password without knowing password =\
* ws gzip encoding
* skip faceoff for practice
* concede round
* look into ruin event bug
* Graphics
* Img
* Skill Icons

2
acp/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.8.3",
"version": "1.8.4",
"description": "",
"main": "index.js",
"scripts": {

25
client/changelog.html
View File

@ -731,7 +731,14 @@ pre {
}
}
</style><title>CHANGELOG</title></head><body><article class="markdown-body"><h2>
<a id="user-content-183---2019-11-10" class="anchor" href="#183---2019-11-10" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.3] - 2019-11-10</h2>
<a id="user-content-183---2019-11-14" class="anchor" href="#183---2019-11-14" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.3] - 2019-11-14</h2>
<h3>
<a id="user-content-fixed" class="anchor" href="#fixed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Bug with tutorial introduced in last patch</li>
</ul>
<h2>
<a id="user-content-183---2019-11-13" class="anchor" href="#183---2019-11-13" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.3] - 2019-11-13</h2>
<h3>
<a id="user-content-added" class="anchor" href="#added" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Added</h3>
<ul>
@ -739,7 +746,7 @@ pre {
<li>Condensed recipe display</li>
</ul>
<h3>
<a id="user-content-fixed" class="anchor" href="#fixed" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-1" class="anchor" href="#fixed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Construct display on info / demo page</li>
<li>Case where a skill could send multiple ko events to target</li>
@ -754,7 +761,7 @@ pre {
<li>Purify
<ul>
<li>Now removes all effects on target</li>
<li>Applies "Purified" increasing healing taken</li>
<li>Applies "Pure" increasing healing taken</li>
</ul>
</li>
<li>Purge
@ -766,14 +773,14 @@ pre {
<h2>
<a id="user-content-182---2019-11-10" class="anchor" href="#182---2019-11-10" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.2] - 2019-11-10</h2>
<h3>
<a id="user-content-fixed-1" class="anchor" href="#fixed-1" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-2" class="anchor" href="#fixed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Duplicate button issue in reshape tab</li>
</ul>
<h2>
<a id="user-content-181---2019-11-09" class="anchor" href="#181---2019-11-09" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.8.1] - 2019-11-09</h2>
<h3>
<a id="user-content-fixed-2" class="anchor" href="#fixed-2" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-3" class="anchor" href="#fixed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>An issue where skills would not be put on cooldown after being used.</li>
</ul>
@ -1070,7 +1077,7 @@ pre {
<h2>
<a id="user-content-165---2019-10-25" class="anchor" href="#165---2019-10-25" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.5] - 2019-10-25</h2>
<h3>
<a id="user-content-fixed-3" class="anchor" href="#fixed-3" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-4" class="anchor" href="#fixed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Stripe being blocked no longer causes unrecoverable error</li>
<li>Automatic ready up is now throttled after abandons</li>
@ -1102,7 +1109,7 @@ pre {
</li>
</ul>
<h3>
<a id="user-content-fixed-4" class="anchor" href="#fixed-4" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-5" class="anchor" href="#fixed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Fixed issue where dots / hots would not trigger when reapplied at a higher speed</li>
<li>Changed layout of home page. UI elements for rerolling construct avatars moved to a separate tab.</li>
@ -1113,7 +1120,7 @@ pre {
<h2>
<a id="user-content-162---2019-10-20" class="anchor" href="#162---2019-10-20" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>[1.6.2] - 2019-10-20</h2>
<h3>
<a id="user-content-fixed-5" class="anchor" href="#fixed-5" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-6" class="anchor" href="#fixed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Combiner bug where it would preview items for different combinations</li>
<li>Skill descriptions are cleared when animations start</li>
@ -1152,7 +1159,7 @@ pre {
</li>
</ul>
<h3>
<a id="user-content-fixed-6" class="anchor" href="#fixed-6" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<a id="user-content-fixed-7" class="anchor" href="#fixed-7" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Fixed</h3>
<ul>
<li>Matchmaking bug where server matches you with yourself</li>
</ul>

2
client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-client",
"version": "1.8.3",
"version": "1.8.4",
"description": "",
"main": "index.js",
"scripts": {

6
client/src/tutorial.utils.jsx
View File

@ -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] = [];

2
ops/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mnml-ops",
"version": "1.8.3",
"version": "1.8.4",
"description": "",
"main": "index.js",
"scripts": {

2
server/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "mnml"
version = "1.8.3"
version = "1.8.4"
authors = ["ntr <ntr@smokestack.io>"]
[dependencies]