viktorljung ea9c4d19d0 Merge remote-tracking branch 'origin/master' into TextRendering ...

# Conflicts:
#	include/Game/Game.h

2016-01-21 10:19:32 +01:00

..

CaptureTest.xml

Added some more visual CaptureTestState xml files

2016-01-20 16:06:35 +01:00

CaptureTestState1.xml

CapturePointTimers are now reset for "inactive" CapturePoints after a capture.

2016-01-20 17:32:20 +01:00

CaptureTestState2.xml

Added some more visual CaptureTestState xml files

2016-01-20 16:06:35 +01:00

CaptureTestState3.xml

Added some more visual CaptureTestState xml files

2016-01-20 16:06:35 +01:00

CaptureTestState4.xml

CapturePointTimers are now reset for "inactive" CapturePoints after a capture.

2016-01-20 17:32:20 +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

Some asset shit.

2016-01-19 16:11:56 +01:00

Empty.xml

Removed membervariable m_NextPossibleCapturePointand added it as local instead

2016-01-20 16:37:10 +01:00

MovementTest.xml

Merge fixes

2016-01-14 18:20:51 +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

Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems

2016-01-15 18:32:47 +01:00

RaptorCopter.xml

EntityFilePreprocessor

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

RenderingWorld.xml

Clean up

2016-01-21 10:16:03 +01:00

SoundTestLevel.xml

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

2016-01-15 09:52:52 +01:00

SpawnTest.xml

Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.

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

TeamTest.xml

Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.

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

Test.xml

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

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

ThreadTestMap.xml

The main thread is not mutex blocked while child threads load anymore.

2016-01-15 11:29:46 +01:00