2836 Commits

Author SHA1 Message Date
Mashy
3d34d3bbe2 keep item fadeout while full combo is selected 2019-11-29 12:55:01 +10:00
Mashy
798b68cff1 text cleanup 2019-11-29 09:41:09 +10:00
Mashy
75a1c1b3c4 duplicate events on same construct won't move 2019-11-29 00:06:42 +10:00
Mashy
84e3e776ca fixt tutorial 2019-11-28 23:46:07 +10:00
Mashy
500584ab10 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-28 17:49:10 +10:00
ntr
11ec807ae2 fix highlighting issues 2019-11-28 17:30:06 +10:00
Mashy
63028fe297 wip experimenting with values 2019-11-28 16:54:37 +10:00
ntr
91c82324e2 clean up equipping api 2019-11-28 16:31:37 +10:00
ntr
18126c1b0c change names 2019-11-28 16:01:44 +10:00
Mashy
e78a502a40 PogU 2019-11-28 15:54:37 +10:00
ntr
24951c1442 costs 2019-11-28 15:51:42 +10:00
ntr
4920821ec2 rm free and bound 2019-11-28 15:48:31 +10:00
ntr
33ad4db8f5 server 2019-11-28 15:43:48 +10:00
Mashy
51edec11fd fixed recharge event 2019-11-28 14:54:35 +10:00
Mashy
5e1b63108c move skill into combat text 2019-11-28 12:01:05 +10:00
Mashy
d1dd2b30b6 combat text init 2019-11-27 17:00:40 +10:00
Mashy
d276edab14 return of the combo preview 2019-11-26 17:30:52 +10:00
Mashy
79f5845e48 comments 2019-11-26 13:32:23 +10:00
Mashy
5153ed07b0 add back shouldComponentUpdates =\ 2019-11-26 13:27:50 +10:00
Mashy
8312b44b2b change info / combos back to functional components with passed down props 2019-11-26 12:03:31 +10:00
Mashy
d1649c986b vbox css fix 2019-11-26 11:43:53 +10:00
Mashy
f03317da54 wl 2019-11-26 10:49:40 +10:00
Mashy
e2444cc988 wl 2019-11-26 10:49:14 +10:00
Mashy
c10b68949c should comp update for info / combos 2019-11-26 10:42:06 +10:00
Mashy
86a84cbcea duplicate line 2019-11-25 22:19:48 +10:00
Mashy
a50d10185f click clear, match default refund border width 2019-11-25 22:18:04 +10:00
Mashy
f4a7ba65eb unlock info size from store/stash divider 2019-11-25 21:46:54 +10:00
Mashy
4dbbb4f38d mobile game styling fix 2019-11-25 20:11:48 +10:00
Mashy
490216fb01 refactoring FeelsAmazingMan 2019-11-25 16:54:51 +10:00
ntr
e3b27ae6b2 Merge branch 'construct-box-rework' into develop 2019-11-24 23:41:08 +11:00
ntr
ec10d7f890 fix rotate size 2019-11-24 23:38:31 +11:00
ntr
8a2e8dbab1 that'll do 2019-11-24 23:34:43 +11:00
ntr
4df4f3a785 fix remaining px borders 2019-11-24 23:08:35 +11:00
ntr
8b7003fb32 mobile styles 2019-11-24 22:41:14 +11:00
ntr
046c065bbd big btn 2019-11-24 22:23:22 +11:00
ntr
bbdc89ed7f remove fns 2019-11-24 22:19:39 +11:00
ntr
734132974b info back 2019-11-24 22:17:12 +11:00
ntr
64fc508ae6 combos wip 2019-11-24 22:00:53 +11:00
ntr
c76212b285 combiner 2019-11-24 21:47:29 +11:00
ntr
f1170c6c43 combiner out 2019-11-24 21:39:28 +11:00
ntr
c03a687bba move avatar to middle 2019-11-24 19:14:09 +11:00
ntr
2b1843ddb7 styles 2019-11-24 19:02:22 +11:00
ntr
5f4659b6db Merge branch 'new-vbox-combiner' into new-vbox-resize 2019-11-24 18:20:33 +11:00
ntr
308165b33a Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize 2019-11-24 18:00:14 +11:00
ntr
735df33056 mobile styles 2019-11-24 18:00:05 +11:00
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
aa2f34c64b tone down highlighted item intensity white -> silver 2019-11-24 12:36:31 +10:00
Mashy
775d902184 always show itemUnequip in info pane 2019-11-24 12:36:22 +10:00