Commit Graph
1847 Commits
Author SHA1 Message Date
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 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 eaf50c3a26 combiner fixes 2019-10-15 11:36:15 +11:00
ntr f2a516b5f0 fix few bugs 2019-10-15 10:00:42 +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 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 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
Mashy d8ff256735 terms of service, pop up new html 2019-10-09 15:42:50 +10:00
ntr 68ff78efb1 Merge branch 'develop' into release/1.5.4 2019-10-09 13:21:09 +11:00
ntr 60f767185d fix swipe issue 2019-10-09 13:21:04 +11:00
Mashy d339d19bb9 nerf recharge / absorb 2019-10-09 11:20:12 +10:00
ntr a99535ed7e manifest orientation remove 2019-10-09 10:31:16 +11:00
ntr 14e55d41ba v1.5.4 2019-10-09 10:31:04 +11:00
ntr 681162980f logrocket accounts 2019-10-09 08:35:05 +11:00
ntr 751967d048 player styles 2019-10-08 21:10:56 +11:00
ntr a28898cd82 mobile menu fixes 2019-10-08 16:05:42 +11:00
ntr 15fc22fd68 menu fixes 2019-10-08 15:53:37 +11:00
ntr cf05487c6d good shit 2019-10-08 15:51:05 +11:00
ntr 7437111cac flat colour siphon 2019-10-08 15:32:56 +11:00
ntr 9e2d8a9607 Merge branch 'develop' into release/1.5.3 2019-10-08 14:42:51 +11:00
Mashy 6978a424d9 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-08 13:35:57 +10:00
Mashy e93b56541f timing sync fixes, block timer during animation, remove timeout for POST_ONLY 2019-10-08 13:35:39 +10:00
ntr e309af2d0e v1.5.3 2019-10-08 14:04:35 +11:00
ntr a259016a0d calc bottom 2019-10-08 13:20:44 +11:00
ntr 38bd94875d absolutely position the game yolo 2019-10-08 12:59:08 +11:00
ntr 9c1f0ba9e9 position absolute game 2019-10-08 12:52:22 +11:00
ntr 8a41778c9d borders for mobile 2019-10-08 12:09:44 +11:00
Mashy 14bc1819ed Merge remote-tracking branch 'origin/pax' into develop 2019-10-08 11:08:26 +10:00