Commit Graph
100 Commits
Author SHA1 Message Date
ntr 21903cc27c immunities for initial skill ticks 2019-12-11 18:19:45 +10:00
ntr 424f1a2846 MMerge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-11 18:14:31 +10:00
ntr 8d75c88076 rem comments 2019-12-11 18:14:25 +10:00
ntr 676c63479c move it 2019-12-11 18:05:31 +10:00
ntr 804d3397c7 nuff of that 2019-12-11 18:04:42 +10:00
ntr d3a8690510 fixme 2019-12-11 17:00:50 +10:00
ntr bf3c087155 hastestrike and hybridblast 2019-12-11 16:37:58 +10:00
ntr 5e8d6a62af tick immunities for all 2019-12-11 15:12:51 +10:00
ntr c1655c9496 wip 2019-12-11 14:52:25 +10:00
ntr 18784e59ce siphon test wip 2019-12-11 14:48:59 +10:00
ntr 88237d3e5e tick immunity effects 2019-12-11 14:23:38 +10:00
ntr acd6ae62e0 disables 2019-12-10 22:33:15 +10:00
ntr 2bb9482bc5 reflect 2019-12-10 22:30:09 +10:00
ntr 1739045f2c Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-10 18:49:57 +10:00
ntr a00a3683cb targetko events 2019-12-10 18:49:07 +10:00
ntr 157bca6658 siphon test 2019-12-10 17:00:04 +10:00
ntr 47b92a5b80 invert test 2019-12-10 16:51:31 +10:00
ntr 194373d0a6 remove construct var 2019-12-10 16:19:36 +10:00
ntr 9a5ecd4bd4 bigass stat impl 2019-12-10 16:18:11 +10:00
ntr b365a6c1f1 fix peeker 2019-12-10 15:27:49 +10:00
ntr 0cac570695 goes there 2019-12-10 15:14:49 +10:00
ntr 2a63f26dc6 add to resolutions immediately 2019-12-10 15:12:38 +10:00
ntr 5ad13968d6 stats 2019-12-10 12:25:23 +10:00
ntr e0ee05ca33 ko check 2019-12-10 12:04:30 +10:00
ntr 1c24ab02bc bring in damage trigger casts 2019-12-10 11:48:46 +10:00
ntr 61870b69ac rename stuff 2019-12-09 21:29:03 +10:00
ntr 39957c0380 reorder 2019-12-09 21:13:23 +10:00
ntr 006a670027 resolve flow 2019-12-09 21:12:27 +10:00
ntr a80c398c85 removals 2019-12-09 16:41:20 +10:00
ntr f6465acea0 Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-09 15:52:58 +10:00
ntr c5c6169806 removeall 2019-12-09 15:52:49 +10:00
ntr 3fafad8504 purge 2019-12-09 15:49:31 +10:00
ntr 2eaf0dc6ee Merge branch 'core' of ssh://git.mnml.gg:40022/~/mnml into core 2019-12-09 15:14:13 +10:00
ntr 69692da9de more skills 2019-12-09 15:14:09 +10:00
ntr 2cc7be5b50 more skills impl 2019-12-08 23:09:10 +10:00
ntr f880a2acd7 slay healing tbi 2019-12-08 16:34:06 +10:00
ntr 8b4b3a56e9 put display effects back 2019-12-08 16:17:12 +10:00
ntr b9c754dc02 autobuy merge 2019-12-08 16:09:10 +10:00
ntr 44c541edf8 values 2019-12-08 16:08:14 +10:00
ntr 255131730c fix life and effects 2019-12-07 16:30:32 +10:00
ntr 64a9d8f51f anims nearly back 2019-12-07 16:17:41 +10:00
ntr 168bf81f3e compiles 2019-12-07 14:50:51 +10:00
ntr cc64d21859 nearly 2019-12-07 12:42:57 +10:00
ntr be0bf33753 half merged 2019-12-07 11:47:45 +10:00
ntr e8b725c7bb len 2019-12-07 10:17:44 +10:00
ntr d8d4721a5a cast should go on source 2019-12-06 20:54:20 +10:00
ntr 2100ad678e uhh 2019-12-06 09:43:30 +10:00
ntr 01a5d781bb more skillz 2019-12-06 09:41:57 +10:00
ntr 8dfc9c8bbf fixerup 2019-12-05 16:20:44 +10:00
ntr e48031a2a5 not so bad 2019-12-05 15:30:35 +10:00
ntr db8e30dffb blast 2019-12-05 14:37:24 +10:00
ntr fc721c9ac5 consolidate display construct 2019-12-04 19:25:14 +10:00
ntr d53d14233a hit event 2019-12-04 19:21:43 +10:00
ntr 7c486812f4 bash is back 2019-12-04 18:50:21 +10:00
ntr 9b5261c95a actions wip 2019-12-04 18:11:06 +10:00
ntr 488dc21182 wip, removing immunities 2019-12-04 17:26:05 +10:00
ntr c91c94b656 Merge branch 'develop' into core 2019-12-04 15:36:32 +10:00
ntr bab52f3406 tests pass, adding skills back in 2019-12-04 15:35:19 +10:00
ntr 87ee3afab9 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-12-04 00:19:02 +10:00
ntr b4e5421fd7 fix autobuy 2019-12-04 00:18:53 +10:00
ntr 8cb335fcc7 break stuff 2019-12-03 23:27:06 +10:00
ntr 5446ee19ae cooldown stuff 2019-12-02 17:40:37 +10:00
ntr 4475887410 core init 2019-12-02 16:24:40 +10:00
ntr 9fe9020ac9 skip faceoff serverside 2019-11-29 16:08:09 +10:00
ntr 6c1c411092 Merge tag '1.10.0' into develop
1.10.0
2019-11-29 14:24:41 +10:00
ntr e847ebb177 Merge branch 'release/1.10.0' 2019-11-29 14:24:34 +10:00
ntr 39987d0c9d fix esc actions 2019-11-29 13:49:48 +10:00
ntr 980f03abf6 v1.10.0 2019-11-29 13:06:01 +10:00
ntr 11ec807ae2 fix highlighting issues 2019-11-28 17:30:06 +10:00
ntr 91c82324e2 clean up equipping api 2019-11-28 16:31:37 +10:00
ntr 18126c1b0c change names 2019-11-28 16:01:44 +10:00
ntr 24951c1442 costs 2019-11-28 15:51:42 +10:00
ntr 4920821ec2 rm free and bound 2019-11-28 15:48:31 +10:00
ntr 33ad4db8f5 server 2019-11-28 15:43:48 +10:00
ntr e3b27ae6b2 Merge branch 'construct-box-rework' into develop 2019-11-24 23:41:08 +11:00
ntr ec10d7f890 fix rotate size 2019-11-24 23:38:31 +11:00
ntr 8a2e8dbab1 that'll do 2019-11-24 23:34:43 +11:00
ntr 4df4f3a785 fix remaining px borders 2019-11-24 23:08:35 +11:00
ntr 8b7003fb32 mobile styles 2019-11-24 22:41:14 +11:00
ntr 046c065bbd big btn 2019-11-24 22:23:22 +11:00
ntr bbdc89ed7f remove fns 2019-11-24 22:19:39 +11:00
ntr 734132974b info back 2019-11-24 22:17:12 +11:00
ntr 64fc508ae6 combos wip 2019-11-24 22:00:53 +11:00
ntr c76212b285 combiner 2019-11-24 21:47:29 +11:00
ntr f1170c6c43 combiner out 2019-11-24 21:39:28 +11:00
ntr c03a687bba move avatar to middle 2019-11-24 19:14:09 +11:00
ntr 2b1843ddb7 styles 2019-11-24 19:02:22 +11:00
ntr 5f4659b6db Merge branch 'new-vbox-combiner' into new-vbox-resize 2019-11-24 18:20:33 +11:00
ntr 308165b33a Merge branch 'new-vbox-resize' of ssh://git.mnml.gg:40022/~/mnml into new-vbox-resize 2019-11-24 18:00:14 +11:00
ntr 735df33056 mobile styles 2019-11-24 18:00:05 +11:00
ntr 9ad0f97e51 sweet delicious yellow 2019-11-22 16:52:01 +11:00
ntr f0aba62e6d big btns for big bois 2019-11-22 16:37:11 +11:00
ntr 3a0692a2a5 resize stuff 2019-11-22 16:36:11 +11:00
ntr 2d3c6cd18c SIX size stash 2019-11-22 16:26:43 +11:00
ntr d4f2f9623f wi 2019-11-22 13:00:57 +11:00
ntr bdc7aa6338 Merge tag '1.9.1' into develop
1.9.1
2019-11-21 12:59:05 +11:00
ntr 5fa63ca597 Merge branch 'release/1.9.1' 2019-11-21 12:58:59 +11:00
ntr 4733704d48 v1.9.1 2019-11-21 12:47:18 +11:00
ntr cebf172024 changelog generated 2019-11-21 12:45:58 +11:00
ntr 7d62f468cd Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-11-21 12:42:34 +11:00