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

Conflicts:
	include/Core/Engine.h

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

..

DirectX/Rendering

Passthrough shader for DirectX GUI

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

OpenGL/Rendering

Merge branch 'master' into directx

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

AnimationSystem.h

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

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

BaseRenderer.h

Working DirectX textures

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

BaseTexture.h

Working DirectX textures

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

Camera.h

All vertex attributes now present in DX shaders

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

CAnimation.h

Working skeletal animations!!!

2015-10-15 12:48:28 +02:00

CBlendMap.h

Initial structure

2015-09-04 10:02:06 +02:00

CCamera.h

Initial structure

2015-09-04 10:02:06 +02:00

CDamageModel.h

Initial structure

2015-09-04 10:02:06 +02:00

CDirectionalLight.h

Initial structure

2015-09-04 10:02:06 +02:00

CModel.h

Initial structure

2015-09-04 10:02:06 +02:00

Color.h

Separated OpenGL specific code into its own "compilation unit"

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

CPointLight.h

Separated OpenGL specific code into its own "compilation unit"

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

CSprite.h

Base lightrendering started, still some work to be done.

2015-09-10 22:13:37 +02:00

CViewport.h

Initial structure

2015-09-04 10:02:06 +02:00

Image.h

Separated OpenGL specific code into its own "compilation unit"

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

OBJ.h

Separated OpenGL specific code into its own "compilation unit"

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

PNG.h

Separated OpenGL specific code into its own "compilation unit"

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

RawModel.h

All vertex attributes now present in DX shaders

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

RenderQueue.h

All vertex attributes now present in DX shaders

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

Skeleton.h

Separated OpenGL specific code into its own "compilation unit"

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