Commit Graph
100 Commits
Author SHA1 Message Date
Mashy 542a0916ef tidy up test 2019-11-08 10:04:26 +10:00
Mashy a4b0fc0c4f Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-08 09:59:21 +10:00
Mashy 905693a415 sleep test 2019-11-08 09:58:51 +10:00
Mashy ff8e3aaa71 more changelog 2019-11-07 19:11:32 +10:00
Mashy 84d00357c3 changelog 2019-11-07 19:06:17 +10:00
Mashy 4514d6c0c2 link rework, description bg 2019-11-07 19:03:36 +10:00
Mashy bbfeb22a3f fix reflect rotation 2019-11-07 18:15:21 +10:00
Mashy 51ca41b218 background color for resolving-skill 2019-11-07 17:52:07 +10:00
Mashy 4cbeab19df unlock game construct size 2019-11-07 17:44:27 +10:00
Mashy bec998ae51 no more NoStages or '' event 2019-11-07 13:24:48 +10:00
Mashy 4173fb2385 descriptions, recharge invert fix 2019-11-07 13:06:19 +10:00
Mashy 558e3be124 invert recharge, fix recharge border 2019-11-07 12:25:13 +10:00
Mashy e01de8273e rework recharge return into vec 2019-11-07 11:34:19 +10:00
Mashy 241467ec48 cleaning up ugly recharge code 2019-11-07 11:23:08 +10:00
Mashy 2792061186 rearrange worklog 2019-11-07 10:32:29 +10:00
Mashy f7b86337d5 changelog 2019-11-07 10:17:31 +10:00
Mashy e90320cc30 Merge branch 'text-background' into develop 2019-11-07 10:09:32 +10:00
Mashy a220529ac7 Merge branch 'release/1.8.0' into develop 2019-11-07 10:09:24 +10:00
Mashy efcc437985 ruin deals dmg to each construct and reduce cd 2019-11-07 10:08:25 +10:00
Mashy e18356a554 text background 2019-11-06 19:02:15 +10:00
Mashy 4b6f3becd2 changelogs 2019-11-06 17:14:20 +10:00
Mashy 9e5bfea0ce remove decay cd, reduce banish cd 2019-11-06 17:11:44 +10:00
Mashy b4a52576d2 hastestrike / hybridblast + triggers (Attack no longer triggers) 2019-11-06 17:08:31 +10:00
Mashy b737d91f58 Amplify increases greenpower 2019-11-06 17:04:40 +10:00
Mashy ec964de5f0 other key index 2019-11-06 16:20:22 +10:00
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
Mashy b3ba8825e4 absorb changes 2019-11-06 13:10:00 +10:00
Mashy 59e1c9673b changelog 2019-11-06 10:58:59 +10:00
Mashy c50bb97aa9 mobile drag fixes 2019-11-06 09:51:58 +10:00
Mashy 439cea1999 Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0 2019-11-05 16:11:24 +10:00
Mashy 3dec7111ec normal mode reduce z-index of avatar (collision with buttons) 2019-11-05 16:11:10 +10:00
Mashy 61f35ef9a9 give 125 mitigation stats by default 2019-11-05 15:04:16 +10:00
Mashy 13bc69628d reudce intercept cd and duration 2019-11-05 13:58:48 +10:00
Mashy 8bce5fd285 fix link 2019-11-05 13:56:43 +10:00
Mashy 2bafc2eac6 skill description font size 2019-11-05 13:29:59 +10:00
Mashy 72dc10c3ea disable tutorial if info is hidden 2019-11-05 12:46:43 +10:00
Mashy 4a67cab2b3 combiner fix 2019-11-05 12:04:02 +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
Mashy 6809e2016b add clear instance back 2019-11-05 11:01:52 +10:00
Mashy 165c0b82a3 vboxUnequipApply aka swap construct items 2019-11-05 10:39:12 +10:00
Mashy e5314a2257 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-05 10:01:25 +10:00
Mashy c4e42457be equip items from vbox 2019-11-05 10:00:40 +10:00
Mashy d4169e86c3 clear drag on end 2019-11-04 18:19:32 +10:00
Mashy 02e739606c Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-04 17:36:55 +10:00
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 4fa13c20c2 misc 2019-11-04 13:25:23 +10:00
Mashy 7b1a6df40b landscape is the way 2019-11-04 10:27:22 +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