Jace 0c56a05144 Merge branch 'master' of github.com:teamfisk/TacticalZ ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Engine/Network/Server.cpp

2016-01-24 21:21:51 +01:00

..

AnimatedArmy.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CaptureTest.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CaptureTestState1.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CaptureTestState2.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CaptureTestState3.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CaptureTestState4.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CollidableCube.xml

Some entity files

2016-01-24 21:08:01 +01:00

CollisionTest1.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

CollisionTestLevel.xml

Changed .obj files to our own format. DummyScene.mesh may be broken.

2016-01-23 20:35:58 +01:00

EditorTestWorld.xml

Changed .obj files to our own format. DummyScene.mesh may be broken.

2016-01-23 20:35:58 +01:00

EditorWidgetRotate.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

EditorWidgetScale.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

EditorWidgetTranslate.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

Empty.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

GameMap.xml

Some entity files

2016-01-24 21:08:01 +01:00

Model.xml

Animations PROBABLY works fine if all joints got keyframes.

2016-01-23 18:02:42 +01:00

MovementTest.xml

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

2016-01-24 16:22:22 +01:00

OctreeTest.xml

Changed .obj files to our own format. DummyScene.mesh may be broken.

2016-01-23 20:35:58 +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

Merge branch 'master' of github.com:teamfisk/TacticalZ

2016-01-24 21:21:51 +01:00

PointLight.xml

Some entity files

2016-01-24 21:08:01 +01:00

RaptorCopter.xml

Changed .obj files to our own format. DummyScene.mesh may be broken.

2016-01-23 20:35:58 +01:00

RenderingWorld.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

ShootEventTest.xml

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

SoundTestLevel.xml

Changed .obj files to our own format. DummyScene.mesh may be broken.

2016-01-23 20:35:58 +01:00

SpawnTest.xml

Changed .obj files to our own format. DummyScene.mesh may be broken.

2016-01-23 20:35:58 +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

Changed .obj to .mesh for all meshes.

2016-01-24 16:12:31 +01:00

ThreadTestMap.xml

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

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