Fixed mismatched delete in text.cpp
Very minor cleanup
Merge branch 'master' of https://github.com/heidi-ann/zygote
More uninspiring cleaning.
Working commit; saving for now.
Fixed bugs from large changes.
Merged again.
Saving changes again.
Reverted scripts to default.
Everything working bar dynamic collisions based off of the walkable attribute.
Almost finished merge! Collision is back!
-Werror
Mindless changes to Makefile (formatting)
Added texture system to makefile
Merge new code from master
Fixed unused variable Werror
Merge branch 'master' of https://github.com/heidi-ann/zygote
Merge branch 'master' into resource-managers
More pointless consistency.
Another pointless fix