Tleety 2cae4e3fb2 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/RenderQueue.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/QualityAssurance.xml
#	resources/Schema/Entities/RenderingWorld.xml
#	resources/Shaders/Sprite.vert.glsl
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/Model.cpp
#	src/Engine/Rendering/RenderSystem.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

2016-02-10 19:52:42 +01:00

..

aaaatestremoveme.xml

some fixes with the stencil states and implemented stencil func/stencilop/stencilmask to renderstate

2016-02-04 11:13:26 +01:00

aim_rays.xml

plays notification on captured/lost point

2016-02-02 14:57:03 +01:00

AnimatedArmy.xml

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

2016-02-09 22:50:19 +01:00

AnimationTests2.xml

Skinned transparent model Picking fixed

2016-02-10 11:22:05 +01:00

AnimationTests.xml

WIP

2016-02-02 14:52:31 +01:00

AssetPedistal.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

awdawd

Added BoneAttachment component

2016-01-27 17:14:16 +01:00

BoneMarker

WIP

2016-02-02 14:52:31 +01:00

CapturePoint.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CaptureTest.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CaptureTestState1.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CaptureTestState2.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CaptureTestState3.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CaptureTestState4.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CaptureTestState5.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

CollidableCube.xml

Some entity files

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

CollisionSpawnTest.xml

Fixed going through flat large triangles. Velocity affected by collision.

2016-02-01 13:34:39 +01:00

CollisionTest1.xml

Changed .obj to .mesh for all meshes.

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

CollisionTestLevel.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

EditorTestWorld.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

EditorWidgetRotate.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

EditorWidgetScale.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

EditorWidgetTranslate.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

Empty.xml

Instagib!

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

FastWorld.xml

WIP

2016-02-02 14:52:31 +01:00

GameMap.xml

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

2016-02-10 11:33:45 +01:00

HealthPickup.xml

Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned

2016-02-05 18:05:46 +01:00

HealthPickupTest.xml

Refactoring: Changed HealthPickupSystem to use a struct instead. Removed the Id in EPickupSpawned

2016-02-05 18:05:46 +01:00

joint.xml

Added animation blending and offset animation component

2016-02-09 22:15:43 +01:00

LevelCollisionTest.xml

Fixed going through flat large triangles. Velocity affected by collision.

2016-02-01 13:34:39 +01:00

Model.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

ModelCollisionTest.xml

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

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

MovementTest.xml

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

2016-02-10 11:33:45 +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 remote-tracking branch 'origin/master' into Animations

2016-02-10 11:33:45 +01:00

PlayerDeathExplosionWithCamera.xml

Player death effect fixes

2016-02-08 11:39:29 +01:00

PointLight.xml

Some entity files

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

PointLightWithModel.xml

Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component

2016-01-27 15:38:54 +01:00

QualityAssurance.xml

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

2016-02-10 19:52:42 +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

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

RayRed

Weapon RayZ

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

RayRed.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

RenderingWorld.xml

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

2016-02-10 19:52:42 +01:00

ShootEventTest.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

Skeleton.xml

Added animation blending and offset animation component

2016-02-09 22:15:43 +01:00

SoundEmitter.xml

Revert "Revert "Merge pull request #75 from teamfisk/NormalSpecularMapping""

2016-02-03 16:30:00 +01:00

SoundTestLevel.xml

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

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

SpawnerWithPlayerModel.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

Spawnpoint

Hiding first person models properly

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

SpawnPointClusterWithModels.xml

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

SpawnTest.xml

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

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

SplatMapTesWorld.xml

Added texture tiling to shaders (exkluding ExplosinEffects)

2016-02-07 15:27:26 +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

Picking supports skinned meshes

2016-02-08 17:37:18 +01:00

Testingu

WIP

2016-02-02 14:52: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