1971 Commits

Author SHA1 Message Date
Mashy
945f0828c1 combo mouseover event 2019-11-22 09:59:35 +10:00
Mashy
b5ade7f012 combo preview styling 2019-11-22 09:56:29 +10:00
Mashy
843c1c6bbe combo preview wip 2019-11-22 01:17:45 +10:00
Mashy
9cd656a99f skill button size 2019-11-22 00:39:35 +10:00
Mashy
c650b74ec9 skill button size 2019-11-22 00:39:22 +10:00
Mashy
28585487c6 game phase cooldown new line, mobile styling 2019-11-22 00:23:53 +10:00
Mashy
0722b194b0 misc styling (actual commit) 2019-11-22 00:18:17 +10:00
Mashy
4d3a837d47 misc styling 2019-11-22 00:17:50 +10:00
Mashy
a3376fb8d2 fix mobile game phase 2019-11-21 18:05:46 +10:00
Mashy
8e83d0aa0b instance cleanup 2019-11-21 16:55:04 +10:00
Mashy
05112fbf7e remove instance mobile style file 2019-11-21 16:31:19 +10:00
Mashy
54743c67ba styling 2019-11-21 15:57:25 +10:00
Mashy
85592b1516 breakout combiner / inv / store into separate files 2019-11-21 15:02:07 +10:00
Mashy
33420e4231 default button padding (was 6px default) on chrome 2019-11-21 14:22:05 +10:00
Mashy
1735087321 mobile styling 2019-11-21 14:03:59 +10:00
Mashy
ef9ef0b604 new layout combiner bottom 2019-11-21 13:19:07 +10:00
ntr
4733704d48 v1.9.1 2019-11-21 12:47:18 +11:00
ntr
cebf172024 changelog generated 2019-11-21 12:45:58 +11:00
ntr
7d62f468cd Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-21 12:42:34 +11:00
Mashy
35c74ee325 buycount bugfix 2019-11-21 11:41:08 +10:00
ntr
b0a8684482 change tutorial text to show it's not over 2019-11-21 12:39:36 +11:00
Mashy
a5d778475e fix buycount combo bug 2019-11-21 11:36:06 +10:00
Mashy
5cb9f6ebd0 wl remove duplicate vbox hoverFn 2019-11-21 11:19:33 +10:00
Mashy
917858174c delete "reclaim" & "vboxHighlight" state variables 2019-11-21 11:10:34 +10:00
Mashy
7dc4a3f4f4 vbox rearrange, rework reclaim 2019-11-21 10:42:15 +10:00
ntr
7b008f9fea v1.9.0 2019-11-21 10:38:55 +11:00
Mashy
3dddf4b1a8 wip 2019-11-20 23:07:44 +10:00
Mashy
e53983db98 rearrange vbox wip 2019-11-20 21:47:19 +10:00
Mashy
eb35bea7c6 Merge branch 'vbox-combine' into develop 2019-11-20 18:47:55 +10:00
Mashy
b6553d89c4 tutorial text fix 2019-11-20 18:47:22 +10:00
Mashy
19072926e6 bits check on combine 2019-11-20 16:42:10 +10:00
Mashy
9ee1c166f3 don't set info to colours when combining 2019-11-20 16:38:28 +10:00
Mashy
ec8697aba1 combiner / single item buy cost preview 2019-11-20 16:31:25 +10:00
Mashy
eb3d42ea58 validVboxSelect for vbox and inventory 2019-11-20 15:59:03 +10:00
Mashy
b570bfaad0 vbox selecting 2019-11-20 13:55:54 +10:00
Mashy
af99883ced remove combiner, vboxSelected fields "shopSelect & stashSelect" 2019-11-20 13:45:59 +10:00
Mashy
e35c688cff Combine vboxselect and combiner. Remove itemEquip and dblclick. 2019-11-20 13:24:57 +10:00
ntr
8e6561499a concede game round 2019-11-20 12:39:09 +11:00
Mashy
52d9367e3c don't clear vbox selected on inventory click 2019-11-19 23:11:18 +10:00
Mashy
73b6d0f321 clear selected items on new selections, reclaim doesn't turn combine red 2019-11-19 22:13:00 +10:00
Mashy
5c0a76b9a6 clear vboxselect and combiner on unequip select && highlight unequip 2019-11-19 21:40:14 +10:00
Mashy
2ba8a63d81 buy/combine from vbox wip 2019-11-19 13:09:50 +10:00
Mashy
f2add9a836 vbox bits check 2019-11-19 12:08:52 +10:00
Mashy
604a604c01 vbox selected more wip 2019-11-19 12:06:08 +10:00
Mashy
33152e54d5 select vbox multiple wip 2019-11-19 11:35:30 +10:00
Mashy
0d08536837 add vbox indicies as a combine param 2019-11-19 10:35:45 +10:00
Mashy
f850a8806b mouseover 2019-11-19 10:30:00 +10:00
Mashy
2c14cfc494 lock info when vbox / inv items selected 2019-11-18 23:58:48 +10:00
Mashy
f66be37f8a unselect vbox item 2019-11-17 22:00:08 +10:00
Mashy
424c78b30d remove focus highlighting 2019-11-17 21:53:59 +10:00