viktorljung 49e6252ee1 Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp

2016-02-10 11:33:45 +01:00

..

Collision

AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper.

2016-02-08 14:34:37 +01:00

Core

Merge pull request #82 from teamfisk/BoxModelCollision

2016-02-10 10:08:54 +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

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

2016-02-10 11:33:45 +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