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

This commit is contained in:
Mashy
2019-09-04 15:35:00 +10:00
3 changed files with 2 additions and 12 deletions
-10
View File
@@ -4,7 +4,6 @@
* ACP
* essential
* serde serialize privatise
* DO postgres
* mobile styles
* can't reset password without knowing password =\
@@ -13,10 +12,8 @@
* background colour changes depending on time of day
* bug fixes
* pvp 1st player ready up doesn't get put in game
* pvp 1st round doesn't resolve until warden timer completes
* bot game grind
* stress test
@@ -65,12 +62,6 @@ mobile info page
reconnect based on time delta
consolidate game and instance
ah man
the ready screen should totally be
your constructs facing off against the other guy
the chatwheel
and a ready button
*SERVER*
* vbox drops chances
* 50% spec, 25% colour etc
@@ -78,7 +69,6 @@ and a ready button
* mnml tv
## LATER
* chat
* elo + leaderboards
* constants
* change to ownership pattern
+1 -1
View File
@@ -88,7 +88,7 @@ impl Events {
},
Err(e) => {
return Err(format_err!("events error err={:?}", e));
warn!("events error err={:?}", e);
},
};
}
+1 -1
View File
@@ -57,7 +57,7 @@ impl Warden {
},
Err(e) => {
return Err(format_err!("err={:?}", e));
warn!("err={:?}", e);
},
};
}