Commit Graph
100 Commits
Author SHA1 Message Date
Mashy 0b62a392f5 link rework 2019-09-16 14:49:36 +10:00
Mashy d4ae38e733 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-15 20:16:10 +10:00
Mashy c027b2dec1 check for null objects 2019-09-15 17:56:51 +10:00
Mashy 21203ee06a screen based translate for cast 2019-09-15 14:15:03 +10:00
Mashy 4558eeaee0 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-15 13:21:19 +10:00
Mashy dbe38a8815 anim simplified and fixed hopefully 2019-09-15 13:21:04 +10:00
Mashy 85f1a6bb33 ahhhhhhhhhhhhhhhhhhhh 2019-09-13 22:26:25 +10:00
Mashy 0296d9907b actually fix anim bug 2019-09-13 22:25:07 +10:00
Mashy 6965bdb0e6 anim bug 2019-09-13 22:10:25 +10:00
Mashy b1e18f68f2 item description speeds 2019-09-12 16:17:13 +10:00
Mashy 70e66d1916 misc 2019-09-12 15:33:48 +10:00
Mashy 58fa6a5734 actually requesting account instances when game end 2019-09-12 15:32:57 +10:00
Mashy c82fb404d1 request account state when instance finished, remove account instances from socket 2019-09-12 15:24:16 +10:00
Mashy 075880d5a7 fix slay bug 2019-09-12 14:25:52 +10:00
Mashy e8e63e0943 confirm abandon 2019-09-12 14:05:36 +10:00
Mashy c45cf59f29 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-12 13:25:27 +10:00
Mashy 2d16c8c91a item base components for combo items 2019-09-12 13:25:11 +10:00
Mashy 2086badbdf Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-12 12:10:01 +10:00
Mashy 0e2525689f fix speed stat info hover 2019-09-12 12:08:37 +10:00
Mashy 7f6df40ea7 misc 2019-09-11 16:20:49 +10:00
Mashy a38c603ec9 disable during anim 2019-09-11 15:53:51 +10:00
Mashy 4a13656b9d abandon game 2019-09-11 15:49:36 +10:00
Mashy 60bd7f65ba abandon rpc 2019-09-11 15:29:52 +10:00
Mashy 9874334fc3 screen width % for anims 2019-09-11 11:55:48 +10:00
Mashy 2cea9fd8fa clear skills 2019-09-09 16:03:33 +10:00
Mashy b633820ca1 fix tests with stat change 2019-09-06 14:28:42 +10:00
Mashy 547127b9eb inc base dmg, reduce health, specs bonuses are purely threshold from team colour 2019-09-06 13:40:29 +10:00
Mashy 849a89ac4e non item skill + 2019-09-05 23:02:01 +10:00
Mashy 21f3a80752 more ++ fixes, shows + during anims 2019-09-05 22:41:36 +10:00
Mashy b5e09ba343 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 17:06:58 +10:00
Mashy fc73dadca5 horizontal align figcaption 2019-09-04 17:06:36 +10:00
Mashy 5c946c559b spec combos preview 2019-09-04 16:40:53 +10:00
Mashy 1600ca6c82 fix ++ spec display in vbox 2019-09-04 16:25:28 +10:00
Mashy 2dc90db185 Merge branch 'develop' of ssh://git.mnml.gg:40022/~/mnml into develop 2019-09-04 15:35:00 +10:00
Mashy 285d574934 serde rename items 2019-09-04 15:34:43 +10:00
Mashy ce72522314 show components for skills 2019-09-04 14:54:49 +10:00
Mashy 61528f7739 ternary format 2019-08-27 16:35:48 +10:00
Mashy 338a7e082c construct page selection 2019-08-27 16:30:59 +10:00
Mashy 12ec8a4142 log 2019-08-19 18:21:33 +10:00
Mashy d995e936ad fix ko electrify (effect removal in post effect) 2019-08-19 18:21:01 +10:00
Mashy a06f3a75ae worklog 2019-08-18 21:46:30 +10:00
Mashy 9cc4995959 spec goal overflow 2019-08-15 15:37:32 +10:00
Mashy fbf0eead04 tidy up info strings 2019-08-14 13:28:02 +10:00
Mashy 8a74d9e3c4 wip added svg icons into description strings 2019-08-14 00:51:01 +10:00
Mashy c16bfab12a nav to list after setting team 2019-07-30 20:49:16 +10:00
Mashy f6f9b8c79e fix stun rpc (dupe entry) 2019-07-30 19:06:43 +10:00
Mashy 6abc982fec Merge branch 'mm' into develop 2019-07-30 18:48:55 +10:00
Mashy c1b5f09d42 fix absorb, purge, electrocute, end of game bugs 2019-07-30 17:55:16 +10:00
Mashy fb84e1becf clear skills during anim phase 2019-07-27 11:23:55 +10:00
Mashy 84c0a187c2 pay for constructs 2019-07-27 11:12:00 +10:00
Mashy f295235b52 fn names 2019-07-26 21:30:20 +10:00
Mashy abd35b8bef spawning constructs (no mtx yet) 2019-07-26 21:22:11 +10:00
Mashy b72c819c63 Merge branch 'develop' into buy-constructs 2019-07-26 20:01:26 +10:00
Mashy 61fa990a15 wip team select back in 2019-07-26 14:00:01 +10:00
Mashy a3a2cf9852 fix team nav bug 2019-07-25 14:29:05 +10:00
Mashy 441cf3bc47 fix buff and debuff 2019-07-23 18:29:19 +10:00
Mashy 2dc929de40 Merge remote-tracking branch 'origin/develop' into develop 2019-07-23 18:07:39 +10:00
Mashy 4c68d11a28 aoe targetting fixed 2019-07-23 18:04:33 +10:00
Mashy ef11d14752 fix cb for banish/invert 2019-07-23 15:57:50 +10:00
Mashy d03eec1423 Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop 2019-07-23 15:05:19 +10:00
Mashy a816e75554 return cb from anim componentWillUnmount() 2019-07-23 15:05:03 +10:00
Mashy 314b34be19 unfocus all constructs between resolutions 2019-07-23 12:01:58 +10:00
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