William Moberg ce7b26ccac Merge branch 'master' into OctTree ...

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

2015-12-10 16:37:55 +01:00

..

Util

Engine puzzle completed

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

AABB.cpp

AABB can also be created with center position and its size.

2015-12-08 17:01:50 +01:00

Collision.cpp

Added AABBVsAABB function.

2015-12-07 15:59:41 +01:00

ComponentPool.cpp

Basic and working entity system with a really ugly test case

2015-12-03 15:07:35 +01:00

ConfigFile.cpp

Engine puzzle completed

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

EntityXMLFile.cpp

Semi-working entity loading from XML files!

2015-12-09 12:29:32 +01:00

EventBroker.cpp

Engine puzzle completed

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

InputManager.cpp

Engine puzzle completed

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

OctTree.cpp

OctTree doesn't check the same object multiple times if it exists in multiple places in the tree.

2015-12-10 16:04:55 +01:00

Ray.cpp

Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree.

2015-12-03 17:03:27 +01:00

ResourceManager.cpp

Added temporary Release function to resource manager to be able to reload a resource

2015-12-09 14:23:49 +01:00

World.cpp

Added crude absolute positioning when rendering

2015-12-09 15:26:49 +01:00