 Tleety
|
78835f95d8
|
Removed comment
|
2016-03-02 16:47:30 +01:00 |
|
|
Tleety
|
ab7fd89546
|
Should now correctly track if another player takes your last capture point
|
2016-03-02 13:56:35 +01:00 |
|
|
Tleety
|
6540848392
|
WIP
|
2016-03-02 11:59:56 +01:00 |
|
 verysecrethero
|
bba002dea9
|
Removed DebugCode
|
2016-03-01 17:37:30 +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 |
|
 stiffly
|
f10958c268
|
Capturepoint logic is now purely done on the serverside.
|
2016-02-25 11:50:29 +01:00 |
|
|
verysecrethero
|
5af4f9d8e7
|
Removed a comment originating from HUDDesynch branch
|
2016-02-24 14:06:41 +01:00 |
|
|
verysecrethero
|
e2831c5593
|
CapturePointSystem fix, DamageIndicatorSystem fix
|
2016-02-23 17:29:33 +01:00 |
|
|
Tleety
|
a8a3366e8a
|
Hopeless attempts to fix network bugs
|
2016-02-12 05:17:09 +01:00 |
|
|
verysecrethero
|
c9f815fd42
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# Conflicts:
# src/Game/Systems/CapturePointSystem.cpp
|
2016-02-11 16:09:05 +01:00 |
|
|
verysecrethero
|
f11bd24d53
|
Added CapturePointMaxTimer in CapturePointComponent. Removed next-capturepoint Color. Modified captureTimer to +-captureTimeToTakeOver after a capture.
|
2016-02-11 11:46:34 +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
|
2b4e00e4b0
|
Refactored System constructor to take a struct instead of a bunch of parameters to reduce future pain and to be able to extend it with IsClient and IsServer flags.
|
2016-02-08 13:33:55 +01:00 |
|
|
Tleety
|
455e59a04f
|
Made the TEMPORARY capture point boxes transparent.
|
2016-02-03 11:39:18 +01:00 |
|
|
Jace
|
0e5f6da9a9
|
Merge pull request #73 from teamfisk/CapturePointFixBranch
Several changes/fixes based on the latest broken refactoring in master
|
2016-02-02 13:22:03 +01:00 |
|
|
verysecrethero
|
42b52a6766
|
Several changes/fixes based on the latest broken refactoring.
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
|
2016-02-02 11:37:22 +01:00 |
|
|
Jace
|
a3d4eb65d5
|
Fixes #66 warnings
|
2016-02-01 17:53:01 +01:00 |
|
|
Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +01:00 |
|
|
verysecrethero
|
6f739e22f3
|
Crash fix for: if you delete a team component in editor.
|
2016-01-22 10:10:39 +01:00 |
|
|
Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +01:00 |
|
|
verysecrethero
|
a596b8746b
|
CapturePointTimers are now reset for "inactive" CapturePoints after a capture.
|
2016-01-20 17:32:20 +01:00 |
|
|
verysecrethero
|
35876f6425
|
Removed membervariable m_NextPossibleCapturePointand added it as local instead
|
2016-01-20 16:37:10 +01:00 |
|
|
verysecrethero
|
8189e3c00c
|
Logic in CapturePointSystem is working again. Need to update all Tests!
|
2016-01-20 14:59:18 +01:00 |
|
 William Moberg
|
410e349329
|
Added test map for capture points and some debug code.
|
2016-01-19 18:27:58 +01:00 |
|
|
verysecrethero
|
b45de542da
|
CapturePointSystem updated, all tests are green
|
2016-01-19 17:19:58 +01:00 |
|
|
verysecrethero
|
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 |
|