William Moberg beb0967c3b Merge branch 'master' into OrderedSystemPipeline ...

# Conflicts:
#	src/Game/Game.cpp

2016-01-07 16:49:20 +01:00

..

Collision

Merge branch 'master' into OrderedSystemPipeline

2016-01-07 15:07:16 +01:00

Core

Added Healthrelated events and start of HealthSystem, also reverted the crash "fix"

2016-01-07 14:53:31 +01:00

Editor

Translation widget planes

2015-12-17 15:30:43 +01:00

Input

Re-enabled InputCommand debugging info in console

2015-12-18 14:25:55 +01:00

Network

Now uses config file to determine if client or server should be started.

2015-12-18 13:34:21 +01:00

Rendering

Fixed exit crash(es)

2016-01-06 11:20:16 +01:00

Sound

Initial directory structure

2015-11-20 15:01:37 +01:00

CMakeLists.txt

Merge branch 'master' into OctTree

2015-12-15 17:11:11 +01:00