ed5ac2e923
6 new tests for CapturePointSystem have been created!
...
TODO: refactor CapturePointSystem
2016-01-13 15:58:52 +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
f0b425614d
Simplified PlayerSystem branches a lot! Thanks William!
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
878c71b56a
Changed the comparison method in PlayerSystem since its currently using doubles
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
2284399538
Removed Close method from Client, Server and Network.
...
Removed legacy variable m_ThreadIsRunning in Client.h and Server.h.
Removed m_EventBroker->Unsubscribe(m_EInputCommand) in Client destructor.
2016-01-12 17:47:03 +01:00
56ac592d6d
Removed debug code from Game.cpp
2016-01-12 14:16:01 +01:00
2bf1d53f2c
Merge remote-tracking branch 'origin/master' into Networking
2016-01-12 13:17:00 +01:00
236230d12c
Packets now dynamically allocates more memory when they need it.
...
Increased local receive buffer for Client and Server() and removed the magic number that was used
In Server.h and Client.h
(char readBuffer[INPUTSIZE] = { 0 }).
Packets start size has now been increased to 512 bytes.
Changed ComponentInfo::FieldsInOrder to store strings instead of pointers.
Removed HasEntity() and are now using ValidEntity() instead.
2016-01-12 12:00:19 +01:00
Jace
349fa9d7fa
Fixed crash when creating new entities
2016-01-11 16:47:30 +01:00
b37ffc7449
WIP Model component not working.
2016-01-11 14:58:49 +01:00
6c13916eec
Removed unnecessary code.
2016-01-11 14:58:30 +01:00
f0ad28bac4
Removed some comments. Basically did nothing
2016-01-11 14:58:15 +01:00
Jace
4a516a4d86
Added ComponentInfo::FieldsInOrder to be able to loop through component fields in a consistent order based on the component XSD definition
2016-01-11 14:56:53 +01:00
Jace
21aea6f31d
Added World::ValidEntity for checking if an entity exists or not
2016-01-11 14:35:41 +01:00
Jace
297a3fb493
Support for "name" attribute on entities
2016-01-11 14:35:41 +01:00
Jace
c47ef61ddc
Temporary fix for widgets being annoying entities in the editor
2016-01-11 14:35:41 +01:00
Jace
e8e93587e9
Fixed weird behavior when components would register multiple times (Hint: It should never happen in the first place)
2016-01-11 14:35:41 +01:00
Jace
39dd27726d
MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks!
...
Also contains inseparable editor changes.
2016-01-11 14:35:41 +01:00
Jace
6adc98eea5
Now writes entities to file instead of stdout...
2016-01-11 14:35:41 +01:00
Jace
11d547cde8
Entity 0 is now a real entity in the world, created by the first entity read while importing. This makes the difference between map files and entity files automatic, since consecutive entity file loads should automatically get the world as parent, as long as the world entity has been created earlier.
2016-01-11 14:35:41 +01:00
Jace
24b9e951c2
Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it.
2016-01-11 14:35:41 +01:00
Jace
81024b4a1d
First work on EntityFileWriter for saving levels
2016-01-11 14:35:41 +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
Jace
b908a9f9c6
Revert "Forward+"
2016-01-11 13:48:55 +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
9f871bbe7c
Lights now use the absolute position instead of it's local position.
2016-01-08 14:31:44 +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
dab4ba2164
Pointlights are now using the pointlight component and the Light renderqueue to draw.
2016-01-08 14:12:09 +01:00
592776e783
Fixed so the PlayerDeath event doesn't get spammed while the player is dead. Also made sure that any remaining healthDeltas are cleared when dead.
2016-01-08 11:37:51 +01:00
ef9ce7932a
New small fix.
2016-01-07 17:40:47 +01:00
beb0967c3b
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# src/Game/Game.cpp
2016-01-07 16:49:20 +01:00
0e0a361a38
HotFix: Updated the CMakeList.txt in src/Game so it has the HealthSystem.cpp. This is needed otherwise the solution cant find that file
2016-01-07 16:36:18 +01:00
e52c0c9633
Now using the easier/cleaner way of getting/setting the HealthProperties
2016-01-07 15:27:39 +01:00
4048ce6bd4
Small fix.
2016-01-07 15:18:35 +01:00
c4642cc530
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# include/Engine/Core/SystemPipeline.h
2016-01-07 15:07:16 +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
f3ff433bf7
Merge remote-tracking branch 'origin/master' into AndersTest
2016-01-07 14:51:08 +01:00
85ff86a2fe
Revert "Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point"
...
This reverts commit 0ae6c42df8
2016-01-07 14:50:13 +01:00
fa8775a72e
Renamed vars and added some comments.
2016-01-07 10:28:18 +01:00
verysecrethero
Jocke
Jace
stiffly
Tleety
William Moberg