Jace 3a4f378ac5 Merge remote-tracking branch 'origin/master' into PlayerMovement ...

# Conflicts:
#	src/Game/Game.cpp

2016-01-14 17:07:39 +01:00

..

CollisionTest1.xml

Start of a movement system with collisions against AABBs

2016-01-14 14:54:12 +01:00

CollisionTestLevel.xml

Basic collisions using Octree. Seems buggy over octree boundaries.

2016-01-13 15:34:43 +01:00

EditorTestWorld.xml

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

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

Empty.xml

Basic collisions using Octree. Seems buggy over octree boundaries.

2016-01-13 15:34:43 +01:00

MovementTest.xml

Initial work on PlayerMovementSystem

2016-01-14 17:03:48 +01:00

OctreeTest.xml

Start of a movement system with collisions against AABBs

2016-01-14 14:54:12 +01:00

OtherEntity.xml

Updated schema with custom type names to better match their C++ counterparts

2015-11-26 16:09:11 +01:00

Player.xml

Initial work on PlayerMovementSystem

2016-01-14 17:03:48 +01:00

RaptorCopter.xml

EntityFilePreprocessor

2016-01-11 14:35:15 +01:00

RenderingWorld.xml

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

2016-01-12 16:13:20 +01:00

Test.xml

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

2016-01-12 16:13:20 +01:00