1048 Commits

Author SHA1 Message Date
ntr
2b1843ddb7 styles 2019-11-24 19:02:22 +11:00
Mashy
754f3e0025 length clarify 2019-11-23 20:27:11 +10:00
Mashy
f0ea19940f stash length fix (buy 3 item full combo from vbox) 2019-11-23 20:26:45 +10:00
ntr
2d3c6cd18c SIX size stash 2019-11-22 16:26:43 +11:00
Mashy
26c1c49c4e reduce stash size 2019-11-21 10:57:46 +10:00
Mashy
eb35bea7c6 Merge branch 'vbox-combine' into develop 2019-11-20 18:47:55 +10:00
ntr
8e6561499a concede game round 2019-11-20 12:39:09 +11:00
ntr
40ca99d185 ws gzip 2019-11-20 12:14:37 +11:00
Mashy
2a82666498 check for combine overflow 2019-11-19 13:17:33 +10:00
Mashy
2ba8a63d81 buy/combine from vbox wip 2019-11-19 13:09:50 +10:00
Mashy
0d08536837 add vbox indicies as a combine param 2019-11-19 10:35:45 +10:00
Mashy
5fdabc0f21 don't compile logger on windows 2019-11-18 23:00:58 +10:00
Mashy
7ddfa2dcd2 1.8.5 2019-11-16 16:56:44 +10:00
Mashy
fbae8f71eb only send ko event if theres damage 2019-11-15 11:22:05 +10:00
Mashy
94b6f6b18f 1.8.4 2019-11-14 21:23:52 +10: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
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
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
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
784c5910a1 update mnml service file for syslog 2019-11-13 12:11:35 +11:00
Mashy
9da45e1bee 30 bits per round 2019-11-13 11:02:14 +10:00
ntr
42dcf4e2d3 syslog chain instead of json 2019-11-13 11:35:58 +11:00
ntr
abdaa5fd56 fix debuff combo ordering 2019-11-12 22:00:34 +11:00
ntr
1e73dd920e combo order 2019-11-12 19:54:54 +11:00
ntr
3ee32b3ef2 pvp leave queue implemented 2019-11-12 16:32:19 +11:00
ntr
de82a21baa fix account err text 2019-11-12 15:21:37 +11:00
ntr
1824363de1 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-12 15:20:25 +11:00
ntr
87bc63e648 password changes, account name restrictions 2019-11-12 15:20:02 +11:00
Mashy
27c562d41b preview item combos in table 2019-11-12 11:39:34 +10:00
ntr
61a8db708b slamma jamma into instance when you first register 2019-11-11 14:00:23 +11:00
Mashy
1a2d2995cc add "Purified" effect to Purify 2019-11-11 12:34:14 +10:00
Mashy
8eaa3dc1c0 amplify no longer increases green power 2019-11-11 12:09:33 +10:00
Mashy
d77dd00e01 add skill to removal event 2019-11-11 12:07:15 +10:00
Mashy
ab7625def0 purge / purify removes all effects 2019-11-11 11:58:29 +10:00
Mashy
7acf060093 1.8.2 2019-11-10 08:13:42 +10:00
Mashy
bc289e4e7c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.1 2019-11-09 11:31:40 +10:00
Mashy
634ff99c7d v1.8.1 2019-11-09 11:12:07 +10:00
ntr
99c1efc201 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-09 10:54:00 +11:00
ntr
e544ed2168 faceoff text alignment 2019-11-09 10:53:57 +11:00
Mashy
7b054340d4 add ko event back but doing it right 2019-11-08 13:01:28 +10:00
Mashy
35062db799 don't send immune events when targetko 2019-11-08 11:57:12 +10:00
Mashy
865abb2366 actually push cd fix 2019-11-08 10:58:32 +10:00