1160 Commits

Author SHA1 Message Date
Mashy
5029e60746 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-05-02 11:58:41 +10:00
Mashy
5f6994a01a reduced healing from decay, changed siphon 2019-05-02 11:54:32 +10:00
ntr
4758ae1987 siphon test fix 2019-05-02 11:51:56 +10:00
ntr
f93aba866f cryp animations 2019-05-02 11:40:08 +10:00
ntr
a970f5256e M#erge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-05-02 09:49:28 +10:00
ntr
9fc799b9f6 fix siphon order 2019-05-02 09:49:24 +10:00
ntr
e40291cdaa effects on enemies 2019-05-02 09:47:50 +10:00
Mashy
39ace02d92 fixed multi RNG 2019-05-02 09:40:03 +10:00
Mashy
8c68f7fec9 added chaos, slay, moved purify 2019-05-02 09:36:12 +10:00
ntr
0a96adac4e oops 2019-05-01 21:36:58 +10:00
ntr
46ee9bb8ae oops 2019-05-01 21:36:23 +10:00
ntr
56a9b0b3eb update build for prod molecules 2019-05-01 21:35:28 +10:00
ntr
07ca704ea9 default img 2019-05-01 21:26:58 +10:00
ntr
066bfd0756 working with combat text 2019-05-01 21:11:38 +10:00
ntr
49a9db6d9b timeout events 2019-05-01 20:59:23 +10:00
ntr
b22026fb56 wip 2019-05-01 20:40:00 +10:00
ntr
92007a8c37 instance finished flag in db 2019-05-01 19:31:50 +10:00
ntr
08b309de22 fix timeouts 2019-05-01 19:06:45 +10:00
ntr
6436fd260c lock rows when performing warden actions 2019-05-01 18:40:31 +10:00
ntr
d2c1db7be7 make stun var a skill 2019-05-01 15:58:59 +10:00
Mashy
2987d56f9e Merge branch 'multipliers' 2019-05-01 15:53:16 +10:00
Mashy
f3aef83305 test fix, remove prnt lines 2019-05-01 15:16:13 +10:00
ntr
c39b7d31f7 instance timeout time 2019-05-01 15:08:38 +10:00
ntr
001e5e813b mobile timer fixes 2019-05-01 13:54:03 +10:00
ntr
9e1795ca26 progress bars 2019-05-01 13:48:27 +10:00
Mashy
3e271d4455 int multiplier, remove floats 2019-05-01 13:12:30 +10:00
ntr
7319b4b2ba phase end 2019-05-01 13:03:26 +10:00
ntr
2dfdd0d09c int pct 2019-05-01 12:00:18 +10:00
Mashy
6a4a24d080 test fixes 2019-05-01 10:46:31 +10:00
ntr
3ac4fd6d1b little fixes 2019-05-01 01:09:48 +10:00
ntr
f9dad4cfb5 Merge branch 'warden' 2019-05-01 01:00:54 +10:00
ntr
5d7095a06d warden working 2019-05-01 00:59:45 +10:00
Mashy
9d1d470cb6 Effect duration taken from skill 2019-04-30 21:47:33 +10:00
Mashy
6bbaa5da70 Tier 3 and tier enums 2019-04-30 14:40:48 +10:00
Mashy
2941d1b73a recursively calculate combo specs 2019-04-30 13:45:57 +10:00
Mashy
d69a6a0f2c Strike T2 2019-04-30 13:02:37 +10:00
Mashy
a1e0419e3c added impl multiplier fn, floating point dmg calculation 2019-04-30 12:13:19 +10:00
ntr
d3c301a3ac ready rpc 2019-04-29 19:09:16 +10:00
ntr
59a22b6122 warden works 2019-04-29 18:53:04 +10:00
ntr
18aef974b6 warnings 2019-04-29 18:42:03 +10:00
ntr
b2bfe8cf2a getting there 2019-04-29 18:03:15 +10:00
ntr
a8a000e1ff buildling 2019-04-29 17:24:58 +10:00
Mashy
57b3782a45 advanced combo concept 2019-04-29 15:48:20 +10:00
ntr
15ae93e70f about to change teams -> player 2019-04-29 15:31:12 +10:00
ntr
618f366796 fix reclaimning 2019-04-29 12:27:08 +10:00
ntr
03aae7e3cd warden init 2019-04-27 23:32:15 +10:00
ntr
0daa7967f4 fix scoreboard 2019-04-27 23:27:44 +10:00
ntr
1ab298b1ad fix info" 2019-04-27 23:02:54 +10:00
ntr
95c463757d warden wip 2019-04-27 22:54:16 +10:00
ntr
483c6c5b9c updated at 2019-04-27 14:32:05 +10:00