Tleety 2cae4e3fb2 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/RenderQueue.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/QualityAssurance.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/Sprite.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

2016-02-10 19:52:42 +01:00

..

Collision

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

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

PNG is now a resource.

2016-02-10 17:50:17 +01:00

Input

Started refactoring. Put player walk logic in a designated sound system.

2016-02-05 16:39:23 +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 Menu

2016-02-10 19:52:42 +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