151 Commits

Author SHA1 Message Date
Mashy
e53983db98 rearrange vbox wip 2019-11-20 21:47:19 +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
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
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
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
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
ntr
62b20bed18 fix vbox 2019-11-06 17:27:48 +11:00
Mashy
ec964de5f0 other key index 2019-11-06 16:20:22 +10:00
Mashy
493aee4df8 index bound fix 2019-11-06 16:14:03 +10:00
Mashy
1902c725ba Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-06 16:04:06 +10:00
Mashy
4cc42e305c combiner fixes 2019-11-06 16:03:39 +10:00
ntr
79f1712864 fix vbox button flashing by adding key to mapped btns 2019-11-06 16:25:29 +11:00
Mashy
c50bb97aa9 mobile drag fixes 2019-11-06 09:51:58 +10:00
Mashy
48ef08fd2a Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-05 11:46:33 +10:00
Mashy
1c574e1dca only clear combiner if 1 item 2019-11-05 11:45:51 +10:00
ntr
06a62ca3ae Merge branch 'develop' into force-landscape 2019-11-05 12:35:27 +11:00
ntr
ce967109fb remove old hammer and swiping code 2019-11-05 12:24:41 +11:00
ntr
707b3c6217 change wheel 2019-11-04 22:08:54 +11:00
Mashy
d4169e86c3 clear drag on end 2019-11-04 18:19:32 +10:00
Mashy
e29ce1e30c firefox drag 2019-11-04 17:36:04 +10:00
Mashy
bb50037e0e drag equipped items 2019-11-04 16:02:48 +10:00
Mashy
61b57827e3 label 2019-11-04 15:09:58 +10:00
Mashy
6f578f0747 init 2019-11-04 14:33:06 +10:00
Mashy
31bfffab26 remove inventory hover text again, buff hybridblast / hastestrike dmg 2019-10-30 15:34:58 +10:00
Mashy
0009e1fb5b tutorial text, vbox hover inventory 2019-10-30 13:17:06 +10:00
Mashy
83a87a64e3 add inventory info hover if you have 1 or less items in inventory 2019-10-29 17:49:32 +10:00
Mashy
f961f8485d remove info from vbox 2019-10-28 21:01:57 +10:00
Mashy
a6cd2a3e0a tutorial disable check, info formatting 2019-10-28 20:58:44 +10:00
Mashy
5e41d92e15 keep info as vbox selected if base item 2019-10-28 13:06:09 +10:00
Mashy
5e137af159 default general notes for vbox 2019-10-28 12:53:36 +10:00
Mashy
6f5cf8bb39 misc 2019-10-28 12:25:26 +10:00
Mashy
5dacda76dc Merge branch 'info-rework' into tutorial-merged 2019-10-28 12:13:19 +10:00
Mashy
3b55c98dde stringify not actually needed just compare obj refs 2019-10-28 09:20:07 +10:00
Mashy
69a361a23b remove null info, don't set info to null. click into combos for preview. preview base when combining 2019-10-28 00:33:52 +10:00
Mashy
c534f973a1 add shouldComponentUpdate to vbox components 2019-10-27 22:59:59 +10:00
Mashy
200482dd79 button css, only update info component when info or tutorial changes 2019-10-27 22:13:23 +10:00
Mashy
29c4bfe891 clean up abandon and reset tutorial if in progress 2019-10-27 20:10:47 +10:00
Mashy
bb94e43ca1 tutorial init 2019-10-27 19:05:55 +10:00