Merge remote-tracking branch 'tom/master'
Merge branch 'master' of github.com:jwbuurlage/Arya
Bug fix
started on overlay
Merge branch 'master' of github.com:jwbuurlage/Arya
Eriks commit
Fonts en shit op driehoekjes en vierkantjes
fixed segmentation errors on missing resources
another missing resource fix
ModelManager::initialize must return a value
Merge remote-tracking branch 'tom/master'
Bug when removing model from object node
added overlay
merging with tom the main man
Merge remote-tracking branch 'jw/master'
Camera-movements framerateonafhankelijk gemaakt, en slow-mode met LSHIFT geimplementeerd
added faction stuff
merge abe
you can now select units
fixed rotatation initial state bug