BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
5c3b472a4d8daab2d71dcfc349449df4e9202977
axyz/resources/Schema/Entities
T
History
viktorljung 5c3b472a4d Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	include/Engine/Rendering/ModelJob.h
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Engine/Rendering/Skeleton.cpp
2016-02-26 10:21:22 +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
AmmoHUD
HealthHUD redesigned
2016-02-12 01:57:53 +01:00
AmmoPickup.xml
Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling
2016-02-24 17:53:37 +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
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
BoneAttachments now working and BlendTrees are created in the AnimationSystem
2016-02-26 10:17:47 +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
awdawd
Added BoneAttachment component
2016-01-27 17:14:16 +01:00
BlueRifle
BoneAttachment working
2016-02-17 15:48:45 +01:00
BoneMarker
WIP
2016-02-02 14:52:31 +01:00
Button.xml
Buttons are now clickable
2016-02-16 16:28:19 +01:00
CapturePoint.xml
Picking supports skinned meshes
2016-02-08 17:37:18 +01:00
CapturePointHUDGroup.xml
New HUD XML files
2016-02-12 02:08:24 +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
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
DeadGirl.xlm
KillFeed
2016-02-12 05:41:05 +01:00
DeadGirls.xml
KillFeed
2016-02-12 05:41:05 +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
FastWorld.xml
WIP
2016-02-02 14:52:31 +01:00
FirstPersonArms
Fixed BoneAttachment component and optimized animation code a bit
2016-02-10 20:45:24 +01:00
GameMap.xml
Added more timers to Rendering.
2016-02-16 17:51:39 +01:00
HealthHUD.xml
New HUD XML files
2016-02-12 02:08:24 +01:00
HealthPickup.xml
Ammo,HealthPickup now takes in account for possible parenting/childing of the pickup. Also saved the xml files with the new scaling
2016-02-24 17:53:37 +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
HitMarker.xml
Working damage dealing, a super cool reload effect and hit markers!
2016-02-11 22:50:44 +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
Working damage dealing, a super cool reload effect and hit markers!
2016-02-11 22:50:44 +01:00
NewMap.xml
You can now AssaultDash in the air
2016-02-17 11:47:10 +01:00
NewMapBackup.xml
New Map with Meshes, WIP.
2016-02-11 00:05:27 +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
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
2016-02-25 16:16:24 +01:00
PlayerDeathExplosionWithCamera.xml
Entity fixes
2016-02-11 23:50:57 +01:00
PlayerRed.xml
Fix for player teleporting to (0,0,0). Saves player previous position in CollisionSystem instead of Physics component so it won't be saved when editing Players.
2016-02-25 16:16:24 +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
You can now change resolution without any apparent bugs.
2016-02-18 18:00:26 +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
Third person animations and shoot effects base work
2016-02-11 00:08:50 +01:00
RayRed
Weapon RayZ
2016-01-25 11:26:33 +01:00
RayRed.xml
Map fix
2016-02-12 02:10:42 +01:00
ReloadEffectView.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
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
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
... Now mipmaps and Splatmaps i comming :)
2016-02-10 17:15:54 +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
temp
HealthHUD redesigned
2016-02-12 01:57:53 +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
TestMenu.xml
Buttons are now clickable
2016-02-16 16:28:19 +01:00
ThreadTestMap.xml
The main thread is not mutex blocked while child threads load anymore.
2016-01-15 11:29:46 +01:00
yeeee.xml
Fixed memory leaks and cleaned up Skeleton and BlendTree
2016-02-25 11:30:09 +01:00