634 Commits

Author SHA1 Message Date
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
ntr
d6a3ca2eb4 fix player bug 2019-05-31 12:41:34 +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
ntr
9fae28e7a8 bot actions fix 2019-05-30 21:01:39 +10:00
ntr
d6432965b3 Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-05-30 20:10:43 +10:00
ntr
656902d9f3 speed dec 2019-05-30 20:10:39 +10:00
Mashy
934ead830a fixed description, remove first().unwrap() 2019-05-30 16:55:08 +10:00
ntr
f94aff376d menu styles 2019-05-30 14:42:32 +10:00
ntr
6fffddd15c fix team 2019-05-30 12:51:12 +10:00
ntr
cb49552927 fix round robin 2019-05-29 16:52:53 +10:00
ntr
8456956f8b Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-05-29 16:49:18 +10:00
ntr
f3ca08b5e6 1v1 standard format 2019-05-29 16:37:01 +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
ntr
ff496cd537 formats 2019-05-29 16:04:25 +10:00
ntr
7f422ce8e8 win conditions and some other stuff 2019-05-29 15:57:04 +10:00
ntr
cbe83b3a1e Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-05-29 13:50:45 +10:00
ntr
f4992e4e87 fix tests and remove test skills 2019-05-29 13:47:34 +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
ntr
22652b6994 skills opacity 0 resoling 2019-05-28 22:54:54 +10:00
ntr
ad00059f74 disabled log 2019-05-28 22:46:31 +10:00
ntr
7c9dacd5be disable flag for client side 2019-05-28 22:42:51 +10:00
ntr
50440a5452 Merge branch 'skilltiers' 2019-05-28 18:32:18 +10:00
ntr
e55705a841 wip 2019-05-28 17:46:35 +10:00
ntr
52bec725f7 moving spec constants to server 2019-05-28 15:31:01 +10:00
ntr
ce703ff473 Revert "merge stash"
This reverts commit 6057d267744a5e9322b93155918293f04db4eecb.
2019-05-28 14:21:45 +10:00
ntr
8bb1de7b42 parry 2019-05-28 14:21:05 +10:00
Mashy
cc05e97473 reworked spec calculation structure 2019-05-28 14:20:48 +10:00
ntr
6057d26774 merge stash 2019-05-28 12:27:46 +10:00
Mashy
6d20644bcc catch all multiplier meta cases 2019-05-28 12:25:09 +10:00
Mashy
d2f2c2bb67 added impurity / haste, all t2/t3s in 2019-05-27 18:28:49 +10:00
Mashy
7d0b66ca3d hostility 2019-05-27 16:58:09 +10:00
Mashy
0971c3a2e2 corruption t2/t3, chaos is now 0-30% MORE 2019-05-27 16:03:59 +10:00
Mashy
7d2ad82800 Merge remote-tracking branch 'origin' into skilltiers 2019-05-27 15:16:22 +10:00
Mashy
88c3e97bc1 parry and other T2/T3 2019-05-27 14:21:01 +10:00
Mashy
9aa6346be6 tick tiers and formatting 2019-05-27 12:11:14 +10:00
Mashy
b0eb9a8a51 more wip 2019-05-27 10:41:36 +10:00
Mashy
6bbf8d0e34 more tier 2/3 wip 2019-05-25 18:53:10 +10:00
ntr
e20b1f25a5 invites button 2019-05-25 16:55:55 +10:00
ntr
b33f955a0f log file 2019-05-25 16:36:57 +10:00
ntr
fac3defcf6 POWER 2019-05-25 16:25:06 +10:00
ntr
33f4cfa525 damage -> power 2019-05-25 16:04:52 +10:00
ntr
7e2a95204e more renaming 2019-05-25 15:52:37 +10:00
ntr
6a20e72a64 rename files 2019-05-25 15:30:26 +10:00
ntr
760106e0e7 bigtime renaming 2019-05-25 15:20:38 +10:00
ntr
1758907432 remove demo 2019-05-24 17:46:38 +10:00