William Moberg e3a44d37d2 Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	src/Game/Systems/PlayerMovementSystem.cpp

2016-02-05 14:59:14 +01:00

..

Collision

Merge branch 'master' into BoxModelCollision

2016-02-05 14:59:14 +01:00

Core

Merge branch 'master' into BoxModelCollision

2016-02-05 14:59:14 +01:00

Editor

Oops! Readded "Sprint" command. Removed some unnecessary variables in FirstPersonInputController. Fixed bug where you couldnt dash right away as the game started.

2016-02-03 17:45:37 +01:00

GUI

Camera component and RenderQueue changes

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

Input

Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.

2016-02-04 11:41:21 +01:00

Network

Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp.

2016-02-02 13:26:15 +01:00

Rendering

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +01:00

Sound

Now calculating the velocity for the listener correctly.

2016-01-15 15:43:20 +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