5e9a3774ab
CapturePointSystem code has been refactored and some branches "optimized"
2016-01-14 10:23:27 +01:00
9533920684
Fixed a few CodeStandard mistakes. Added CapturePointSystem to CMakeLists.txt since branch is no longer based on ShootEvent-branch
2016-01-13 16:13:57 +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
147b116f20
Fixed typo backslash instead of slash in various classes (the includes)
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
e865971fdd
EShoot: changed to string weaponType to int currentlyEquippedItem
...
PlayerSystem.h: added HeldItem enum
PlayerSystem.cpp: simplified writing doubles, uses HeldItem enum
ShootEventTest.cpp: simplified writing doubles
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
23e78c4947
Cleaned up code
2016-01-11 14:35:15 +01:00
Jace
03456ad731
EntityFileParser
2016-01-11 14:35:15 +01:00
Jace
0bcbcda8b8
EntityFilePreprocessor
...
WIP
WIP
EntityFilePreprocessor
2016-01-11 14:35:15 +01:00
a1ed79dfbf
HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes
2016-01-07 14:53:31 +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
f67f22c82d
Added Healthrelated events and start of HealthSystem, also reverted the crash "fix"
2016-01-07 14:53:31 +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
076030a252
Fixes, mostly name changes
2015-12-17 17:28:43 +01:00
51a2da9cc0
Removed old Event that is not used
2015-12-17 14:28:17 +01:00
58a9d38e26
Added a class that client and server inherits from.
...
Class and server now share the same pointer i game.
You are now able to start a client and a server on the same computer.
2015-12-16 14:56:53 +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
889e0bb3d3
Cleaned up PlayerSystem. Sets velocity to 0 every frame.
2015-12-15 16:35:09 +01:00
478c692315
Refactoring. Client and server has Update Loop that runs before any game logic each frame.
2015-12-15 14:53:56 +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
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
Jace
e5084e13ec
Added EditorSystem
2015-12-14 13:57:51 +01:00
Jace
8a6030bf57
Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components.
2015-12-14 13:57:51 +01:00
Jace
013f911ae2
Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement.
2015-12-12 13:42:34 +01:00
Jace
35624008e7
InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file.
2015-12-12 13:42:34 +01:00
Jace
bffc97f310
Groundwork for input command proxy
2015-12-12 13:42:33 +01:00
15442c8c75
Merge branch 'PlayerSystem' into Networking
...
# Conflicts:
# src/Game/Game.cpp
2015-12-11 15:45:27 +01:00
3da69c8a1b
Fixed indentation
2015-12-11 15:29:57 +01:00
16d636a87c
Removed Initialize function for systems.
2015-12-11 15:23:56 +01:00
4da33ff4ec
Fixed movement on a "player" cube. Very simple system atm
2015-12-11 15:00:57 +01:00
0b60979c7b
Added a Initialize function for systems.
2015-12-11 14:03:00 +01:00
80f028edf2
Added a very basic PlayerSystem, and a PlayerComponent.
2015-12-11 13:45:19 +01:00
d22e59f28f
Merge remote-tracking branch 'origin/master' into Networking
...
NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml
# Conflicts:
# include/Game/Game.h
# src/Game/Game.cpp
2015-12-10 13:53:18 +01:00
0367826f16
Added RaptorCopter example system
2015-12-10 10:17:18 +01:00
352074da04
Created base for systems
2015-12-10 10:17:08 +01:00
4de613814b
WIP Packet loss identification. Put packetID in message
2015-12-09 17:43:36 +01:00
58d827f7d0
Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld
2015-12-09 14:25:41 +01:00
Jace
0dbe0fe48e
Component definitions and default values loading from schema
2015-12-08 21:38:52 +01:00
1e1ce4e127
Added Model component to schema
2015-12-08 18:21:24 +01:00
f337305dee
Merge remote-tracking branch 'origin/master' into ecs
2015-12-08 18:07:42 +01:00
d7de4fc694
Component definitions now loaded from schema. No default values yet.
2015-12-08 18:07:32 +01:00
6dc5112c26
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# include/Engine/Network/Client.h
# src/Game/Game.cpp
2015-12-08 16:15:50 +01:00
e92119c99e
WIP trying to get Eventsystem to work in client.
2015-12-08 16:13:53 +01:00
c48c9e1f86
Added leak check when using windows (WinLeakCheck.h).
...
Added server to project.
A server can now be started in the project.
2015-12-08 13:54:18 +01:00
8f55e90d2d
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# include/Game/Game.h
2015-12-08 11:11:12 +01:00
verysecrethero
Jace
stiffly
Jocke
William Moberg
sippeangelo