Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
Merge remote-tracking branch 'tom/master'
Merge branch 'master' of github.com:jwbuurlage/Arya
derp
Merge remote-tracking branch 'jw/master'
spawn position updat
player loses when imp is deaad
Merge branch 'master' of github.com:jwbuurlage/Arya
changed unit values and cleaned it up so that it is easier to make other units
quadtree initial
Added some comments about possible bugs and fixed some warnings
Merge remote-tracking branch 'erik/master'
Shitload of bugfixes
fixed dependencies of config