605 Commits

Author SHA1 Message Date
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
Mashy
2da21ca5bc wip add hex 2019-05-24 16:49:34 +10:00
Mashy
4ac0146b39 wip 2019-05-24 15:06:29 +10:00
Mashy
62c6e4bc42 hostility fix 2019-05-22 22:59:39 +10:00
Mashy
2384be897e all descrip info comes from skill 2019-05-22 22:50:54 +10:00
Mashy
479cd5a423 RIP Secondary Duration 2019-05-22 22:25:36 +10:00
Mashy
59b5f92f42 Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories 2019-05-22 22:07:57 +10:00
Mashy
60b3445f84 Converted mostly to Cryp Effects 2019-05-22 22:07:41 +10:00
ntr
1d1a55bf7d Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories 2019-05-22 17:44:49 +10:00
ntr
caaca4fb05 move combos 2019-05-22 17:44:42 +10:00
Mashy
5f4a0b708e Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories 2019-05-22 17:37:33 +10:00
Mashy
921eac87dc effects into vec init 2019-05-22 17:36:27 +10:00
ntr
cf3cef3f31 remove categories 2019-05-22 17:22:35 +10:00
ntr
585bafe45e Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories 2019-05-22 15:10:03 +10:00
Mashy
ddfe40d7c1 SkillEffect -> CrypEffect 2019-05-22 15:03:31 +10:00
ntr
17d692b8da ref 2019-05-22 14:18:50 +10:00
Mashy
bcd89e24d0 starting to add disables 2019-05-22 13:50:57 +10:00
ntr
f5b9cd2662 Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories 2019-05-22 13:49:21 +10:00
ntr
8cc4eba05d skill components 2019-05-22 13:49:18 +10:00
Mashy
9cac638d59 Merge branch 'remove-categories' of ssh://cryps.gg:40022/~/cryps into remove-categories 2019-05-22 13:35:38 +10:00
Mashy
17e8407385 Reworked application of effects 2019-05-22 13:34:08 +10:00
ntr
9f15bf1def remove player from state 2019-05-22 12:07:16 +10:00
ntr
97facad440 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-05-21 16:40:53 +10:00
ntr
554402a57e blank spec in equip"
"
2019-05-21 16:40:50 +10:00
Mashy
a052bbc4eb Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-05-21 16:13:19 +10:00
Mashy
0e107e16a2 Particle animations with SCSS 2019-05-21 16:09:26 +10:00
ntr
2bb15b7714 buff clutch and reorder stuff 2019-05-21 16:02:47 +10:00
ntr
4d9892ec57 item conversion for buff 2019-05-21 14:40:23 +10:00
ntr
9dcabe3e8e finish descriptions, add buff 2019-05-21 14:36:42 +10:00
ntr
c327dacf74 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-05-21 11:40:01 +10:00