Commit Graph
100 Commits
Author SHA1 Message Date
Mashy e29ce1e30c firefox drag 2019-11-04 17:36:04 +10:00
Mashy 64ec68d823 fix recharge immunity bug 2019-11-04 16:35:28 +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 a6473cb84c log 2019-11-04 10:22:44 +10:00
Mashy 18af9fb2c0 worklog 2019-11-04 09:42:20 +10:00
Mashy 5f2e73e373 formatting 2019-10-31 16:08:29 +10:00
Mashy 88194975ac setTutorial false 2019-10-31 16:07:45 +10:00
Mashy 0ce19240f7 increase buff duration 2T->3T 2019-10-31 15:41:20 +10:00
Mashy 1be37161ef info description fix 2019-10-31 15:34:05 +10:00
Mashy b554464802 should comp updates 2019-10-31 11:50:27 +10:00
Mashy d52efc6c01 refactor info.comp 2019-10-31 10:49:43 +10:00
Mashy e4f091b2b8 more description improvements 2019-10-30 18:02:50 +10:00
Mashy ea6936940a 50% slay self heal increase dmg, minor blast nerf 2019-10-30 15:45:59 +10:00
Mashy 31bfffab26 remove inventory hover text again, buff hybridblast / hastestrike dmg 2019-10-30 15:34:58 +10:00
Mashy 2c77d035bd moar haste / hybrid buffs 2019-10-30 14:14:57 +10:00
Mashy 0009e1fb5b tutorial text, vbox hover inventory 2019-10-30 13:17:06 +10:00
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
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 6f5d7338d0 catch null idle case 2019-10-26 21:48:12 +10:00
Mashy dbd06c2053 improved wiggle 2019-10-26 13:33:58 +10:00
Mashy 6948fce6e0 early return fix 2019-10-25 13:10:03 +10:00
Mashy a388a34270 bailout for no stages 2019-10-24 09:01:40 +10:00
Mashy e0cae50cc6 anim cleanup 2019-10-24 08:53:04 +10:00
Mashy d9563f8a9a convert server enum into anims keywords 2019-10-24 08:50:24 +10:00
Mashy e6e7713539 remove inversion event 2019-10-23 19:17:57 +10:00
Mashy a59a13e2e6 Merge branch 'ko-anims' into develop 2019-10-23 16:04:21 +10:00
Mashy c203727d25 fix animation stages 2019-10-23 16:03:33 +10:00
Mashy 14cb075161 fix animCb logic from stalling 2019-10-23 15:49:46 +10:00
Mashy b120fdc08e Merge branch 'develop' into ko-anims 2019-10-23 15:23:35 +10:00
Mashy 2e1b298bbf remove client from deciding event stages wip 2019-10-23 12:08:21 +10:00
Mashy 6371e02672 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-23 11:13:25 +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 8ac1b964b8 changelog 2019-10-23 08:39:40 +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 4edeb6d315 change win text 2019-10-22 14:24:30 +10:00
Mashy 21d55e27b0 add back overflow to body 2019-10-22 14:11:01 +10:00
Mashy c522180366 faceoff text for start, win, lose 2019-10-22 13:15:57 +10:00
Mashy c05ad8637f stop idle construct movement causing overflow 2019-10-22 11:58:00 +10:00
Mashy 7dc22bca90 Merge branch 'home-page-change' of ssh://git.mnml.gg:40022/~/mnml into home-page-change 2019-10-22 11:12:48 +10:00
Mashy 56f3647025 clear mtxActive on nav and if you join game. put shop before reshape 2019-10-22 11:12:25 +10:00
Mashy a304f003d0 added sub back to home, controls on reshape menu 2019-10-22 10:28:28 +10:00
Mashy 0c9c4a7692 add reshape tab, remove mtx from play page 2019-10-22 09:52:24 +10:00
Mashy 36c9236842 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-21 19:41:55 +10:00
Mashy 8e6048b912 fix tick speed bug with new application 2019-10-21 19:40:19 +10:00
Mashy fa1135170b worklog 2019-10-21 10:43:14 +10:00
Mashy fe177df80a improve copy link 2019-10-20 17:31:37 +10:00
Mashy 487bca473e Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-10-20 16:53:03 +10:00
Mashy 97f96a9fa2 misc log 2019-10-20 16:52:50 +10:00
Mashy cf7c3d1ac7 logs 2019-10-20 15:54:45 +10:00
Mashy 53725e1522 proper combiner preview check, clear skill info on anim start 2019-10-20 12:57:56 +10:00
Mashy 8f99e07e81 flash quit / back button 2019-10-18 16:18:33 +10:00
Mashy 0dc272df96 changelog 2019-10-18 15:16:59 +10:00
Mashy 05855af04a siphon & slay have green power scaling 2019-10-18 15:11:57 +10:00
Mashy fb8b4a159c changelog 2019-10-18 13:23:41 +10:00