2836 Commits

Author SHA1 Message Date
Mashy
fbae8f71eb only send ko event if theres damage 2019-11-15 11:22:05 +10:00
Mashy
9acb2229a8 line endings 2019-11-14 23:31:09 +10:00
Mashy
2b3b002a0e 1.8.4 html 2019-11-14 23:28:49 +10:00
Mashy
8fab03650a changelog 2019-11-14 23:11:34 +10:00
Mashy
6dd10f4777 Merge tag '1.8.4' into develop
1.8.4
2019-11-14 23:10:29 +10:00
Mashy
9418e2cd41 Merge branch 'release/1.8.4' 2019-11-14 23:10:19 +10:00
Mashy
2f9c608e6b changelog 2019-11-14 21:26:02 +10:00
Mashy
3aafbefa7e changelog 2019-11-14 21:24:32 +10:00
Mashy
94b6f6b18f 1.8.4 2019-11-14 21:23:52 +10:00
Mashy
496c57ea77 hotfix tutorial bits stage bug 2019-11-14 21:21:49 +10:00
Mashy
44ae33d8ea log 2019-11-13 21:15:46 +10:00
ntr
3f18f3628a worklog 2019-11-13 21:56:12 +11:00
ntr
f502bb5756 Merge tag '1.8.3' into develop
1.8.3
2019-11-13 21:52:00 +11:00
ntr
ef790b2f73 Merge branch 'release/1.8.3' 2019-11-13 21:51:55 +11:00
ntr
917b239647 fix double ready 2019-11-13 21:37:53 +11:00
ntr
70f99a6ffd game cancelled 2019-11-13 21:35:52 +11:00
ntr
dfcc281416 Merge branch 'release/1.8.3' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.3 2019-11-13 20:51:46 +11:00
ntr
44f008740e auto ready for learn mode and remove upkeep warnings 2019-11-13 20:51:30 +11:00
ntr
8aee7dc084 purified => pure 2019-11-13 20:23:59 +11:00
Mashy
576244a541 version 2019-11-13 19:10:54 +10:00
Mashy
726981a8de changelog 2019-11-13 19:09:21 +10:00
Mashy
b6ce6a5277 post_resolve 2019-11-13 19:05:10 +10:00
Mashy
c99f189c69 better duplicate ko check 2019-11-13 19:04:25 +10:00
Mashy
7d253ab65d changelog 2019-11-13 16:14:27 +10:00
ntr
c560a347f4 v1.8.3 2019-11-13 17:12:36 +11:00
Mashy
7e79e18107 Merge branch 'round-bits' into develop 2019-11-13 16:11:21 +10:00
Mashy
729e48cee4 fix multiple ko event from cast 2019-11-13 16:08:24 +10:00
Mashy
bb765b86e6 add back line height, remove vbox lineheight 2019-11-13 13:46:41 +10:00
Mashy
6305a96875 fix vbox banging around when you buy stuff / reclaim 2019-11-13 13:35:15 +10:00
ntr
6318e663e6 chain timestamped log to file 2019-11-13 13:12:39 +11:00
ntr
8a654bcee4 write log to file for tail 2019-11-13 13:12:06 +11:00
ntr
3c8aace660 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-13 12:12:17 +11:00
ntr
784c5910a1 update mnml service file for syslog 2019-11-13 12:11:35 +11:00
Mashy
7f8679171c debuff combo order 2019-11-13 11:09:34 +10:00
Mashy
9da45e1bee 30 bits per round 2019-11-13 11:02:14 +10:00
Mashy
f5978e90bd changelog 2019-11-13 10:58:57 +10:00
ntr
ddc75e6ff9 client +x 2019-11-13 11:40:05 +11:00
ntr
42dcf4e2d3 syslog chain instead of json 2019-11-13 11:35:58 +11:00
Mashy
ef4d3e57dc big info text, bring back hover 2019-11-12 22:29:59 +10:00
Mashy
e31acf96c6 group colours together in table, fix the vertical spacing issue 2019-11-12 22:01:56 +10:00
ntr
abdaa5fd56 fix debuff combo ordering 2019-11-12 22:00:34 +11:00
ntr
50b427d012 return bg to rotate prompt 2019-11-12 21:02:47 +11:00
ntr
0c0d422dae Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-12 19:55:00 +11:00
ntr
1e73dd920e combo order 2019-11-12 19:54:54 +11:00
ntr
d3a4f3e615 combo styles 2019-11-12 19:49:07 +11:00
Mashy
58dfc407a8 only highlight first open slot 2019-11-12 18:40:13 +10:00
Mashy
9bcea878ec Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-12 16:42:47 +10:00
Mashy
66263be25f table layout wip 2019-11-12 16:42:33 +10:00
ntr
1d699d1b62 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-12 16:32:28 +11:00
ntr
3ee32b3ef2 pvp leave queue implemented 2019-11-12 16:32:19 +11:00