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
2a5e0420c8
Added template entity "Empty.xml" for use as root entity when creating a new map.
2016-01-11 16:40:26 +01:00
Jace
0bcbcda8b8
EntityFilePreprocessor
...
WIP
WIP
EntityFilePreprocessor
2016-01-11 14:35:15 +01:00
Jace
b908a9f9c6
Revert "Forward+"
2016-01-11 13:48:55 +01:00
f71bfca142
Fixed cullLights into CullLights
2016-01-11 10:23:22 +01:00
dbb44fb4e4
Changing cullLights to Culllights, need to do this in 2 commits since Git extensions is fucked.
2016-01-11 10:22:56 +01:00
6e6460a000
Commented out the bugged models
2016-01-08 16:15:18 +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
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
d38f58165f
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderState.cpp
# src/Engine/Rendering/Renderer.cpp
2015-12-18 15:27:47 +01:00
069a6756b9
LightcullingPass for forward+ is now separate from Renderer.cpp.
2015-12-18 14:31:16 +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
a0255f1b31
Now uses config file to determine if client or server should be started.
2015-12-18 13:34:21 +01:00
ef4cbfece8
Added PointLight Component in XML files
2015-12-18 13:20:55 +01:00
ab6af30a28
Base classes for decoupled forward+ renderer and a fix where if you had to many lights in a tile(200-300+) the list would fill up before the end of frustums.
2015-12-18 12:02:02 +01:00
3636ad45af
Changed to correct branch
2015-12-18 11:29:11 +01:00
5c1a93021b
Client now reads address and port from config file. Default address is set to local host.
2015-12-18 11:22:13 +01:00
6cf7c12d34
Forward+ working
2015-12-18 11:09:54 +01:00
4a817613e3
Forward+ semi working
2015-12-17 17:55:44 +01:00
076030a252
Fixes, mostly name changes
2015-12-17 17:28:43 +01:00
0f59b863ee
Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models.
2015-12-17 17:08:47 +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
Jace
b87f559291
Updated default configs with editor stuff
2015-12-17 10:46:49 +01:00
6a3c14540d
fixes
2015-12-17 10:38:13 +01:00
Jace
dbbbb7b4e7
Working rotations and translations relative to global and local space for children
2015-12-16 17:20:56 +01:00
5602b32507
Forward+ Fixes
2015-12-16 13:36:38 +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
1431bd1a11
DebugChanges
2015-12-15 15:39:23 +01:00
e2417be8c7
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
2015-12-15 15:36:28 +01:00
1e370bac13
ForwardPlus base debug commit.
2015-12-15 15:28:37 +01:00
170610bcb1
Added a TriggerSystem, seems to work as intended.
2015-12-15 14:49:52 +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
59095c2ce5
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
2015-12-14 17:08:00 +01:00
3f77da4a07
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
2015-12-14 17:07:12 +01:00
bac0a1de26
Removed annoying cube
2015-12-14 16:55:23 +01:00
Jace
ea239b19bd
Fixed component type resolution order to prioritize custom types before native ones, since namespace information doesn't exist at that stage.
2015-12-14 16:12:20 +01:00
Jace
2f3843e595
Editor version 1
2015-12-14 13:57:55 +01:00
Jace
d16cbe84f0
Merge remote-tracking branch 'origin/master' into Input
...
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
2015-12-14 13:40:22 +01:00
Jace
a7ed455766
Merge branch 'master' into Input
2015-12-14 13:19:38 +01:00
d182e6c453
Merge remote-tracking branch 'origin/master' into RendererDecoupling
...
# Conflicts:
# src/Game/Game.cpp
2015-12-14 13:16:56 +01:00
verysecrethero
Jace
Tleety
stiffly
viktorljung
William Moberg