stiffly 330f08b926 Merge remote-tracking branch 'origin/master' into Networking ...

# Conflicts:
#	include/Game/PlayerSystem.h
#	src/Game/Game.cpp
#	src/Game/PlayerSystem.cpp

2015-12-18 14:18:53 +01:00

..

AABB.xml

Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.

2015-12-14 17:08:00 +01:00

AABB.xsd

Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.

2015-12-14 17:08:00 +01:00

Model.xml

Added Model component to schema

2015-12-08 18:21:24 +01:00

Model.xsd

Added Model component to schema

2015-12-08 18:21:24 +01:00

Player.xml

WIP

2015-12-15 11:21:46 +01:00

Player.xsd

WIP

2015-12-15 11:21:46 +01:00

RaptorCopter.xml

Added RaptorCopter example system

2015-12-10 10:17:18 +01:00

RaptorCopter.xsd

Added RaptorCopter example system

2015-12-10 10:17:18 +01:00

Transform.xml

Working rotations and translations relative to global and local space for children

2015-12-16 17:20:56 +01:00

Transform.xsd

Added crude absolute positioning when rendering

2015-12-09 15:26:49 +01:00

Trigger.xml

Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.

2015-12-14 17:08:00 +01:00

Trigger.xsd

Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.

2015-12-14 17:08:00 +01:00