2836 Commits

Author SHA1 Message Date
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
7d0018c134 wl cleanup 2019-11-21 11:29:07 +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
26c1c49c4e reduce stash size 2019-11-21 10:57:46 +10:00
Mashy
7dc4a3f4f4 vbox rearrange, rework reclaim 2019-11-21 10:42:15 +10:00
ntr
c21d64e3e8 Merge tag '1.9.0' into develop
1.9.0
2019-11-21 11:04:55 +11:00
ntr
816470e879 Merge branch 'release/1.9.0' 2019-11-21 11:04:51 +11:00
ntr
00a7b7fb5b changelog 2019-11-21 11:04:42 +11:00
ntr
7b008f9fea v1.9.0 2019-11-21 10:38:55 +11:00
ntr
1cf49fe7cd Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-21 10:37:51 +11:00
ntr
95c0dcba4d wl 2019-11-21 10:35:23 +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
b6c90661a7 wl 2019-11-20 20:44:24 +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
ntr
e583d2a7ec wl 2019-11-20 15:43:19 +11: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
ntr
40ca99d185 ws gzip 2019-11-20 12:14:37 +11:00
Mashy
10d3f821e3 worklog 2019-11-20 09:13:17 +10:00
Mashy
52d9367e3c don't clear vbox selected on inventory click 2019-11-19 23:11:18 +10:00
Mashy
55f0ceeeec worklog 2019-11-19 23:01:09 +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
2a82666498 check for combine overflow 2019-11-19 13:17:33 +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
5fdabc0f21 don't compile logger on windows 2019-11-18 23:00:58 +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
Mashy
21f66b105e worklog 2019-11-17 21:52:29 +10:00
Mashy
3346d745e5 Merge tag '1.8.5' into develop
1.8.5
2019-11-16 17:07:17 +10:00
Mashy
4d8ca375d1 Merge branch 'release/1.8.5' 2019-11-16 17:07:10 +10:00
Mashy
c799093a94 +x client 2019-11-16 17:06:45 +10:00
Mashy
7ddfa2dcd2 1.8.5 2019-11-16 16:56:44 +10:00
Mashy
f1072ec7c8 changelog 2019-11-16 16:55:48 +10:00