Commit Graph

7 Commits

Author SHA1 Message Date
PlatinumSkink 9867327f7f Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
Conflicts:
	include/Core/Engine.h
2015-09-10 22:44:44 +02:00
PlatinumSkink 3e04ff2e34 Gusp. 2015-09-10 22:40:18 +02:00
Jace c3f3df3d9f Fixed unit quad with texture coordinates 2015-09-10 22:38:44 +02:00
Jace de0b960353 Added unit quad to core assets 2015-09-10 22:09:42 +02:00
PlatinumSkink 1d94338214 Added CBall 2015-09-10 21:46:03 +02:00
PlatinumSkink 16c5d2a40f Made a Stage! Imported PlaceHolder Graphics! 2015-09-10 21:06:21 +02:00
Jace 98e363eda6 Initial structure 2015-09-04 10:02:06 +02:00