William Moberg b9d6d59c62 Merge branch 'BoxModelCollision' into FrustumCulling ...

# Conflicts:
#	src/Game/Game.cpp

2016-02-09 15:03:13 +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

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

2016-02-08 14:34:37 +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

WIP, debugging code added, still not working.

2016-02-09 15:00:30 +01:00

Sound

#68 Fixed warning in SoundSystem.cpp

2016-02-01 17:15:51 +01:00

CMakeLists.txt

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

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