Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop
This commit is contained in:
commit
2dc90db185
10
WORKLOG.md
10
WORKLOG.md
@ -4,7 +4,6 @@
|
|||||||
* ACP
|
* ACP
|
||||||
* essential
|
* essential
|
||||||
* serde serialize privatise
|
* serde serialize privatise
|
||||||
* DO postgres
|
|
||||||
* mobile styles
|
* mobile styles
|
||||||
* can't reset password without knowing password =\
|
* can't reset password without knowing password =\
|
||||||
|
|
||||||
@ -13,10 +12,8 @@
|
|||||||
* background colour changes depending on time of day
|
* background colour changes depending on time of day
|
||||||
|
|
||||||
* bug fixes
|
* bug fixes
|
||||||
* pvp 1st player ready up doesn't get put in game
|
|
||||||
* pvp 1st round doesn't resolve until warden timer completes
|
* pvp 1st round doesn't resolve until warden timer completes
|
||||||
|
|
||||||
|
|
||||||
* bot game grind
|
* bot game grind
|
||||||
* stress test
|
* stress test
|
||||||
|
|
||||||
@ -65,12 +62,6 @@ mobile info page
|
|||||||
reconnect based on time delta
|
reconnect based on time delta
|
||||||
consolidate game and instance
|
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*
|
*SERVER*
|
||||||
* vbox drops chances
|
* vbox drops chances
|
||||||
* 50% spec, 25% colour etc
|
* 50% spec, 25% colour etc
|
||||||
@ -78,7 +69,6 @@ and a ready button
|
|||||||
* mnml tv
|
* mnml tv
|
||||||
|
|
||||||
## LATER
|
## LATER
|
||||||
* chat
|
|
||||||
* elo + leaderboards
|
* elo + leaderboards
|
||||||
* constants
|
* constants
|
||||||
* change to ownership pattern
|
* change to ownership pattern
|
||||||
|
|||||||
@ -88,7 +88,7 @@ impl Events {
|
|||||||
},
|
},
|
||||||
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return Err(format_err!("events error err={:?}", e));
|
warn!("events error err={:?}", e);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -57,7 +57,7 @@ impl Warden {
|
|||||||
},
|
},
|
||||||
|
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
return Err(format_err!("err={:?}", e));
|
warn!("err={:?}", e);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user