William Moberg b2d35c80f7 Merge branch 'master' into FrustumCulling ...

# Conflicts:
#	src/Engine/Collision/Collision.cpp

2016-02-10 15:08:40 +01:00

..

Collision

Merge branch 'master' into FrustumCulling

2016-02-10 15:08:40 +01:00

Core

Tiny: Changed warning message.

2016-02-09 17:21:10 +01:00

Editor

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +01:00

Input

Fixes #66 warnings

2016-02-01 17:53:01 +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

Commited this

2016-02-10 14:39:45 +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

CMakeLists.txt

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

2016-01-18 17:44:26 +01:00