stiffly d22e59f28f Merge remote-tracking branch 'origin/master' into Networking ...

NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml

# Conflicts:
#	include/Game/Game.h
#	src/Game/Game.cpp

2015-12-10 13:53:18 +01:00

..

Util

Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util

2015-12-08 10:37:24 +01:00

BaseTexture.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Camera.h

Picking now returning world position

2015-12-03 14:50:14 +01:00

DummyRenderer.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

FrameBuffer.h

Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util

2015-12-08 10:37:24 +01:00

Image.h

More CMake bullshit

2015-11-30 11:16:43 +01:00

IRenderer.h

Rectangle definition conflicted with a definition included by <boost/asio.hpp>.

2015-12-07 16:52:42 +01:00

Model.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

PNG.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

RawModel.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Renderer.h

Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util

2015-12-08 10:37:24 +01:00

RenderQueue.h

fixup! Merge remote-tracking branch 'origin/master' into ecs

2015-12-08 18:20:42 +01:00

RenderQueueFactory.h

Fixed absoute positioning, I think...

2015-12-10 10:16:03 +01:00

ShaderProgram.h

Added 3D picking of models to renderer

2015-12-02 18:00:11 +01:00

Skeleton.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00

Texture.h

Engine puzzle completed

2015-11-30 17:02:24 +01:00