Jace d197ec07ad Merge branch 'master' into directx ...

Conflicts:
	include/Core/Engine.h

2015-10-20 15:13:20 +02:00

..

DirectX

Passthrough shader for DirectX GUI

2015-10-20 13:52:07 +02:00

OpenGL

Merge branch 'master' into directx

2015-10-20 15:13:20 +02:00

AnimationSystem.cpp

Pause and Resume events completed and game-crashing bug fixed. I think.

2015-10-19 14:56:44 +02:00

Camera.cpp

Working DirectX textures

2015-10-19 13:39:00 +02:00

OBJ.cpp

Separated OpenGL specific code into its own "compilation unit"

2015-10-19 13:37:59 +02:00

PNG.cpp

PNG loader now converts RGB to RGBA, because we'd rather treat them the same way when rendering, especially in DirectX

2015-10-20 12:07:30 +02:00

RawModel.cpp

All vertex attributes now present in DX shaders

2015-10-19 13:53:12 +02:00

Skeleton.cpp

Separated OpenGL specific code into its own "compilation unit"

2015-10-19 13:37:59 +02:00