Jocke e0c3a32e66 Merge branch 'master' into TCPConnections ...

# Conflicts:
#	include/Engine/Network/Client.h
#	include/Engine/Network/Server.h
#	include/Game/Game.h
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
#	src/Game/Game.cpp

2016-02-11 16:26:42 +01:00

..

Collision

Merge remote-tracking branch 'origin/master' into WeaponSystem

2016-02-10 19:24:35 +01:00

Core

Protected inheritance, not even once.

2016-02-11 11:36:39 +01:00

Editor

Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.

2016-02-08 13:33:55 +01:00

GUI

Camera component and RenderQueue changes

2016-01-08 16:21:59 +01:00

Input

Started refactoring. Put player walk logic in a designated sound system.

2016-02-05 16:39:23 +01:00

Network

Merge branch 'master' into TCPConnections

2016-02-11 16:26:42 +01:00

Rendering

Merge remote-tracking branch 'origin/Animations' into WeaponSystem

2016-02-10 20:47:33 +01:00

Sound

When using a PlaySoundOnEntity Event, you no longer have to provide the child of an entity as parameter.

2016-02-10 11:15:49 +01:00

Common.h

Merge remote-tracking branch 'origin/master' into CoolDeathAnimation

2016-01-25 01:21:15 +01:00

GLM.h

EditorWidgetSystem that takes care of moving widgets around

2016-01-21 10:30:19 +01:00

OpenGL.h

Engine puzzle completed

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