2690 Commits

Author SHA1 Message Date
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
ntr
d5764f0067 draw text change 2019-10-27 14:18:20 +11:00
ntr
343731e7e8 draw fixes and client side showing 2019-10-27 14:12:38 +11:00
ntr
6b6726f3a6 v1.6.6 2019-10-27 13:20:58 +11:00
ntr
e98235f6f9 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-27 13:20:40 +11:00
ntr
4593a5f203 offer draws 2019-10-27 13:20:14 +11:00
ntr
d41ff0d4e8 don't generate source maps 2019-10-27 12:01:04 +11:00
Mashy
6f5d7338d0 catch null idle case 2019-10-26 21:48:12 +10:00
ntr
a8fb019a4e Merge tag '1.6.5' into develop
1.6.5
2019-10-26 16:16:02 +11:00
ntr
03263b2491 Merge branch 'release/1.6.5' 2019-10-26 16:15:55 +11:00
ntr
03c7302019 remove sub rgb for now 2019-10-26 16:14:46 +11:00
ntr
d370709d90 fix name class 2019-10-26 16:13:32 +11:00
ntr
a633e3b297 sub rgb name and stripe fix 2019-10-26 16:06:52 +11:00
ntr
1694a21b9f handle blocked stripe 2019-10-26 15:56:14 +11:00
ntr
f40b6c65b7 Merge branch 'develop' into release/1.6.5 2019-10-26 14:38:12 +11:00
ntr
ac0dc04f0e Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-26 14:37:45 +11:00