2605 Commits

Author SHA1 Message Date
Mashy
39be7b952f don't sort vbox after combine 2019-10-29 18:36:15 +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
8ce7edd841 actually fix curse (anime doesn't seem to reset 'reverse') 2019-10-29 17:32:22 +10:00
Mashy
188ae0de6a vbox demo generate random skill combos, disable part of broken curse anim 2019-10-29 16:11:00 +10:00
Mashy
0c3cd46ce2 speed up the demo 2019-10-29 13:33:24 +10:00
Mashy
75f4c6236a separate out demo tab 2019-10-29 13:05:19 +10:00
Mashy
d665eec8a7 changelog 2019-10-29 12:28:36 +10:00
Mashy
663faa2b24 replace single quotes with double quotes (was causing curse to bug out) 2019-10-29 12:14:20 +10:00
Mashy
a254c1d0a7 client side descriptions, add counterattack anim 2019-10-29 11:49:41 +10:00
Mashy
2617183b33 fix curse animation (wouldn't go off if already cast once) 2019-10-29 11:36:56 +10:00
Mashy
b30c4463fa skill rebalance 2019-10-29 11:31:07 +10:00
Mashy
861cc63682 tidy up descriptions 2019-10-28 22:36:00 +10:00
Mashy
52f6e528e4 targetting arrows update arrow svg state 2019-10-28 21:52:37 +10:00
Mashy
2a10de6756 misc 2019-10-28 21:09:22 +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
cfc1c1ea81 cleanup old files 2019-10-28 19:08:01 +10:00
Mashy
84acb58573 move construct calls into componentDidUpdate, change shouldCompUpdate 2019-10-28 19:01:22 +10:00
Mashy
6a4eb1837d misc 2019-10-28 15:08:22 +10:00
Mashy
7355f0668f targetting arrows shouldUpdate 2019-10-28 15:05:30 +10:00
Mashy
85591ec857 shouldCompUpdate game construct, disable ko event 2019-10-28 14:58:33 +10:00
Mashy
2f391fc85b reclaim text 2019-10-28 14:50:25 +10:00
Mashy
50f1c6fa1b construct name and avatar and $$$ jebaited 2019-10-28 14:23:56 +10:00
Mashy
6da01f879d disable offer during animation, don't set instance to null 2019-10-28 13:50:05 +10:00
Mashy
58678e958e updated phase tag from merge 2019-10-28 13:30:14 +10:00
Mashy
8ad9dfc15f Merge branch 'develop' into tutorial-merged 2019-10-28 13:29:38 +10:00
Mashy
5c80890297 vbox info text 2019-10-28 13:25:28 +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
4331a39f42 Merge branch 'vbox-perf' into tutorial-merged 2019-10-28 12:02:35 +10:00
Mashy
4ddbd4576b refactor, all tutorial code checks for practice mode and first round 2019-10-28 11:45:17 +10:00
Mashy
d97cb9dccc should comp update animations 2019-10-28 11:17:40 +10:00
Mashy
3b55c98dde stringify not actually needed just compare obj refs 2019-10-28 09:20:07 +10:00
Mashy
f188362006 game tutorial text 2019-10-28 09:07:06 +10:00
Mashy
4cf378f644 game phase targeting tutorial, clear arrows on game finish 2019-10-28 08:44:37 +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
0dfe181d52 remove tutorial stage check for reset 2019-10-27 20:22:41 +10:00
Mashy
52e67e49d0 actually reset tutorial (if in prog) 2019-10-27 20:18:49 +10:00
ntr
d8d5528469 Merge branch 'develop' into face-imgs 2019-10-27 21:13:20 +11:00
ntr
7f159f6914 faces 2019-10-27 21:13:15 +11: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
ntr
c18a0f0270 changelog 2019-10-27 14:58:51 +11:00
ntr
620171f464 Merge tag '1.6.6' into develop
1.6.6
2019-10-27 14:57:43 +11:00
ntr
f7426c199b Merge branch 'release/1.6.6' 2019-10-27 14:57:32 +11:00
ntr
45aad71939 changelog 2019-10-27 14:57:27 +11:00