Commit Graph

4 Commits

Author SHA1 Message Date
tleety 9a381e84af Merge remote-tracking branch 'origin/master' into GLrenderer
# Conflicts:
#	include/Core/Engine.h
2015-09-10 22:16:15 +02:00
Jace de0b960353 Added unit quad to core assets 2015-09-10 22:09:42 +02:00
tleety f2209466ef Added some textures for rendering testing 2015-09-10 21:08:56 +02:00
Jace 98e363eda6 Initial structure 2015-09-04 10:02:06 +02:00