ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,920 Commits 4 Branches 0 Tags
77510c1c8f783e4ed1f0458e7c0c7430d1fe2f0e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mashy b62dc53e08 push new empty events vec on resolve phase start 2019-12-05 23:52:50 +10:00
Mashy 70711fd37b cleanup 2019-12-05 23:10:26 +10:00
Mashy 09d95a7cf7 core anims 2019-12-05 22:52:17 +10:00
Mashy e66a4233e8 fix targetting arrows 2019-12-05 18:00:09 +10:00
Mashy da9736256e Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-05 17:26:38 +10:00
Mashy 8630ed873f Merge branch 'develop' into core 2019-12-05 17:26:21 +10:00
Mashy af654cffc2 refactor game.construct 2019-12-05 17:25:54 +10:00
Mashy 8e90e6e0e3 remove tutorialGame from game.construct 2019-12-05 15:55:14 +10:00
Mashy eb12a0a96e Merge tag '1.10.1' into develop 
1.10.1
 2019-12-04 13:45:28 +10:00
Mashy 6b63b4fdfd Merge branch 'release/1.10.1' 2019-12-04 13:45:21 +10:00
Mashy 1b1e3d782d changelog 2019-12-04 13:03:48 +10:00
Mashy 0ea1d4b05e 1.10.1 2019-12-04 13:01:54 +10:00
Mashy 38eda7afac skill value rebalance 2019-12-04 12:59:45 +10:00
Mashy 70db52737f Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-12-04 12:17:41 +10:00
Mashy 66ec4ff5af test fix 2019-12-04 12:17:17 +10:00
Mashy e1f400726b another tweak 2019-12-04 12:01:38 +10:00
Mashy 84ac6db353 power spec rebalance 2019-12-04 11:56:50 +10:00
Mashy 0b5d23c2bf bash purge fix 2019-12-03 10:48:40 +10:00
Mashy 900a9089b1 yolo 3 -> 2 combos 2019-12-02 16:46:02 +10:00
Mashy e661c2501f combos.md 2019-12-02 16:28:17 +10:00
Mashy 677cec24a2 wl 2019-11-29 16:55:52 +10:00
Mashy 3d34d3bbe2 keep item fadeout while full combo is selected 2019-11-29 12:55:01 +10:00
Mashy 798b68cff1 text cleanup 2019-11-29 09:41:09 +10:00
Mashy 75a1c1b3c4 duplicate events on same construct won't move 2019-11-29 00:06:42 +10:00
Mashy 84e3e776ca fixt tutorial 2019-11-28 23:46:07 +10:00
Mashy 500584ab10 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-28 17:49:10 +10:00
Mashy 63028fe297 wip experimenting with values 2019-11-28 16:54:37 +10:00
Mashy e78a502a40 PogU 2019-11-28 15:54:37 +10:00
Mashy 51edec11fd fixed recharge event 2019-11-28 14:54:35 +10:00
Mashy 5e1b63108c move skill into combat text 2019-11-28 12:01:05 +10:00
Mashy d1dd2b30b6 combat text init 2019-11-27 17:00:40 +10:00
Mashy d276edab14 return of the combo preview 2019-11-26 17:30:52 +10:00
Mashy 79f5845e48 comments 2019-11-26 13:32:23 +10:00
Mashy 5153ed07b0 add back shouldComponentUpdates =\ 2019-11-26 13:27:50 +10:00
Mashy 8312b44b2b change info / combos back to functional components with passed down props 2019-11-26 12:03:31 +10:00
Mashy d1649c986b vbox css fix 2019-11-26 11:43:53 +10:00
Mashy f03317da54 wl 2019-11-26 10:49:40 +10:00
Mashy e2444cc988 wl 2019-11-26 10:49:14 +10:00
Mashy c10b68949c should comp update for info / combos 2019-11-26 10:42:06 +10:00
Mashy 86a84cbcea duplicate line 2019-11-25 22:19:48 +10:00
Mashy a50d10185f click clear, match default refund border width 2019-11-25 22:18:04 +10:00
Mashy f4a7ba65eb unlock info size from store/stash divider 2019-11-25 21:46:54 +10:00
Mashy 4dbbb4f38d mobile game styling fix 2019-11-25 20:11:48 +10:00
Mashy 490216fb01 refactoring FeelsAmazingMan 2019-11-25 16:54:51 +10:00
Mashy 74f47e7cb5 Merge branch 'vbox-layout' into new-vbox-combiner 2019-11-24 15:50:26 +10:00
Mashy a9faec1d4e group info and combiner css together 2019-11-24 13:08:28 +10:00