viktorljung 0370775820 Merge remote-tracking branch 'origin/master' into Menu ...

# Conflicts:
#	resources/Schema/Entities/Player.xml

2016-02-12 00:28:24 +01:00

..

AABB.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

AABB.xsd

CollisionSystem now utilizes Octree for collision detection.

2016-02-01 16:13:48 +01:00

AmmunitionHUD.xml

AmmunitionHUD now working

2016-02-11 23:38:25 +01:00

AmmunitionHUD.xsd

AmmunitionHUD now working

2016-02-11 23:38:25 +01:00

Animation.xml

Added animation blending and offset animation component

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

Animation.xsd

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

2016-02-10 17:02:00 +01:00

AnimationOffset.xml

Added animation blending and offset animation component

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

AnimationOffset.xsd

Added animation blending and offset animation component

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

AssaultWeapon.xml

Working damage dealing, a super cool reload effect and hit markers!

2016-02-11 22:50:44 +01:00

AssaultWeapon.xsd

Working damage dealing, a super cool reload effect and hit markers!

2016-02-11 22:50:44 +01:00

BoneAttachment.xml

Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"

2016-01-27 17:27:34 +01:00

BoneAttachment.xsd

Changed Animation and BoneAttachment "Name" field to "AnimationName" and "BoneName"

2016-01-27 17:27:34 +01:00

Camera.xml

Rendering pipeline fixes across the board and base work on refactored editor

2016-01-17 06:29:25 +01:00

Camera.xsd

Rendering pipeline fixes across the board and base work on refactored editor

2016-01-17 06:29:25 +01:00

CapturePoint.xml

Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.

2016-02-11 11:46:34 +01:00

CapturePoint.xsd

Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.

2016-02-11 11:46:34 +01:00

CapturePointHUD.xml

WIP with CapturePointHUDSystem

2016-02-10 22:22:09 +01:00

CapturePointHUD.xsd

WIP with CapturePointHUDSystem

2016-02-10 22:22:09 +01:00

Collidable.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Collidable.xsd

Added an annotation for Trigger and Collideable components.

2016-02-10 12:38:36 +01:00

DashAbility.xml

Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.

2016-02-05 15:35:51 +01:00

DashAbility.xsd

Changed Dash name to DashAbility. Fixed dash bug where you could do two different keys to dash.

2016-02-04 11:41:21 +01:00

DirectionalLight.xml

DirectionalLight now correctly getting directions

2016-01-19 14:44:17 +01:00

DirectionalLight.xsd

DirectionalLight now correctly getting directions

2016-01-19 14:44:17 +01:00

EditorWidget.xml

Editor widget selection and creation

2016-01-19 13:28:02 +01:00

EditorWidget.xsd

Editor widget selection and creation

2016-01-19 13:28:02 +01:00

ExplosionEffect.xml

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

2016-01-18 16:02:43 +01:00

ExplosionEffect.xsd

Rename the thingie

2016-01-18 13:51:32 +01:00

Fill.xml

HealthMeter

2016-01-23 14:53:17 +01:00

Fill.xsd

HealthMeter

2016-01-23 14:53:17 +01:00

Health.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Health.xsd

HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass

2016-01-07 14:53:31 +01:00

HealthHUD.xml

Made entity parser give more useful errors and fixed the errors that were while I was at it

2016-01-27 15:16:59 +01:00

HealthHUD.xsd

HealthMeter

2016-01-23 14:53:17 +01:00

HealthPickup.xml

Added HealthGain to HealthPickup component. Changed PickupSpawnSystem so it copies the values from the old to the new entity.

2016-02-05 16:13:59 +01:00

HealthPickup.xsd

HealthPickups are now based on a percentage of player maxhealth. You can no longer pickup healthpacks if you are at max health. You can no longer gain more than maxHealth.

2016-02-08 11:22:28 +01:00

HiddenForLocalPlayer.xml

"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective

2016-01-27 11:36:24 +01:00

HiddenForLocalPlayer.xsd

"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective

2016-01-27 11:36:24 +01:00

Lifetime.xml

"Proper" handling of conditional rendering of entities parented to camera or entities that should be hidden from the active local player perspective

2016-01-27 11:36:24 +01:00

Lifetime.xsd

Weapon RayZ

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

Listener.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Listener.xsd

Created a primitive SoundSystem. Can play a sound with 'P' button. Using resourcemanager. Not using the created components yet.

2016-01-07 15:22:46 +01:00

Model.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

Model.xsd

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

2016-01-27 15:41:31 +01:00

Physics.xml

Can walk up "stair-steps". Cleanup WIP.

2016-02-05 10:56:34 +01:00

Physics.xsd

Can walk up "stair-steps". Cleanup WIP.

2016-02-05 10:56:34 +01:00

Player.xml

First person shoot animations

2016-02-11 17:06:34 +01:00

Player.xsd

First person shoot animations

2016-02-11 17:06:34 +01:00

PlayerSpawn.xml

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

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

PlayerSpawn.xsd

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

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

PointLight.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

PointLight.xsd

Rendering pipeline fixes across the board and base work on refactored editor

2016-01-17 06:29:25 +01:00

RaptorCopter.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

RaptorCopter.xsd

Added RaptorCopter example system

2015-12-10 10:17:18 +01:00

SceneLight.xml

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

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

SceneLight.xsd

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

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

Shield.xml

Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.

2016-02-03 13:27:46 +01:00

Shield.xsd

Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.

2016-02-03 13:27:46 +01:00

Shielded.xml

Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.

2016-02-03 13:27:46 +01:00

Shielded.xsd

Renamde ShieldComponent since Component should not be in the name. Added Shielded component that will be put on objects that should be hidden behind shields.

2016-02-03 13:27:46 +01:00

SoundEmitter.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

SoundEmitter.xsd

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Spawner.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Spawner.xsd

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

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

SpawnPoint.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

SpawnPoint.xsd

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

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

Sprite.xml

Fixed depth sorting for HUD elements.

2016-02-11 15:27:07 +01:00

Sprite.xsd

Fixed depth sorting for HUD elements.

2016-02-11 15:27:07 +01:00

Team.xml

Added enum support to entity file format, see "Team" component for an example. Use ComponentInfo::Enum to convert enum string keys to its corresponding integer representation at runtime.

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

Team.xsd

Made entity parser give more useful errors and fixed the errors that were while I was at it

2016-01-27 15:16:59 +01:00

Text.xml

Font loading crash fixed

2016-01-19 17:18:18 +01:00

Text.xsd

Font loading crash fixed

2016-01-19 17:18:18 +01:00

Transform.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Transform.xsd

Major networking refactoring to allow for snapshot filtering outside of netcode

2016-02-09 13:22:21 +01:00

Trigger.xml

Updated component defaults files to match component schema and made schema validation strict.

2016-01-16 17:03:57 +01:00

Trigger.xsd

Added an annotation for Trigger and Collideable components.

2016-02-10 12:38:36 +01:00

UniformScale.xml

Added UniformScale component which keeps an entity's scale at a uniform value relative to the screen.

2016-01-17 06:22:35 +01:00

UniformScale.xsd

Added UniformScale component which keeps an entity's scale at a uniform value relative to the screen.

2016-01-17 06:22:35 +01:00

Weapon.xml

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

2016-02-10 17:02:00 +01:00

Weapon.xsd

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

2016-02-10 17:02:00 +01:00