1053 Commits

Author SHA1 Message Date
ntr
af569b155e purge disable 2019-06-07 17:41:46 +10:00
ntr
1b38f8a047 defensive arrows 2019-06-07 13:05:43 +10:00
ntr
8fce64c0a7 Merge branch 'master' of ssh://mnml.gg:40022/~/mnml 2019-06-06 13:19:46 +10:00
ntr
3fa24566cf construct deletes 2019-06-06 12:46:07 +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
ntr
6cae6057b9 remove some rpc structs and fix warden 2019-06-06 11:43:04 +10:00
ntr
6e513e3da7 clientside rounds changes 2019-06-06 00:03:27 +10:00
ntr
a05d97bb36 remove extra bash 2019-06-05 17:51:26 +10:00
ntr
c920c920ed bash boi 2019-06-05 17:50:40 +10:00
ntr
f3636e4e09 strike speed and strangling unremovable 2019-06-05 12:44:44 +10:00
ntr
dd4431aaa3 instance list 2019-06-01 17:43:00 +10:00
ntr
47b216cb11 cleaning 2019-06-01 16:01:42 +10:00
ntr
7b0fa9ca6c remove logs 2019-06-01 15:53:57 +10:00
ntr
a321805f54 gardening 2019-06-01 14:59:01 +10:00
ntr
5a36540615 mob names 2019-06-01 14:04:24 +10:00
ntr
c921e790c9 finish logs 2019-06-01 14:01:48 +10:00
ntr
574f260a30 upkeep based on phase times now 2019-06-01 00:08:52 +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
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