William Moberg f632b45c9b Merge branch 'MemoryOptimization' into Importer ...

# Conflicts:
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Collision/TriggerSystem.cpp
#	src/Game/Systems/SpawnerSystem.cpp

2016-03-14 02:06:53 +01:00

..

Collision

Separating RawModel from Model

2016-03-13 14:47:11 +01:00

Core

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Editor

Renamed IsAnyParentMissingTransform -> isAnyParentMissingTransform (member function).

2016-03-07 14:34:45 +01:00

GUI

Fuck aff

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

Input

Fixed first person strafe animation

2016-03-13 22:17:55 +01:00

Network

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

Rendering

Merge branch 'MemoryOptimization' into Importer

2016-03-14 02:06:53 +01:00

Sound

Now listens to SetCamera event and the background music should be working properly.

2016-03-13 17:35:05 +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