Commit Graph
2802 Commits
Author SHA1 Message Date
Mashy 05855af04a siphon & slay have green power scaling 2019-10-18 15:11:57 +10:00
ntr c0be03f0e3 don't internal error msg spam 2019-10-18 16:08:05 +11:00
ntr 65bc2ac729 v1.6.0 2019-10-18 15:53:46 +11:00
ntr aa5b76551f fix game btns 2019-10-18 15:51:45 +11:00
ntr daa1b6214b Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-18 15:43:19 +11:00
ntr 4b216775cd game btns 2019-10-18 15:43:08 +11:00
ntr ddca205f0c chat wheelu 2019-10-18 15:38:40 +11:00
Mashy fb8b4a159c changelog 2019-10-18 13:23:41 +10:00
Mashy 1a0f427715 worklog 2019-10-18 10:24:08 +10:00
Mashy 8753d97650 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-18 10:09:46 +10:00
Mashy b54c394316 mobile description text 2019-10-18 10:09:02 +10:00
Mashy 06897e0e43 safety in case null combo (shouldn't happen anyway) 2019-10-18 09:37:58 +10:00
Mashy 85497bfbf2 preview combiner 2019-10-18 09:30:01 +10:00
ntr 189d1023c6 remove nav 2019-10-18 10:16:20 +11:00
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
ntr 3104c841df chat wip 2019-10-17 15:14:38 +11:00
ntr 057ea9b528 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-17 13:54:46 +11:00
ntr dd1085a6d4 redact game and instance states 2019-10-17 13:54:30 +11: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