f197993beb
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
2016-01-19 15:31:15 +01:00
4c1a49a8a4
Merge remote-tracking branch 'origin/master' into CapturePointTake
...
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/CMakeLists.txt
# src/Game/PlayerSystem.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestGameMain.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
2016-01-18 16:48:49 +01:00
Jace
f281d220de
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
2016-01-17 01:00:48 +01:00
Jace
9ec32464bc
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
Jace
f65ac65e30
Updated component defaults files to match component schema and made schema validation strict.
2016-01-16 17:03:57 +01:00
Jace
b2213dbe9a
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# include/Engine/Collision/Collision.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Game/Game.cpp
2016-01-15 20:28:43 +01:00
Jace
bbabc84127
Fixed default values for CPlayerSpawn
2016-01-15 20:26:30 +01:00
Jace
db1b972cd1
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
2016-01-15 18:32:47 +01:00
5c45dbdd10
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-01-15 16:25:32 +01:00
8f257b9a58
Merge remote-tracking branch 'origin/master' into CapturePointTake
...
# Conflicts:
# src/Game/Game.cpp
# src/Tests/ResourceManagerTest.cpp
2016-01-15 11:24:20 +01:00
c8fe6853c0
Removed ShootEvent from CapturePoint
2016-01-15 11:17:22 +01:00
ecf524eb4e
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
2016-01-15 11:01:58 +01:00
e248b37ea8
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# src/Game/Game.cpp
2016-01-15 09:52:52 +01:00
Jace
5e721325a4
Merge fixes
2016-01-14 18:20:51 +01:00
Jace
3a4f378ac5
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# src/Game/Game.cpp
2016-01-14 17:07:39 +01:00
Jace
6ad1839def
Initial work on PlayerMovementSystem
2016-01-14 17:03:48 +01:00
7a8604bf2b
CapturePointSystem now tracks and verifies if a capturePoint can be taken over. Also the time is changed faster the more players stand on the capturepoint (number*dt). Also took care of the problem when both teams have the same contested capturepoint.
...
Added variable in the CapturePoint component: CapturePointNumber. This is needed since we cant know what capturepoint is next to be taken over otherwise.
Updated the CapturePointTest according to current CapturePointSystem
TODO: try to refactor code in CapturePointSystem
2016-01-13 15:58:52 +01:00
3a1056a2c3
2 new Events: ECaptured, EWin
...
Added new variable in CapturePoint: IsHomeCapturePointForTeam
CapturePointSystem updated so -5 = team 2 owns it, +5 = team 1 owns it. Its also looking for a winner each update
Updated Test. TODO: better Tests
2016-01-13 15:58:52 +01:00
59be714fdc
1 Component added: CapturePoint
...
1 System added: CapturePointSystem
1 Test added: CapturePointTest
added 1 variable in PlayerComponent (TeamNumber)
added 2 variables in CapturePoint (CaptureTimer,OwnedBy)
CapturePointSystem is now handling 2 events: OnTriggerTouch,OnTriggerLeave
Added the CapturePointSystem to Game.cpp
2016-01-13 15:58:52 +01:00
4b672b11e7
EquippedItem,Ammo got changed to int instead of double. Loading entities from map the new way in Tests. ComponentWrapper:s Name is now Type
2016-01-13 15:58:52 +01:00
ec4d5fbfa8
xml/xsd files changed type to double. fixed cooldownbug in PlayerSystem. Added 4 tests in ShootEventTest and generalized it a lot
2016-01-13 15:58:52 +01:00
184af95507
New Event: EShoot. New Components: PrimaryItem,SecondaryItem. New Test: ShootEventTest. Added LeftMouseRelease->Shoot in PlayerSystem
...
TODO: generalize the test
2016-01-13 15:58:52 +01:00
Jace
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
0f17f9a888
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-12 16:13:20 +01:00
729ebe6c8b
Merge remote-tracking branch 'origin/master' into Sound
...
# Conflicts:
# README.md
# resources/Schema/Components.xsd
# resources/Schema/Types/Entity.xsd
2016-01-12 14:50:10 +01:00
976033c2f6
Added events: PlayBackgroundMusic, SetBGMGain, SetSFXGain. Added some editor specific code.
2016-01-12 14:03:00 +01:00
d469fe6e9a
Removed picking event and added a pick function to renderer
2016-01-12 11:45:50 +01:00
24ba3ae1f6
WIP, falloff things.
...
# Conflicts:
# resources/Schema/Components/PointLight.xsd
# resources/Shaders/ForwardPlus.frag.glsl
2016-01-11 17:57:15 +01:00
0cf8d26557
Revert "Revert "Forward+""
...
This reverts commit b908a9f9c6
2016-01-11 17:56:58 +01:00
f80ad1377b
Making use of Doppler effect. Added a bunch of events: Pause, stop, continue, variations of play.
2016-01-11 17:52:27 +01:00
Jace
b908a9f9c6
Revert "Forward+"
2016-01-11 13:48:55 +01:00
a7b43b06a2
Camera component and RenderQueue changes
2016-01-08 16:21:59 +01:00
3cce9f8075
Using absolute transform
2016-01-08 15:29:20 +01:00
2bd60be741
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-01-08 14:14:43 +01:00
25a99a04c5
Added Visable bool and a better description to Pointlight component.
2016-01-08 14:11:35 +01:00
d8c4c6e5ff
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
638c236ceb
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
e7bb8954bf
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/Renderer.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/Renderer.cpp
2016-01-06 11:35:55 +01:00
eb69e03e82
Merge branch 'Forward+' of github.com:teamfisk/TacticalZ into Forward+
2015-12-18 15:28:25 +01:00
330f08b926
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
2015-12-18 14:18:53 +01:00
ef4cbfece8
Added PointLight Component in XML files
2015-12-18 13:20:55 +01:00
46ae2d39af
Merge branch 'master' into OctTree
...
# Conflicts:
# src/Game/Game.cpp
2015-12-17 16:44:01 +01:00
50822d09fc
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# src/Game/Game.cpp
2015-12-17 14:10:02 +01:00
aeca1dec18
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Game.cpp
2015-12-17 11:17:58 +01:00
Jace
dbbbb7b4e7
Working rotations and translations relative to global and local space for children
2015-12-16 17:20:56 +01:00
04a01104b5
Merge branch 'master' into OctTree
...
# Conflicts:
# src/Engine/CMakeLists.txt
# src/Game/Game.cpp
2015-12-15 17:11:11 +01:00
fa66e9ff47
Camera Switch event now working, Camera models Rotation still bugged
2015-12-15 15:29:19 +01:00
0a8a9e5099
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# src/Engine/Rendering/RenderState.cpp
# src/Game/Game.cpp
2015-12-15 11:50:01 +01:00
b698a0d36f
WIP
...
Adding models now crashes. Threading
Added a create player event that currently is not used.
2015-12-15 11:21:46 +01:00
ef07a9d536
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Engine/Rendering/RenderQueueFactory.h
2015-12-14 19:11:00 +01:00
verysecrethero
Jace
stiffly
Tleety
viktorljung
William Moberg