Jace b4081b3e45 Merge remote-tracking branch 'origin/Networking' ...

# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Game/Systems/WeaponSystem.cpp

2016-01-24 18:36:37 +01:00

..

Collision

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

2016-01-21 16:16:35 +01:00

Core

Merge remote-tracking branch 'origin/Networking'

2016-01-24 18:36:37 +01:00

Editor

Ignoring interpolation and rendering for local player entities!

2016-01-23 00:40:37 +01:00

GUI

Camera component and RenderQueue changes

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

Input

Basic jumping!

2016-01-23 12:15:33 +01:00

Network

Client now responds to deleted entity and component in server

2016-01-24 17:16:26 +01:00

Rendering

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

2016-01-24 14:18:23 +01:00

Sound

Now calculating the velocity for the listener correctly.

2016-01-15 15:43:20 +01:00

Common.h

Added a stats window

2016-01-18 18:54:57 +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