d42d886dcc
3rd person animations synced with 1st person animations
2016-03-09 18:27:09 +01:00
66c8a17b17
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-03-03 23:21:14 +01:00
Jace
0e8b97dbba
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
8422742a9e
Merge remote-tracking branch 'origin/master' into Animations
...
# Conflicts:
# src/Engine/Rendering/DrawFinalPass.cpp
2016-03-02 13:50:08 +01:00
5bc0483f49
Removed AnimationOffset and improved BlendTree
2016-02-29 15:51:37 +01:00
Jace
bb76c9d248
WIP multi-weapon behaviours
2016-02-29 06:58:57 +01:00
Jace
9e6c67596d
Basic editor copy and paste. Doesn't actually copy the entity until you paste it.
2016-02-25 17:51:28 +01:00
Jace
2c0f66d9c7
Merge remote-tracking branch 'origin/master' into WeaponSystem
...
# Conflicts:
# include/Engine/Collision/FillFrustumOctreeSystem.h
# include/Engine/Core/Octree.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/DefaultInput.ini
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
# src/Game/Systems/PlayerMovementSystem.cpp
2016-02-10 17:02:00 +01:00
Jace
d931660c56
WIP
2016-02-10 14:43:32 +01:00
830e0f66c9
Tiny: Changed warning message.
2016-02-09 17:21:10 +01:00
93c6f3c0a3
AABBs are auto attached when adding Trigger/Collideable/etc, also added AttachComponent method to ComponentWrapper.
2016-02-08 14:34:37 +01:00
Jace
5fcd26cd3e
Made TriggerSystem make use of Octree
2016-01-27 13:35:16 +01:00
Jace
505a6c7396
Hiding first person models properly
2016-01-25 14:32:48 +01:00
Jace
b6fd18baed
Hacked in serverside effects
2016-01-25 11:56:40 +01:00
Jace
4245264029
Weapon RayZ
...
Weapon RayZ
2016-01-25 11:26:33 +01:00
Jace
235b26ad61
WIP shoot
2016-01-24 17:16:18 +01:00
Jace
db0e67b9bd
Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky
2016-01-23 11:44:16 +01:00
Jace
31e7340daf
Ignoring interpolation and rendering for local player entities!
2016-01-23 00:40:37 +01:00
Jace
ca2aab449e
Basic movement and camera management between players and editor
2016-01-22 16:12:51 +01:00
Jace
fc06a4babc
Editor keyboard shortcuts:
...
Ctrl+S to save the currently selected entity file (iterates to the base parent)
Ctrl+N to create a new empty entity under the selection
Ctrl+O to import an entity file
Del to delete an entity
2016-01-21 15:58:27 +01:00
Jace
5e70d6eef6
EntityWrapper::Parent helper function
2016-01-21 10:29:48 +01:00
Jace
1760f9dfb1
Added inequality operator to EntityWrapper
2016-01-18 21:17:52 +01:00
Jace
3bc7dceca5
Made EntityWrapper hashable
2016-01-18 14:55:49 +01:00
Jace
9f447afbdb
Added EntityWrapper::Valid and bool overload to be check if an entity is valid and still exists in the world more easily
2016-01-17 06:20:27 +01:00
Jace
f281d220de
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
2016-01-17 01:00:48 +01:00
Jace
d34470256b
EntityWrapper to uniquely identify entities and make using them a little easier
2016-01-14 15:43:19 +01:00
viktorljung
Jace
William Moberg