viktorljung 44f46cda8d Merge remote-tracking branch 'origin/master' into Movement ...

# Conflicts:
#	include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CP_Rocky2.xml
#	resources/Schema/Entities/MuzzleFlashBlue.xml
#	resources/Schema/Entities/MuzzleFlashFire.xml
#	resources/Schema/Entities/MuzzleFlashRed.xml
#	resources/Schema/Types/Entity.xsd
#	resources/Shaders/Sprite.frag.glsl
#	src/Game/Systems/AbilityCooldownHUDSystem.cpp
#	src/Game/Systems/BoostIconsHUDSystem.cpp
#	src/Game/Systems/PlayerMovementSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp
#	src/Game/Systems/Weapon/DefenderWeaponBehaviour.cpp
#	src/Game/Systems/Weapon/SidearmWeaponBehaviour.cpp

2016-03-13 15:17:15 +01:00

..

10Degrees.xml

WIP Defender tracers

2016-03-10 21:15:27 +01:00

aim_rays_with_capturep.xml

CapturePointSystem now sets all children visible/not visible for each red/blue/spectator

2016-03-11 14:15:46 +01:00

AmmoPickup.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +01:00

AmmoPickupTest.xml

Added AmmoPickupSystem with Component, Entity. Changed so PlayerDeathSystem gets updated after Health/Ammo systems, credits to William.

2016-02-11 23:56:40 +01:00

AmmoPickupWithModel.xml

New Map WIP, Map2 version 2 is with models on both sides.

2016-02-25 10:55:14 +01:00

AmmoShareEffectView.xml

Ammo sharing done

2016-03-12 18:29:49 +01:00

AmmunitionHUD.xml

New HUD XML files

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

AnimatedArmy.xml

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

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

AnimationTests2.xml

Switching rooms

2016-03-03 01:39:12 +01:00

AnimationTests3.xml

Different animations can now be played on multiple meshes, AnimationOffset seems to make the lighting buggy

2016-02-11 10:51:11 +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

BlendTreeAim.xml

First attempt at AssaultWeapon animations!

2016-03-04 02:48:03 +01:00

BlendTreeAssault.xml

First attempt at AssaultWeapon animations!

2016-03-04 02:48:03 +01:00

BlendTreeAssaultWeapon.xml

Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon

2016-03-07 19:38:49 +01:00

BlendTreeDefenderWeapon.xml

Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon

2016-03-07 19:38:49 +01:00

BlendTreeSidearmWeapon.xml

First attempt at AssaultWeapon animations!

2016-03-04 02:48:03 +01:00

BlendTreeTest.xml

Clean up

2016-03-03 23:41:08 +01:00

BoostAssault.xml

Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage.

2016-02-18 10:40:09 +01:00

BoostAssaultTest.xml

Added BoostSystem, Added BoostAssault entity XML

2016-02-17 18:11:36 +01:00

BoostDefender.xml

Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage.

2016-02-18 10:40:09 +01:00

BoostSniper.xml

Added Assault,Defender,Sniper Components,Entities. Added ShieldAbility,Sprintability-Component (not implemented). Changed BoostSystem to use a childed Boost to the player. All friendly fire is 0 damage.

2016-02-18 10:40:09 +01:00

Button.xml

Buttons are now clickable

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

CapturePoint.xml

CapturePoints now have red/blue/spectator model-children

2016-03-07 14:30:27 +01:00

CapturePointBorderBlue.xml

Added borders to capture points so that you can see if your inside of outside when not looking down

2016-03-13 14:59:57 +01:00

CapturePointBorderRed.xml

Added borders to capture points so that you can see if your inside of outside when not looking down

2016-03-13 14:59:57 +01:00

CapturePointBorderSpectator.xml

Added borders to capture points so that you can see if your inside of outside when not looking down

2016-03-13 14:59:57 +01:00

CapturePointHUDGroup.xml

Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements.

2016-03-09 10:56:05 +01:00

CapturePointHUDHexagon.xml

WIP with CapturePointHUDSystem

2016-02-10 22:22:09 +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

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

2016-02-11 11:46:34 +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

CP_Rocky2.xml

Added borders to capture points so that you can see if your inside of outside when not looking down

2016-03-13 14:59:57 +01:00

DamageIndicator.xml

Changed DamageIndicator.xml to not use a glowmap and not a depthsort.

2016-02-11 20:34:25 +01:00

DamageIndicatorTest.xml

Changed DamageIndicator.xml to not use a glowmap and not a depthsort.

2016-02-11 20:34:25 +01:00

DashEffect.xml

Improved movement animaitons

2016-03-08 11:21:40 +01:00

DeadGirls.xml

KillFeed

2016-02-12 05:41:05 +01:00

DefenderRayBlue.xml

