BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,780 Commits 116 Branches 0 Tags
9b98bbbea836bf6d023ee0c39bc53cbc4f8fa827
Commit Graph

257 Commits

Author SHA1 Message Date
Jace 9b98bbbea8 Fields are now set to dirty when they're changed! 2016-03-12 01:26:03 +01:00
Jace a4b0b108d4 Created a wrapper for field types that is able to detect changes to set dirty flags in the future 2016-03-12 00:38:26 +01:00
Jace b7d93058b1 Added base work for dity bits in components 2016-03-08 21:11:59 +01:00
Jace 5d53fc74cb Merge branch 'Dirtybit' of github.com:teamfisk/TacticalZ into Dirtybit 2016-03-08 15:46:21 +01:00
Jace ecc8d998cf Added ComponentInfo::Field_t::Index 2016-03-08 15:46:14 +01:00
William Moberg e3c0fb2178 Added SetDirty function. 2016-03-08 15:44:02 +01:00
William Moberg 090bd806ce Added DirtyBit enum to Dirty getter in ComponentWrapper. 2016-03-08 15:39:16 +01:00
Joachim Pettersson e6472b9745 Merge pull request #170 from teamfisk/ScoreBoard 
I Hope To God That This Works.
 2016-03-04 04:03:46 +01:00
Tleety 0e95c5bb95 Fixes 2016-03-04 02:52:04 +01:00
viktorljung 66c8a17b17 Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-03 23:21:14 +01:00
stiffly 8466a282b7 The server will now parse a death event and pass it forward with a KillDeath event to the score system. 2016-03-03 22:48:42 +01:00
viktorljung 8957b0b464 Merge remote-tracking branch 'origin/master' into Animations 2016-03-03 14:05:43 +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
Jace 9a668ed7d7 Now here's the real fix for the lag when loading entity files: CONSOLE SPAM 2016-03-02 20:16:03 +01:00
Jace 7624c6ee0a Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world. 2016-03-02 20:12:59 +01:00
Jace 069583e09f Created EntityFile which loads an EntityXMLFile into a temporary world to be merged with another world when you want to create a copy of the entity loaded from disk. This allows us to free EntityXMLFile once it's loaded into an EntityFile. 2016-03-02 19:52:11 +01:00
Jace 44b4a597d4 fixup! Created World::Merge which will merge a world into another one 2016-03-02 19:50:52 +01:00
Jace 0c0f2d7e50 fixup! Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation 2016-03-02 18:56:22 +01:00
Jace 26d6546d79 Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation 2016-03-02 18:53:40 +01:00
Jace 62c8196ad4 Created World::Merge which will merge a world into another one 2016-03-02 18:53:39 +01:00
William Moberg 4ef76f6c45 Merge branch 'master' into Respawning 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-03-02 16:51:24 +01:00
Tleety ab7fd89546 Should now correctly track if another player takes your last capture point 2016-03-02 13:56:35 +01:00
viktorljung 8422742a9e Merge remote-tracking branch 'origin/master' into Animations 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-03-02 13:50:08 +01:00
William Moberg 06d60f9884 Merge branch 'master' into Respawning 2016-03-02 13:47:03 +01:00
William Moberg 629ebb871f SpectatorCamera shows capturepoint HUD and respawntimer. It no longer requires CapturePointGameMode component to work. 2016-03-02 13:45:49 +01:00
verysecrethero 15195964da ECaptured: added NextCapturePoint entitywrapper. Changed CapturePointID to CapturePointTakenID. Fixed so CapturePoints works in singleplayer again. Captured event is now sent in the next Update, since the information for NextCapturePoint is needed 2016-03-01 17:34:30 +01:00
viktorljung 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
William Moberg 8cc928b5f4 Merge pull request #122 from teamfisk/WorldSnapshots 
World snapshots
 2016-02-19 15:12:31 +01:00
Jace 881ce7b02f Proper string handling without nasty memory leaks. PHEW. 2016-02-19 15:11:10 +01:00
Jace ca907b912e Copy constructor for deep copy of World. 2016-02-18 13:54:32 +01:00
Jace 97499f1c28 Made ComponentPool copyable by making sure string fields are handled properly 2016-02-18 11:37:03 +01:00
verysecrethero 833015f45e Small code cleanup for PerformanceTimer 2016-02-17 13:44:41 +01:00
verysecrethero b2a437731e Small cleanup in the code 2016-02-16 17:58:27 +01:00
verysecrethero 4b8f1d95a3 Added static class PerformanceTimer. Changed CMakeLists for engine to include boost timer. Added F2,F3 functions in editor. Added some timing, more to be added 2016-02-16 16:57:46 +01:00
Jace 9f8b0f7aa9 Merge pull request #104 from teamfisk/AmmoPickup 
Added AmmoPickupSystem with Component, Entity.
 2016-02-12 02:08:29 +01:00
verysecrethero af30e51564 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
Jace d1213f9f59 Working damage dealing, a super cool reload effect and hit markers! 2016-02-11 22:50:44 +01:00
Tobias Dahl 42d810b198 Merge pull request #84 from teamfisk/DamageIndicator 
Damage indicator
 2016-02-11 21:08:59 +01:00
Jace c8c4879554 Merge pull request #93 from teamfisk/OctreeRaycasting 
Entity in octree hit by ray
 2016-02-11 17:25:02 +01:00
verysecrethero 3301f66ad1 Merge remote-tracking branch 'origin/master' into DamageIndicator 
# Conflicts:
#	resources/Shaders/Sprite.vert.glsl
 2016-02-11 16:36:48 +01:00
Jace 81943516a9 Protected inheritance, not even once. 2016-02-11 11:36:39 +01:00
William Moberg 73f59b89cc Added method EntityFirstHitByRay, takes an Octree or a vector of sorted entities and outputs the frist entity hit by a ray. 2016-02-11 00:11:37 +01:00
William Moberg 67cf008122 Bug fixing. 2016-02-10 18:03:58 +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
William Moberg eec59a40c8 Nitpicks. 2016-02-09 17:19:39 +01:00
William Moberg 239a8e7a6a Frustum culling should be working. 2016-02-09 17:12:23 +01:00
Jace c69a80f5ba Added System::LocalPlayer that is always set to the entity which is the local player, available to all systems. 2016-02-09 16:06:39 +01:00