1541 Commits

Author SHA1 Message Date
Mashy
74f47e7cb5 Merge branch 'vbox-layout' into new-vbox-combiner 2019-11-24 15:50:26 +10:00
Mashy
a9faec1d4e group info and combiner css together 2019-11-24 13:08:28 +10:00
Mashy
6ce43884c9 clear vbox state variables on game leave 2019-11-24 12:42:27 +10:00
Mashy
775d902184 always show itemUnequip in info pane 2019-11-24 12:36:22 +10:00
Mashy
4e9edd241c unselect equipped skills & specs 2019-11-24 12:14:56 +10:00
Mashy
1b760a2893 fade invalid combo selections 2019-11-24 11:51:02 +10:00
Mashy
024637c65d disable store drag 2019-11-24 10:49:57 +10:00
Mashy
16af4da249 move combiner into info (clear buy/combine) on combo hover 2019-11-23 21:05:17 +10:00
Mashy
8641e74f9b fix combo preview 2019-11-23 20:24:15 +10:00
Mashy
b9e4eca8cf vbox info always what selected prio full combo > bases > colour 2019-11-23 19:53:06 +10:00
Mashy
9b6bf4442e default button styling 60% width 2019-11-23 17:20:43 +10:00
Mashy
34f790caa3 moved combiner wip 2019-11-23 17:03:04 +10:00
Mashy
637d3e5be8 combiner new line 2019-11-22 15:46:49 +10:00
ntr
3a0692a2a5 resize stuff 2019-11-22 16:36:11 +11:00
ntr
2d3c6cd18c SIX size stash 2019-11-22 16:26:43 +11:00
Mashy
af803efe4f targetting arrows for mobile 2019-11-22 15:02:42 +10:00
ntr
d4f2f9623f wi 2019-11-22 13:00:57 +11:00
Mashy
69be938e76 shop / vbox -> store 2019-11-22 10:34:50 +10:00
Mashy
a353dcca95 inventory -> stash 2019-11-22 10:06:39 +10:00
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
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
85592b1516 breakout combiner / inv / store into separate files 2019-11-21 15:02:07 +10:00
Mashy
ef9ef0b604 new layout combiner bottom 2019-11-21 13:19:07 +10: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
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