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 |
|
Mashy
|
bd518e1613
|
fix background highlighted on dbl click
|
2019-10-23 11:13:09 +10:00 |
|
Mashy
|
9590f1668d
|
Plus -> + for specs
|
2019-10-23 09:06:49 +10:00 |
|
Mashy
|
1ec43cd6b0
|
add inventory tutorial step
|
2019-10-23 08:26:15 +10:00 |
|
Mashy
|
ec3a2a0ce5
|
highlight colours for noobs
|
2019-10-22 20:07:33 +10:00 |
|
Mashy
|
53725e1522
|
proper combiner preview check, clear skill info on anim start
|
2019-10-20 12:57:56 +10:00 |
|
Mashy
|
06897e0e43
|
safety in case null combo (shouldn't happen anyway)
|
2019-10-18 09:37:58 +10:00 |
|
Mashy
|
85497bfbf2
|
preview combiner
|
2019-10-18 09:30:01 +10:00 |
|
Mashy
|
245cb603fc
|
improve check
|
2019-10-17 09:33:26 +10:00 |
|
Mashy
|
ea5d908893
|
vbox highlight for combiner
|
2019-10-16 18:27:06 +10:00 |
|
Mashy
|
935d1d47ee
|
fix combo highlighting (some rare case like 2 green)
|
2019-10-16 16:17:02 +10: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
|
5dbdc3762f
|
highlight potential inv combos
|
2019-10-16 14:20:44 +10:00 |
|
Mashy
|
1abe4ed08e
|
button borders across the board
|
2019-10-15 22:06:41 +10: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
|
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
|
0d3c4374ba
|
swiping pog
|
2019-09-24 13:49:34 +10:00 |
|
ntr
|
c22c09a87b
|
greatly simplify recipes
|
2019-09-06 17:29:09 +10:00 |
|