5 commits

Author	SHA1	Message	Date
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
scrawl	bf5e30b24f	everything done except health/mana restore	2012-09-19 02:53:06 +02:00
scrawl	b34b894d6a	removed some debug stuff	2012-09-15 17:20:47 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
scrawl	b76a28f69c	beginnings of the gui	2012-09-14 19:44:00 +02:00