antc13 a47317bb32 Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer ...

# Conflicts:
#	include/Engine/Collision/Collision.h
#	resources/Shaders/ForwardPlus.frag.glsl
#	resources/Shaders/ForwardPlus.vert.glsl

2016-01-19 18:26:45 +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

Basic collisions using Octree. Seems buggy over octree boundaries.

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

Model.xml

Now supporting multiple material per mesh. Simon changed glDrawElementsBaseVertex to glDrawElements in DrawFinalPass.cpp Hallelulijah!

2016-01-19 17:40:34 +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

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

2016-01-12 16:13:20 +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