Commit Graph
100 Commits
Author SHA1 Message Date
Mashy ed5575eee8 remove auth from tutorial triggers, game.construct highlight based on time_control 2020-01-20 12:28:32 +10:00
Mashy f51c28a713 tutorial state fixes 2020-01-20 11:33:12 +10:00
Mashy fb40f73ab3 skip tutorial text 2020-01-17 17:31:24 +10:00
Mashy 3767f0dffe add back register tutorial 2020-01-17 17:28:24 +10:00
Mashy 58edf3d5ee remove dev mode tutorial skip 2020-01-17 17:27:42 +10:00
Mashy f52d2e409a Merge branch 'release/1.12.2' of ssh://git.mnml.gg:40022/~/mnml into release/1.12.2 2020-01-17 17:20:49 +10:00
Mashy d11b7dcdb3 tutorial client fixes 2020-01-17 17:20:22 +10:00
Mashy 8e728b77e0 registered accounts tutorial with localstorage, disable instance ready until finish tutorial 2020-01-17 12:55:55 +10:00
Mashy e91cf4d987 invite caption 2020-01-17 10:52:08 +10:00
Mashy 55f8fc0b41 purify fix 2020-01-15 10:49:55 +10:00
Mashy 84b68e2ccc fix blue heal colour (absorb / reflect / recharge) 2020-01-15 10:18:49 +10:00
Mashy de5724de97 cooldown increase single event 2020-01-13 16:45:58 +10:00
Mashy cbc0846f4d Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2020-01-13 16:31:34 +10:00
Mashy 3fc2e75836 cd increase / decrease event 2020-01-13 16:31:06 +10:00
Mashy b45778955f disable stash during tutorial first stage, misc text improvements 2020-01-13 11:35:52 +10:00
Mashy d4b5efcae6 speed description 2020-01-09 15:39:32 +10:00
Mashy 313dac1853 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2020-01-09 15:34:33 +10:00
Mashy cb14b1c50f add delay info to client 2020-01-09 15:34:15 +10:00
Mashy 45b38a73e5 woops 2020-01-09 14:26:40 +10:00
Mashy 5b45d9b5e4 add skill delays 2020-01-09 14:23:40 +10:00
Mashy 9c5b7d0c89 cleanup 2020-01-09 12:24:22 +10:00
Mashy 1bc871c66e set cd 2020-01-09 12:11:11 +10:00
Mashy 4bb622cc4e Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2020-01-09 12:04:28 +10:00
Mashy 41921ad926 speed initial cooldown reduction wip 2020-01-09 12:04:13 +10:00
Mashy 17a80d0e7e wlog 2020-01-08 15:43:11 +10:00
Mashy ebc4b703a6 damage received returns last amount instead of total 2020-01-07 16:05:43 +10:00
Mashy 4f9385e352 electrocute dot immunity 2020-01-06 17:35:22 +10:00
Mashy 133a4929aa fix skill info hover 2020-01-06 17:04:02 +10:00
Mashy b3b9d40262 add cast animation check 2020-01-06 16:53:40 +10:00
Mashy 7a086c6189 Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0 2020-01-03 11:46:56 +10:00
Mashy 2d4f5e0a70 hybrid test 2020-01-03 11:46:19 +10:00
Mashy 5c3a318882 dot speeds are still 0 2019-12-20 15:39:20 +10:00
Mashy 8830378b22 siphon test apply new effect 2019-12-20 15:32:24 +10:00
Mashy c2c9113996 Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0 2019-12-20 13:40:32 +10:00
Mashy 3503c4b864 castable logic 2019-12-20 13:39:20 +10:00
Mashy 122c385f1c Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0 2019-12-20 12:13:19 +10:00
Mashy 550e1123ad cast event for single target fix 2019-12-20 12:12:19 +10:00
Mashy c9acab9def add - for effect removal, anim text clean up 2019-12-20 11:42:54 +10:00
Mashy ecc6eebdbb only trigger wiggle on damage / ko, fixes wiggle issue also 2019-12-20 11:23:53 +10:00
Mashy d307241f75 fix electrocute action order 2019-12-20 11:06:33 +10:00
Mashy 49bf35970b Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0 2019-12-19 18:20:06 +10:00
Mashy 89a09e5ebc link damage fix + test 2019-12-19 18:18:51 +10:00
Mashy 13b8c5b766 ln 2019-12-19 16:23:50 +10:00
Mashy 4c26f911ab move down single hit animation to before cast.resolve() 2019-12-19 16:23:14 +10:00
Mashy a55fd9834a animation construct ko 2019-12-19 15:35:10 +10:00
Mashy e4adb83060 Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0 2019-12-19 15:05:37 +10:00
Mashy 77510c1c8f test fixes 2019-12-19 15:05:10 +10:00
Mashy 8e03564b46 Merge branch 'release/1.11.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.11.0 2019-12-19 14:51:33 +10:00
Mashy 7ff5d9585c add back effects descriptions 2019-12-19 14:03:54 +10:00
Mashy 24b1de7724 fixme 2019-12-19 13:37:40 +10:00
Mashy b26ce047f2 Merge branch 'develop' into release/1.11.0 2019-12-19 13:04:07 +10:00
Mashy 3372595313 construct green power 2019-12-19 13:03:28 +10:00
Mashy f3c0471a80 old combo and spec values 2019-12-19 12:59:08 +10:00
Mashy 669de50fb6 Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-18 17:14:49 +10:00
Mashy 188701da96 slay siphon 2019-12-18 17:14:28 +10:00
Mashy 24b5857d86 sleep fix 2019-12-18 17:03:30 +10:00
Mashy a8ec31fc97 absorption targetting fix 2019-12-18 16:59:18 +10:00
Mashy 375612042d Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-18 16:46:12 +10:00
Mashy 388cf2400c electrocute effect, move decay effect first 2019-12-18 16:44:53 +10:00
Mashy 44fa6b8c6a redo all descriptions monakS 2019-12-17 11:48:41 +10:00
Mashy c1aa592cd5 skill info init 2019-12-16 18:24:06 +10:00
Mashy b630d0b76c group attack skills 2019-12-16 17:34:58 +10:00
Mashy efd82f3cf2 make enum version of all skills for values 2019-12-16 17:24:19 +10:00
Mashy 0ed186cde3 Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-14 05:14:33 +10:00
Mashy b033c719bc decay values enum Pog? 2019-12-14 05:13:38 +10:00
Mashy 46e8da5ba9 sustain test 2019-12-13 11:29:34 +10:00
Mashy 1708e02057 intercept test 2019-12-13 10:24:54 +10:00
Mashy ede867391e multi refl test 2019-12-13 09:17:09 +10:00
Mashy 98bcb88f1c counter against counter shouldn't infinite loop 2019-12-13 08:54:18 +10:00
Mashy 02311680ae Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-12 16:56:35 +10:00
Mashy d9c15273c5 tick speed tests 2019-12-12 16:56:02 +10:00
Mashy 64cce21d4d fix 2019-12-12 16:13:28 +10:00
Mashy 18ba03f777 multi absorb test 2019-12-12 16:12:03 +10:00
Mashy 2ddfcd0a96 purify test 2019-12-12 14:03:26 +10:00
Mashy 5a34bb9435 fix sustain anim 2019-12-11 21:10:04 +10:00
Mashy fb78e7cfae hastestrike / hybridblast 2019-12-11 18:30:12 +10:00
Mashy 168639bbbe client fix 2019-12-11 18:14:16 +10:00
Mashy 79f5e7e1be refactor delay matching logic 2019-12-11 08:25:55 +10:00
Mashy 279ab5795e add back aoe event post merge 2019-12-10 23:24:18 +10:00
Mashy b1cb2cec37 Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-10 22:59:39 +10:00
Mashy 85012943ac Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-10 20:57:53 +10:00
Mashy 5ea22ec4b3 add aoe events cleanup client anim code 2019-12-10 20:57:19 +10:00
Mashy 89fb27d858 fix healing event, remove brackets 2019-12-10 18:38:34 +10:00
Mashy c8561dba9a Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-10 17:49:42 +10:00
Mashy 4fe01c6774 scope block, add warden total resolution delay 2019-12-10 17:49:11 +10:00
Mashy 56bd9890ad fixme 2019-12-09 15:31:07 +10:00
Mashy c5469a651d refactor the delay code 2019-12-09 15:11:14 +10:00
Mashy 994d1c8fb0 remove animCb and animation delays 2019-12-09 12:00:48 +10:00
Mashy d33cda012e fix game construct css classes 2019-12-09 11:18:52 +10:00
Mashy 60587351b5 set cast / hit to full duration if theres no overlap 2019-12-09 10:16:03 +10:00
Mashy 445a641b8d animText -> resolution 2019-12-09 08:57:32 +10:00
Mashy 912b2c9059 event structure clean up 2019-12-09 08:32:56 +10:00
Mashy 22ac2b502e clean up anim functions 2019-12-07 01:31:11 +10:00
Mashy b405608510 set animfocus server side 2019-12-06 20:50:47 +10:00
Mashy 261ab1d48b calculate direction server side 2019-12-06 20:24:14 +10:00
Mashy a6f654fac1 send cast in event, split up cast and hit 2019-12-06 18:09:11 +10:00
Mashy 7afb6e30bd wip 2019-12-06 16:26:50 +10:00
Mashy 517b912c2e add back overlap between anims and combattext 2019-12-06 01:47:08 +10:00
Mashy b8cb296bd6 cleanup add aoe focusTargets 2019-12-06 01:28:17 +10:00
Mashy 9ae52b39ce remove getText anim.utils fn, add ko event as test 2019-12-06 01:19:55 +10:00