 Jocke
|
c544f349fd
|
The logic for removing the world is working but when we send the map again the clients memory usage goes crazy.
|
2016-03-12 17:49:50 +01:00 |
|
 verysecrethero
|
0a94373f3f
|
The children of the CapturePointModels now also get their visibility on/off. This is done since a capturepoint is actually 2 models and not just 1
|
2016-03-10 14:38:20 +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 |
|
|
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
|
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 |
|
|
Jace
|
5fcd26cd3e
|
Made TriggerSystem make use of Octree
|
2016-01-27 13:35:16 +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 |
|
|
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 |
|