Tweaking

2016-03-13 13:41:28 +01:00

DefenderShield.xml

Defender early alpha

2016-03-11 19:16:34 +01:00

derp.xml

AutoAnimationBlend on unique node working but scale is not working correctly

2016-03-02 13:30:04 +01:00

DoubleJumpHexagon.xml

Hack to sync ammo over network until we have input replaying + Reload effect from all views

2016-02-12 01:45:54 +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

EndScreen.xml

EndScreen should now show when a team win

2016-03-12 17:03:50 +01:00

FastWorld.xml

WIP

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

FloatingBridgePillar.xml

Created the map CP_Rocky2 but beware, it's still WIP.

2016-03-09 18:46:26 +01:00

FloatingCrystal_Blue.xml

Merge

2016-03-11 10:20:13 +01:00

FloatingCrystal.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +01:00

FloatingCrystalBlue.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +01:00

FloatingCrystalRed.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +01:00

FloatingCrystalWhite.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +01:00

FriendlyAmmoHUD.xml

Aim fixed for all weapons

2016-03-12 02:39:06 +01:00

GameMap.xml

Revert "Revert "Shadows""

2016-03-07 19:45:46 +01:00

HealthHUD.xml

New HUD XML files

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

HealthHUDAssault.xml

Made 3 new healthHUDs 1 for each class.

2016-03-04 08:22:48 +01:00

HealthHUDDefender.xml

Made 3 new healthHUDs 1 for each class.

2016-03-04 08:22:48 +01:00

HealthHUDSniper.xml

Made 3 new healthHUDs 1 for each class.

2016-03-04 08:22:48 +01:00

HealthPickup.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +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

HealthPickupWithModel.xml

New Map WIP, Map2 version 2 is with models on both sides.

2016-02-25 10:55:14 +01:00

HitMarker.xml

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

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

HitTest.xml

WIP Defender tracers

2016-03-10 21:15:27 +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

MainMenu.xml

TextureSprite Resource that use GL_NEAREST for sampling aswell as some StartMenu changes

2016-03-09 17:24:21 +01:00

Model.xml

Picking supports skinned meshes

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

ModelCollisionTest.xml

Fixed BoneAttachment offset rotation

2016-03-08 14:32:50 +01:00

MovementTest.xml

Defender early alpha

2016-03-11 19:16:34 +01:00

MuzzleFlashBlue.xml

Muzzleflash now very nice

2016-03-13 02:25:11 +01:00

MuzzleFlashFire.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashGay.xml

MuzzleFlash entities

2016-03-11 15:04:44 +01:00

MuzzleFlashGreen.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashLightBlue.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashPink.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashPurple.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashRainbow.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashRed.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashWhite.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

MuzzleFlashYellow.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

NewMap2.xml

New Map WIP, Map2 version 2 is with models on both sides.

2016-02-25 10:55:14 +01:00

NewMap2version2.xml

Added a FloatingEffectSystem to the game. Pickups now move up and down, if so desired.

2016-03-02 17:22:44 +01:00

NewMap2version4NEW.xml

New map version (NewMap2version4NEW)

2016-03-03 13:31:17 +01:00

NewMap2version5NEW.xml

Working map

2016-03-04 09:38:38 +01:00

NewMap2version6NEW.xml

Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.

2016-03-11 15:43:20 +01:00

NewMap.xml

playerMovementSpeed,playerCrouchSpeed in the player component now also gets AssaultBoosted.

2016-02-17 16:04:44 +01:00

NewMapBackup.xml

New Map with Meshes, WIP.

2016-02-11 00:05:27 +01:00

NewMapWSpectatorCam.xml

Falsified DepthSort for SpectatorCamera buttons and CP-HUD elements.

2016-03-09 10:56:05 +01:00

OctreeTest.xml

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

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

OliviaTestWorld.xml

Revert "Revert "Shadows""

2016-03-07 19:45:46 +01:00

OptionMenu.xml

Resolution should now use a dropdown

2016-03-11 20:02:25 +01:00

OtherEntity.xml

Updated schema with custom type names to better match their C++ counterparts

2015-11-26 16:09:11 +01:00

OverwatchCamera.xml

Some fixes for sprites

2016-03-10 15:21:11 +01:00

PlayerAssaultBlue.xml

Ammosharing over network test WIP

2016-03-12 17:01:46 +01:00

PlayerDeathExplosionWithCamera.xml

Entity fixes

2016-02-11 23:50:57 +01:00

PlayerDefenderBlue.xml

Tweaking

2016-03-13 13:41:28 +01:00

PlayerHUD.xml

Player HUD should now be ok, color of health still shit tho

2016-03-12 14:37:26 +01:00

PlayerModel.xml

????

