viktorljung de125663fd Merge remote-tracking branch 'origin/master' into Movement ...

# Conflicts:
#	assets
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Entities/PlayerAssaultFallbackBlue.xml
#	resources/Schema/Entities/PlayerAssaultFallbackRed.xml
#	resources/Schema/Entities/PlayerAssaultRed.xml
#	resources/Schema/Entities/aaaatestremoveme.xml
#	resources/Schema/Entities/aim_rays.xml
#	src/Engine/Rendering/BoneAttachmentSystem.cpp

2016-03-09 15:54:00 +01:00

..

Collision

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

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

Core

Merge pull request #170 from teamfisk/ScoreBoard

2016-03-04 04:03:46 +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

Merge remote-tracking branch 'origin/Weapons' into Movement

2016-03-08 14:34:21 +01:00

Network

ConnectRequest event and some other shit

2016-03-08 22:24:32 +01:00

Rendering

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

2016-03-09 15:54:00 +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