1027 Commits

Author SHA1 Message Date
ntr
f7daa96550 pkg 2019-03-29 21:00:13 +11:00
ntr
4346790330 bit o cleaning 2019-03-29 20:14:32 +11:00
Mashy
e5f027dc24 cant send skills 2019-03-29 16:21:44 +10:00
Mashy
30b9909e22 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react 2019-03-29 15:25:20 +10:00
Mashy
dffae5c3e7 merge 2019-03-29 15:24:48 +10:00
Mashy
b3a4bdc301 split out logs 2019-03-29 14:55:20 +10:00
ntr
c42cc73707 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react 2019-03-29 15:36:43 +11:00
Mashy
383330ddad Battles are back on the menu 2019-03-29 13:33:44 +10:00
ntr
41b328a815 overflow 2019-03-29 13:49:34 +11:00
Mashy
e9817f75e0 Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react 2019-03-29 12:40:07 +10:00
Mashy
0380617849 Ready takes you into game 2019-03-29 12:39:51 +10:00
ntr
4900e9d31e cryp box 2019-03-29 13:33:48 +11:00
ntr
1b01fa5bea more wip 2019-03-29 12:32:18 +11:00
ntr
7b31b2529f cryp box wip 2019-03-29 11:39:45 +11:00
ntr
2b4f7de097 vbox accept 2019-03-28 17:25:00 +11:00
ntr
823432d240 combiner table 2019-03-28 17:01:42 +11:00
ntr
e512ad187d Merge branch 'return-of-react' of ssh://cryps.gg:40022/~/cryps into return-of-react 2019-03-28 16:58:07 +11:00
ntr
170a5a06ab :weassey 2019-03-28 16:57:58 +11:00
ntr
7cebebd9a3 eassey 2019-03-28 16:57:48 +11:00
ntr
4e1b1dd2cb pog 2019-03-28 15:23:03 +11:00
ntr
2494b2dd5f injure 2019-03-28 07:24:51 +11:00
Mashy
efb55f6024 Show colours added by skills 2019-03-27 17:21:42 +10:00
Mashy
a64572e6a2 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-27 15:40:36 +10:00
Mashy
e7aee86aae Added skill descriptions, cleaned up some scenes 2019-03-27 15:40:17 +10:00
ntr
dc81298992 fix corruption tick speed 2019-03-27 14:32:42 +11:00
ntr
a6926e9c7a just convert from bulk file (ask me for it) 2019-03-27 14:28:23 +11:00
ntr
81f25a3f38 molecules 2019-03-27 13:34:43 +11:00
ntr
d4c43ce50f siphon test 2019-03-27 01:02:01 +11:00
ntr
d73e798646 few more skills back in 2019-03-26 20:37:27 +11:00
ntr
5f3b4d9354 hatred applies dmg to red/blue 2019-03-26 20:01:13 +11:00
ntr
556557089d alignment 2019-03-26 19:05:37 +11:00
ntr
52edc38cba hatred/hostility 2019-03-26 19:00:38 +11:00
ntr
26ab281fdb Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-26 19:00:32 +11:00
ntr
b13c0e22d6 hatred wip 2019-03-26 18:19:55 +11:00
Mashy
075680a667 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-26 17:04:22 +10:00
Mashy
2c8ddcd186 improved decay combat sequence 2019-03-26 17:04:06 +10:00
ntr
24767b9c86 make skill resolution a regular function 2019-03-26 17:40:37 +11:00
ntr
9bd19ee79d Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-26 15:07:38 +11:00
ntr
792e781711 reflection log fix 2019-03-26 15:01:41 +11:00
Mashy
514b9b0b53 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-26 13:36:17 +10:00
Mashy
d8c5d24a3d Add check for KO event, skill from events 2019-03-26 13:36:05 +10:00
ntr
d3e0fd2f3c reflection log 2019-03-26 14:25:16 +11:00
Mashy
dda728bfb8 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-26 13:24:40 +10:00
Mashy
62b673ed1d Sync stat bars after combat turn 2019-03-26 13:24:27 +10:00
ntr
55d5ea09ac dmg returns vec of events now to clean up log 2019-03-26 14:21:06 +11:00
ntr
9cee9f4bfb add skills to events 2019-03-26 13:02:23 +11:00
ntr
2b22b85acb reverse resolutions cause of pop 2019-03-25 18:25:43 +11:00
ntr
4459185ba4 oops 2019-03-25 18:15:46 +11:00
ntr
94f49651db corruption 2019-03-25 18:15:34 +11:00
ntr
27c7023f61 Merge branch 'master' of ssh://cryps.gg:40022/~/cryps 2019-03-25 17:29:51 +11:00