Teejoon d8f9f15d34 Merge branch 'master' into DDS ...

Conflicts:
	assets
	src/Engine/Rendering/Texture.cpp
	src/Engine/Rendering/Util/CommonFunctions.cpp
	src/Game/Game.cpp

2016-03-10 19:55:25 +01:00

..

Collision

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

2016-03-01 12:11:27 +01:00

Core

Merge branch 'master' into DDS

2016-03-10 19:55:25 +01:00

Editor

Run, Strafe and jump animations now playing

2016-03-04 08:35:02 +01:00

GUI

Fuck aff

2016-03-08 16:53:35 +01:00

Input

3rd person animations synced with 1st person animations

2016-03-09 18:27:09 +01:00

Network

When you disconnect you will delete the world and return to the menu.

2016-03-09 15:49:42 +01:00

Rendering

Merge branch 'master' into DDS

2016-03-10 19:55:25 +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