2185 Commits

Author SHA1 Message Date
Mashy
b71cc8fc0f effect descriptions, skill speed in game info, fix block stages 2019-10-17 21:47:55 +10:00
Mashy
38899d31d0 disable hover info during anim 2019-10-17 17:44:05 +10:00
Mashy
b896a7ee42 skill info on hover in effect box 2019-10-17 16:25:31 +10:00
Mashy
b0537d758b changelog 2019-10-17 11:30:00 +10:00
ntr
924a7d40ac Merge tag '1.5.6' into develop
1.5.6
2019-10-17 11:56:03 +11:00
ntr
cf39e006cd Merge branch 'release/1.5.6' 2019-10-17 11:55:47 +11:00
ntr
47d060432c v1.5.6 2019-10-17 11:24:29 +11:00
Mashy
245cb603fc improve check 2019-10-17 09:33:26 +10:00
Mashy
ea5d908893 vbox highlight for combiner 2019-10-16 18:27:06 +10:00
Mashy
03a0953b46 background highlight equip slots 2019-10-16 17:26:03 +10:00
Mashy
c444ae7d78 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours 2019-10-16 16:17:22 +10:00
Mashy
935d1d47ee fix combo highlighting (some rare case like 2 green) 2019-10-16 16:17:02 +10:00
ntr
f2ae3e5212 fade to gray to prevent rainbowing 2019-10-16 16:18:24 +11:00
ntr
f167ff82bb don't double up combo highlight check and make backgrounds so you can always see colours 2019-10-16 16:16:17 +11:00
Mashy
62aa801692 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours 2019-10-16 14:21:02 +10:00
Mashy
5dbdc3762f highlight potential inv combos 2019-10-16 14:20:44 +10:00
ntr
4ed8be2fc0 disable animations on disabled buttons 2019-10-16 12:10:38 +11:00
ntr
66f80629cd pimp siphon 2019-10-16 12:06:22 +11:00
ntr
972923a0c9 Merge branch 'border-colours' of ssh://git.mnml.gg:40022/~/mnml into border-colours 2019-10-16 11:16:18 +11:00
ntr
15cde076de chaos filters 2019-10-16 11:14:31 +11:00
Mashy
1abe4ed08e button borders across the board 2019-10-15 22:06:41 +10:00
ntr
85e13c5922 expo 2019-10-15 17:53:22 +11:00
ntr
b386057326 animate borders 2019-10-15 17:44:05 +11:00
Mashy
b2e4570bfb coloured border experiment 2019-10-15 16:05:58 +10:00
ntr
1c611c31e9 Merge tag '1.5.5' into develop
1.5.5
2019-10-15 12:52:59 +11:00
ntr
0ebe13f2c3 Merge branch 'release/1.5.5' 2019-10-15 12:52:55 +11:00
ntr
b98ab4a6e3 worklog 2019-10-15 12:52:30 +11:00
ntr
cd784a2091 changelog 2019-10-15 12:38:18 +11:00
ntr
27840ea53f v1.5.5 2019-10-15 11:58:54 +11:00
ntr
7cab0a6f18 combo counts 2019-10-15 11:57:57 +11:00
ntr
26054eca73 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into release/1.5.5 2019-10-15 11:45:14 +11:00
ntr
eaf50c3a26 combiner fixes 2019-10-15 11:36:15 +11:00
Mashy
8e03248844 worklog / changelog increase purge cd 2019-10-15 09:40:05 +10:00
Mashy
7d34b1b4ac purge bug fix 2019-10-15 09:09:21 +10:00
ntr
f2a516b5f0 fix few bugs 2019-10-15 10:00:42 +11:00
ntr
349c74c08e Merge tag '1.5.4' into develop
1.5.4
2019-10-10 18:33:49 +11:00
ntr
74f16bc25c Merge branch 'release/1.5.4' 2019-10-10 18:33:41 +11:00
ntr
b86c85476f Merge branch 'develop' into release/1.5.4 2019-10-10 18:25:18 +11:00
ntr
bc203daa69 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-10 18:24:54 +11:00
ntr
dc7e8a91e6 better styles for effects and skills 2019-10-10 18:19:36 +11:00
ntr
d134bc8cf3 better demo 2019-10-10 18:04:25 +11:00
ntr
c9abbf61cf nginx staging auth 2019-10-10 16:50:00 +11:00
ntr
d8adff0203 Merge branch 'tos' into release/1.5.4 2019-10-10 15:33:24 +11:00
ntr
7c81fd1e32 tos html file" 2019-10-10 15:33:18 +11:00
ntr
91f01ff799 update tos html 2019-10-10 15:33:12 +11:00
ntr
5e41789f52 names 2019-10-10 15:07:36 +11:00
ntr
43a53e5651 various pax things 2019-10-10 15:00:45 +11:00
Mashy
4b7eecd4f4 misc var 2019-10-10 13:41:17 +10:00
ntr
a3d5c3a29b random styles 2019-10-10 14:35:43 +11:00
Mashy
2a84ea2caf new tos 2019-10-10 08:33:29 +10:00