3 Commits

Author	SHA1	Message	Date
Teejoon	77eaa45702	Merge remote-tracking branch 'origin/master' into HEAD ... Conflicts: src/Engine/Rendering/CubeMapPass.cpp src/Engine/Rendering/DrawFinalPass.cpp	2016-03-01 12:11:27 +01:00
Jace	181017313d	Made entity parser give more useful errors and fixed the errors that were while I was at it	2016-01-27 15:16:59 +01:00
sippeangelo	381e0fbbab	Added utility stuff	2015-11-20 17:17:29 +01:00