Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop

This commit is contained in:
Mashy
2019-10-21 19:41:55 +10:00
2 changed files with 4 additions and 5 deletions
+2 -2
View File
@@ -4,7 +4,7 @@
*PRODUCTION*
* rename vbox to shop (just for display)
* give the shop and inventory distinct delineation
* give the shop and inventory distinct delineation
* proper victory / lose page instead of just face off (you are the winner or something)
* vbox phase skill list navigator (overlay maybe?)
@@ -38,7 +38,7 @@
* remove names so games/instances are copy
*$$$*
* chatwheel
* instead of red noise, red and black bar gradient
* eth adapter
* illusions
* vaporwave
+2 -3
View File
@@ -66,9 +66,8 @@ function JoinButtons(args) {
<div class="timer-container"></div>
<div class="controls">
{discordBtn}
<div class="flex">
<div>&nbsp;</div>
</div>
<div></div>
<div></div>
<AccountBox />
<div class="instance-ctrl-btns">
<button disabled={true} >Chat</button>