Commit Graph
100 Commits
Author SHA1 Message Date
Mashy dd98016e2a remove log 2019-07-22 19:58:08 +10:00
Mashy 8a60a181d1 fixed bots 2019-07-22 19:55:57 +10:00
Mashy 36ce1385da wip 2019-07-22 18:31:26 +10:00
Mashy 10dc04b73d Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-22 15:31:53 +10:00
Mashy 64896cfb3a no longer set resolution, everything from event loop 2019-07-22 15:30:46 +10:00
Mashy 938d53048e misc 2019-07-20 11:18:25 +10:00
Mashy 4db44e0b59 great victory 2019-07-20 11:15:47 +10:00
Mashy c44cd44933 register account proper err handling 2019-07-20 01:04:02 +10:00
Mashy b289ed92de tidying fns 2019-07-19 21:01:12 +10:00
Mashy 9c45a3fb7a getting somewhere 2019-07-19 19:46:54 +10:00
Mashy 51d3c76460 wip 2019-07-19 19:19:29 +10:00
Mashy 7eb34b4350 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-18 20:32:15 +10:00
Mashy fd87d15069 change 1 line fix everything 2019-07-18 20:31:26 +10:00
Mashy 9edf7635d1 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-16 21:53:28 +10:00
Mashy 19038ec95f clear rename when selecting new mtxactive, balance error toast 2019-07-16 21:53:13 +10:00
Mashy a4e92d496e rename constructs 2019-07-16 15:39:30 +10:00
Mashy 7081ec8d76 rename (random atm) 2019-07-15 23:29:47 +10:00
Mashy f94cca9ebc vbox rng revert 2019-07-15 21:05:36 +10:00
Mashy 4db31c4238 added vbox headers 2019-07-15 21:00:48 +10:00
Mashy 1298257b0e vbox arrangement change 2019-07-15 18:33:15 +10:00
Mashy 5587d2ad23 Merge branch 'anims-change' into develop 2019-07-11 21:20:23 +10:00
Mashy caca084ea8 misc fixes 2019-07-11 21:15:26 +10:00
Mashy 553b065e8d rotations 2019-07-11 16:13:22 +10:00
Mashy 05af89f8b3 Merge branch 'anims-change' into develop 2019-07-10 18:49:03 +10:00
Mashy 9ffd0f868e wip 2019-07-10 18:27:20 +10:00
Mashy 6f83f57bd4 refactor 2019-07-10 12:48:04 +10:00
Mashy fe956936d1 misc fix 2019-07-09 16:03:59 +10:00
Mashy 4fc5f46311 Merge branch 'anims-change' into develop 2019-07-09 15:52:44 +10:00
Mashy 1e713a74dd refactor and fix for avatar animations, invert / banish 2019-07-09 15:48:00 +10:00
Mashy 089ff4e274 smooth as butter 2019-07-08 20:58:27 +10:00
Mashy 538e0a9c31 wip set avatar animation in construct class 2019-07-08 20:43:31 +10:00
Mashy 2acb4d276f clear dom anim classes with small delay between resolutions 2019-07-08 15:29:45 +10:00
Mashy 41eb476c31 wip fixed source cast 2019-07-08 13:46:43 +10:00
Mashy 51a1b734f3 aoe test fix monkaS 2019-07-07 16:26:44 +10:00
Mashy 5542efd62e fixed event 2019-07-05 18:28:00 +10:00
Mashy 47c1cffc7f strike fixes 2019-07-05 18:21:44 +10:00
Mashy d44bea71ed octave fix for bash (can only be discrete values) 2019-07-05 17:55:53 +10:00
Mashy 9762e4db9a added decay tick back 2019-07-05 17:49:28 +10:00
Mashy 548b88241f add silence 2019-07-05 17:45:54 +10:00
Mashy 1bc73694ce ruin & aoe skills 2019-07-05 16:54:09 +10:00
Mashy d55e1fecf3 added clutch 2019-07-04 18:30:16 +10:00
Mashy 16d22fca0b Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change 2019-07-04 15:16:09 +10:00
Mashy af4efd43b8 filter name 2019-07-04 15:15:38 +10:00
Mashy 4061ffb640 Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change 2019-07-04 13:50:54 +10:00
Mashy 686a346c9a added sleep 2019-07-04 13:50:27 +10:00
Mashy d455c68415 purify 2019-07-04 11:49:58 +10:00
Mashy 7bdbdd2fd4 Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change 2019-07-03 00:02:23 +10:00
Mashy 6b3a159988 fk discord 2019-07-03 00:00:55 +10:00
Mashy 0938187f7b Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change 2019-07-02 23:14:34 +10:00
Mashy cd3634a692 Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change 2019-07-02 23:14:10 +10:00
Mashy 3b115f82a4 fixed parry, added all skills to anims callback 2019-07-02 23:11:48 +10:00
Mashy 3eb55463e6 fixed slay 2019-07-02 21:55:10 +10:00
Mashy 7ed13aa9db anim fixes 2019-07-02 16:46:02 +10:00
Mashy 870940957f Merge branch 'anims-change' of ssh://mnml.gg:40022/~/mnml into anims-change 2019-07-02 15:17:31 +10:00
Mashy c646c76e91 remove fade constants 2019-07-02 15:14:46 +10:00
Mashy 311457d99b Merge branch 'anims-fixed' into anims-change 2019-07-02 00:48:51 +10:00
Mashy baeb90f91a keep anims going during post skill text 2019-07-02 00:47:24 +10:00
Mashy 3e8634e6c7 move combat text 2019-07-01 23:10:04 +10:00
Mashy 9e5a612739 misc fixes 2019-07-01 21:23:13 +10:00
Mashy 81970f5abf Merge branch 'anims-change' into anims-fixed 2019-07-01 20:24:57 +10:00
Mashy 0e19156f3a added stages back in 2019-07-01 18:36:44 +10:00
Mashy 96a0d3f30c Merge branch 'animations-test' into develop 2019-06-28 11:42:21 +10:00
Mashy a53b55e7ab added siphon tick 2019-06-25 15:30:28 +10:00
Mashy 40a3b2d162 add siphon 2019-06-25 14:15:08 +10:00
Mashy 93a915646a anim colour changes 2019-06-24 22:34:56 +10:00
Mashy 0e1098fa55 added slay 2019-06-24 15:09:53 +10:00
Mashy b1b37fc0b6 added chaos and heal 2019-06-24 12:35:14 +10:00
Mashy d9184dea0a laser anim for attack and strike 2019-06-21 13:18:30 +10:00
Mashy bd750be110 blast anim, improved random point util 2019-06-20 16:25:03 +10:00
Mashy d232402c49 remove tiers from skill anim 2019-06-19 16:58:05 +10:00
Mashy 0310b1b3df charge attacks 2019-06-19 15:29:33 +10:00
Mashy ae481d54bf charge svg, space out randomly generated points 2019-06-19 14:01:34 +10:00
Mashy c4c3c415b9 wip testing more anim stuff 2019-06-18 17:02:15 +10:00
Mashy 13405c9444 attack dagger animation test 2019-06-14 21:26:22 +10:00
Mashy b0faf0c33b messing with anims full Pepega 2019-06-14 00:10:51 +10:00
Mashy 23083dc0f5 skill text in targetting area during resos 2019-06-12 23:51:52 +10:00
Mashy ee40f82f24 Merge remote-tracking branch 'origin/animations-test' into animations-test 2019-06-12 18:56:21 +10:00
Mashy 28a4c259bb basic attack animation 2019-06-12 18:55:40 +10:00
Mashy cd6f815092 Merge remote-tracking branch 'origin/animations-test' into animations-test 2019-06-11 17:56:46 +10:00
Mashy 09868b42d5 tripping with triangles 2019-06-11 17:52:33 +10:00
Mashy b858904c2e added tier 2 and 3 specs 2019-06-10 16:36:19 +10:00
Mashy 94c7833b34 Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-06-06 11:53:21 +10:00
Mashy 9e32822036 Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-06-06 11:53:01 +10:00
Mashy 4077067394 win bonus changes, more moneys 2019-06-06 11:46:44 +10:00
Mashy 1f4d1a6405 Merge branch 'reso_stages' 2019-05-31 20:10:30 +10:00
Mashy b10c4f988c add u8 to resolution struct for breaking up resolution parts 2019-05-31 16:20:33 +10:00
Mashy c7ee7361dd Merge remote-tracking branch 'origin/master' 2019-05-31 13:27:47 +10:00
Mashy 6295d8888e update effects during combat anim loop 2019-05-31 13:27:23 +10:00
Mashy 6d9e13598c removed life conditional checks, assign reso life to state construct 2019-05-31 13:03:50 +10:00
Mashy 0601006504 Merge remote-tracking branch 'origin/master' 2019-05-31 11:59:29 +10:00
Mashy 23e9870d8f rework damage calculation between resolutions 2019-05-31 11:52:30 +10:00
Mashy 43b1ce837f Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-05-30 16:55:24 +10:00
Mashy 934ead830a fixed description, remove first().unwrap() 2019-05-30 16:55:08 +10:00
Mashy b8abd7f973 Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-05-29 16:17:50 +10:00
Mashy 53adf5a2d9 speed rework 2019-05-29 16:17:28 +10:00
Mashy ab5a38f86f rework spec calculation system 2019-05-29 13:15:56 +10:00
Mashy fc07bffb93 Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-05-29 11:50:15 +10:00
Mashy c32154e06e all skills have item conversion, tidy spec calcs 2019-05-29 11:49:58 +10:00
Mashy cc05e97473 reworked spec calculation structure 2019-05-28 14:20:48 +10:00
Mashy 0b7473382b Merge branch 'skilltiers' 2019-05-28 12:25:47 +10:00