2016-03-04 10:06:49 +01:00

PlayerRed.xml

Updated some known xml entities that should be send in snapshots.

2016-03-07 17:15:56 +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

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +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.xml

New assets, FadeOutComponent, Some MuzzleFlash entities, Changes to ray. Muzzleflash rotation

2016-03-13 01:23:51 +01:00

RayRed.xml

PlayerAssaultFallbackBlue and PlayerAssaultFallbackRed

2016-03-03 22:25:07 +01:00

RedSideModels.xml

New Map WIP, Map2 version 2 is with models on both sides.

2016-02-25 10:55:14 +01:00

ReloadEffectView.xml

Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon

2016-03-07 19:38:49 +01:00

ReloadEffectViewRed.xml

Complete blue and red player entities

2016-02-12 07:45:51 +01:00

ReloadEffectWorld.xml

Complete blue and red player entities

2016-02-12 07:45:51 +01:00

ReloadEffectWorldRed.xml

Complete blue and red player entities

2016-02-12 07:45:51 +01:00

RenderingWorld.xml

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

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

Resolution_Options

Resolution should now use a dropdown

2016-03-11 20:02:25 +01:00

Resolution_Options.xml

Resolution should now use a dropdown

2016-03-11 20:02:25 +01:00

ScoreBoard_Blue.xml

ScoreScreen things

2016-03-03 22:55:18 +01:00

ScoreBoard_Main.xml

Some Entities for endscreen and some basic logic in the EndScreenSystem

2016-03-12 15:45:07 +01:00

ScoreBoard_Red.xml

ScoreScreen things

2016-03-03 22:55:18 +01:00

ScoreBoard.xml

Updated some known xml entities that should be send in snapshots.

2016-03-07 17:15:56 +01:00

ScoreIdentity.xml

double's should now be displayed with only 1 decimal.

2016-03-04 02:19:13 +01:00

ServerIdentity.xml

Resolution should now use a dropdown

2016-03-11 20:02:25 +01:00

ServerList.xml

Resolution should now use a dropdown

2016-03-11 20:02:25 +01:00

ShinyStoneCrystalBlueLights.xml

Created the map CP_Rocky2 but beware, it's still WIP.

2016-03-09 18:46:26 +01:00

ShootEventTest.xml

Picking supports skinned meshes

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

ShootingRange.xml

3rd person aim improvements

2016-03-09 13:19:56 +01:00

SidearmWeaponBlendTree.xlm

AmmoSharing beta

2016-03-11 23:58:26 +01:00

SidearmWeaponBlueWorld.xml

Defender early alpha

2016-03-11 19:16:34 +01:00

SidearmWeaponView.xml

Made AmmunitionHUD into TextFieldReader which reads any component field on a parent and updates a Text component with the value!

2016-03-03 01:35:32 +01:00

SidearmWeaponWorld.xml

Updated Player.xml for multiple weapons

2016-03-02 22:50:04 +01:00

Skeleton.xml

AutoAnimationBlend on unique node working but scale is not working correctly

2016-03-02 13:30:04 +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

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

... Now mipmaps and Splatmaps i comming :)

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

SprintEffect.xml

Tweaked values for the effect to look better

2016-03-04 03:28:58 +01:00

StartMenu_simple.xml

Player HUD should now be ok, color of health still shit tho

2016-03-12 14:37:26 +01:00

StartMenu.xml

Fixed the fill on sprites, added some config button components, started work on option menu

2016-03-11 11:31:53 +01:00

StoneWall.xml

New Map with Meshes, WIP.

2016-02-11 00:05:27 +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

TestMenu.xml

Buttons are now clickable

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

ThirdPersonBlendTree.xml

3rd person aim improvements

2016-03-09 13:19:56 +01:00

ThreadTestMap.xml

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

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

WeaponAssaultBlueView.xml

Started working on boost HUD thingy

2016-03-13 15:09:50 +01:00

WeaponAssaultBlueWorld.xml

Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon

2016-03-07 19:38:49 +01:00

WeaponAssaultReloadEffectView.xml

Working first person animations for AssaultWeapon and DefenderWeapon and reload effect for AssaultWeapon

2016-03-07 19:38:49 +01:00

WeaponDefenderBlueView.xml

Tweaking

2016-03-13 13:41:28 +01:00

WeaponDefenderBlueWorld.xml

Tweaking

2016-03-13 13:41:28 +01:00

WeaponSidearmAssaultBlueView.xml

Tweaking

2016-03-13 13:41:28 +01:00

WeaponSidearmDefenderBlueView.xml

Aim fixed for all weapons

2016-03-12 02:39:06 +01:00

WeaponSidearmReloadEffectView.xml

AmmoSharing beta

2016-03-11 23:58:26 +01:00