Jace
f1a54a89b3
Merge pull request #37 from teamfisk/OctTree
...
Oct tree
2016-01-21 09:57:46 +01:00
39ae83efd4
Fixed all tests in CapturePointTest and cleaned up some comments
2016-01-20 15:40:56 +01:00
8189e3c00c
Logic in CapturePointSystem is working again. Need to update all Tests!
2016-01-20 14:59:18 +01:00
b45de542da
CapturePointSystem updated, all tests are green
2016-01-19 17:19:58 +01:00
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
017ad96bbe
Fixed some errors in Tests.
2016-01-19 15:20:29 +01:00
4c1a49a8a4
Merge remote-tracking branch 'origin/master' into CapturePointTake
...
# Conflicts:
# include/Engine/Core/ComponentWrapper.h
# include/Game/PlayerSystem.h
# include/Game/Systems/HealthSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Components/Player.xml
# resources/Schema/Types/Entity.xsd
# src/Game/CMakeLists.txt
# src/Game/PlayerSystem.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestGameMain.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
2016-01-18 16:48:49 +01:00
e0410d4345
Small logicfix in CapturePointSystem. Readded CapturePointSystem in Game. Added 2 tests. Tests have been refined a lot.
2016-01-18 14:41:16 +01:00
Jace
d8a24bbfde
Renamed all instances of "Property" to "Field" in ComponentWrapper to maintain consistent naming with ComponentInfo
2016-01-17 00:38:25 +01:00
Jace
9ec32464bc
Added enum support to entity file format, see "Team" component for an example. Use ComponentInfo::Enum to convert enum string keys to its corresponding integer representation at runtime.
2016-01-16 23:12:24 +01:00
e7da11fda4
Removed OctTreeTests since its too annoying to update them each time RenderSystem gets updated
2016-01-15 11:31:21 +01:00
c8fe6853c0
Removed ShootEvent from CapturePoint
2016-01-15 11:17:22 +01:00
Jace
3a4f378ac5
Merge remote-tracking branch 'origin/master' into PlayerMovement
...
# Conflicts:
# src/Game/Game.cpp
2016-01-14 17:07:39 +01:00
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
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
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
d6ef527f25
Basic collisions using Octree. Seems buggy over octree boundaries.
2016-01-13 15:34:43 +01:00
Jace
311475cbb6
Renamed all OctTree to Octree (More OCD)
2016-01-13 12:15:36 +01:00
Jace
8164a955d6
Renamed OctTree files to Octree (OCD to the max)
2016-01-13 12:15:09 +01:00
0f17f9a888
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Engine/Editor/EditorSystem.h
# include/Engine/Rendering/EPicking.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/RawModel.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-12 16:13:20 +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
4048ce6bd4
Small fix.
2016-01-07 15:18:35 +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
e0cc25dbac
Fixed the OctTreeTestGameClass.cpp so it draws the OctTree nicely again
2015-12-18 14:22:57 +01:00
b1ae96f737
Merge remote-tracking branch 'origin/master' into AndersTest
...
# Conflicts:
# include/Game/Game.h
# src/Engine/Core/OctTree.cpp
# src/Game/Game.cpp
# src/Tests/CMakeLists.txt
# src/Tests/OctTreeTest.cpp
# src/Tests/WorldTest.cpp
2015-12-18 11:57:21 +01:00
1e5e24a036
The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp
2015-12-18 11:37:02 +01:00
13f7fb2561
Stashed test fixes for boost 1.6
2015-12-18 10:01:05 +01:00
5160a45b44
Made Ray into a class with checks so the direction will always be normalized.
2015-12-17 13:41:34 +01:00
454ed0032b
Refactored some RayVsModel tests
2015-12-15 14:01:49 +01:00
1910ab705b
AndersTest misc small mergefixes
2015-12-15 13:48:14 +01:00
1229a99af4
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
2015-12-15 11:07:51 +01:00
8e431c8edd
RayVsModel && RayVsAABB tests added and working. Also adjusted RayVsModel,RayVsAABB with deltas when values are very close to each other (floatingprecision problems)
2015-12-15 11:07:09 +01:00
948f6d5de7
RayVsModel & RayVsAABB comparison continued
2015-12-14 17:53:11 +01:00
ae7d4b9097
Put Collision folder in CMakeLists.txt and altered paths.
2015-12-14 17:35:39 +01:00
7f8e78c8cd
RayVsModel tests in progress
2015-12-14 17:04:35 +01:00
5fce7490a9
MergeFix OctTree williambranch and andersbranch
2015-12-14 11:57:18 +01:00
8abef7024d
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
...
# Conflicts:
# src/Tests/OctTreeTest.cpp
2015-12-14 11:14:09 +01:00
bf08ffe392
Added InputManagerTest
2015-12-14 11:02:23 +01:00
5f5cab1171
Added Tests for ResourceManager
2015-12-14 10:55:49 +01:00
55aad493ff
Fixed warnings in OctTree. Cleaned unit tests.
2015-12-11 16:45:38 +01:00
9a7d77f29d
Removed notes in OldOctTree.
2015-12-11 16:44:49 +01:00
b3bb0e543f
Added EventBroker Test from the other project
2015-12-11 16:17:23 +01:00
81034420a9
Put back old version of OctTree for testing, made unit tests.
...
Tests shows the old version checks for collisions etc. faster, new version adds objects into tree faster, and doesn't give duplicated results.
2015-12-11 16:04:30 +01:00
Jace
verysecrethero
William Moberg
viktorljung