William Moberg 90f05442aa Merge branch 'master' into BoxModelCollision ...

# Conflicts:
#	include/Engine/Core/Octree.h
#	resources/Schema/Entities/CollisionTestLevel.xml
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Core/Octree.cpp

2016-01-27 10:52:27 +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

Merge branch 'master' into BoxModelCollision

2016-01-27 10:52:27 +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

Instagib!

2016-01-24 23:05:52 +01:00

FastWorld.xml

fixed crashes

2016-01-24 21:12:41 +01:00

GameMap.xml

Hiding first person models properly

2016-01-25 14:32:48 +01:00

LevelCollisionTest.xml

Tried a horrible recursive method, extreme framedrop.

2016-01-27 10:34:26 +01:00

Model.xml

Animations PROBABLY works fine if all joints got keyframes.

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

ModelCollisionTest.xml

WIP (false collisions), collision method expanded, not working.

2016-01-24 15:32:10 +01:00

MovementTest.xml

Quaternions are never the solution.

2016-01-25 00:22:55 +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

Hiding first person models properly

2016-01-25 14:32:48 +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

RayBlue

Weapon RayZ

2016-01-25 11:26:33 +01:00

RayBlue.xml

Weapon RayZ

2016-01-25 11:26:33 +01:00

RayRed

Weapon RayZ

2016-01-25 11:26:33 +01:00

RayRed.xml

Weapon RayZ

2016-01-25 11:26:33 +01:00

RenderingWorld.xml

fixed crashes

2016-01-24 21:12:41 +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

Spawnpoint

Hiding first person models properly

2016-01-25 14:32:48 +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