Commit Graph
2930 Commits
Author SHA1 Message Date
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 6c0457f8fd preview combo when you've selected 3 items 2019-11-12 13:58:48 +10:00
Mashy 4e627fa34b client side disable shop purchase 2019-11-12 12:32:06 +10:00
Mashy c1d4dd3620 clear comboItem error handling 2019-11-12 12:03:17 +10:00
Mashy 27c562d41b preview item combos in table 2019-11-12 11:39:34 +10:00
ntr 357c38e375 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-11 14:00:33 +11:00
ntr 61a8db708b slamma jamma into instance when you first register 2019-11-11 14:00:23 +11:00
Mashy d43d89adb2 changelog 2019-11-11 12:40:47 +10:00
Mashy eb51cad036 break line for speed description in game phase 2019-11-11 12:37:14 +10: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 6f453c45fc fix demo animation issue 2019-11-10 21:50:25 +10:00
Mashy 6fdff259ec host changelog 2019-11-10 11:21:50 +10:00
Mashy ae48b07da8 Merge tag '1.8.2' into develop
1.8.2
2019-11-10 08:25:39 +10:00
Mashy e7fe53e79f Merge branch 'release/1.8.2' 2019-11-10 08:25:17 +10:00
Mashy 19a1e799c5 changelog 2019-11-10 08:24:19 +10:00
Mashy 7acf060093 1.8.2 2019-11-10 08:13:42 +10:00
Mashy 4c0a9088a1 fix reshape available mtx bug 2019-11-09 15:57:32 +10:00
Mashy dffb4e7221 Merge tag '1.8.1' into develop
1.8.1
2019-11-09 13:53:40 +10:00
Mashy 7e1a9d8585 Merge branch 'release/1.8.1' 2019-11-09 13:53:24 +10:00
ntr 4101f1a7c7 fix button hovers: 2019-11-09 14:06:56 +11:00
ntr 0d727813d5 fix animations with stroke issues 2019-11-09 13:32:25 +11:00
ntr b268c2997e fix opacity % -> float 2019-11-09 13:13:46 +11:00
ntr 5db552c236 fix less imports 2019-11-09 13:06:28 +11:00
ntr fc4c3259a7 Merge branch 'develop' into release/1.8.1 2019-11-09 12:57:53 +11:00
ntr 245c255adc remove extra colour imports 2019-11-09 12:57:39 +11:00
ntr b83627bb7d remove footer 2019-11-09 12:57:32 +11: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 3f21c00a3e faceoff even sizes 2019-11-09 11:48:46 +11: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 86968e1076 changelog 2019-11-08 13:59:04 +10:00
Mashy 7b054340d4 add ko event back but doing it right 2019-11-08 13:01:28 +10:00
Mashy e540128a94 styling improvements for effect text, move down opp avatars on mobile 2019-11-08 12:09:16 +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
Mashy 0d39a84319 skills don't go on cd if they're not really *cast* 2019-11-08 10:57:59 +10:00
Mashy 34598178ca Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-08 10:33:07 +10:00
Mashy 879564ef02 removed before pax changelog mess, cdr line 2019-11-08 10:31:01 +10:00
ntr cc79d4528b changelog 2019-11-08 11:15:33 +11:00
ntr bfff237e85 fix changelog formatting 2019-11-08 11:09:44 +11:00
ntr ba5627b36b Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-08 11:05:20 +11:00
ntr 2cac373afe fixed cooldown bug by filtering all resolved skills and checking for cd 2019-11-08 11:05:05 +11:00
Mashy 542a0916ef tidy up test 2019-11-08 10:04:26 +10:00
Mashy a4b0fc0c4f Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-08 09:59:21 +10:00