 verysecrethero
|
b098bd2bd3
|
Merge remote-tracking branch 'origin/master' into ShootEvent
# 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/PlayerSystem.cpp
# src/Tests/HealthSystemTest.cpp
# src/Tests/OctTreeTestAnders.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestGameClass.h
# src/Tests/OctTreeTestHardCodedTestWorld.h
|
2016-01-20 17:53:33 +01:00 |
|
 William Moberg
|
60037c2849
|
Merge pull request #31 from teamfisk/CapturePointTake
Capture point take
|
2016-01-20 17:43:20 +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
|
f6ce98249e
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
|
2016-01-20 16:32:14 +01:00 |
|
|
verysecrethero
|
29aefc5af2
|
Added some more visual CaptureTestState xml files
|
2016-01-20 16:06:35 +01:00 |
|
|
verysecrethero
|
39ae83efd4
|
Fixed all tests in CapturePointTest and cleaned up some comments
|
2016-01-20 15:40:56 +01:00 |
|
|
verysecrethero
|
8189e3c00c
|
Logic in CapturePointSystem is working again. Need to update all Tests!
|
2016-01-20 14:59:18 +01:00 |
|
|
William Moberg
|
410e349329
|
Added test map for capture points and some debug code.
|
2016-01-19 18:27:58 +01:00 |
|
|
verysecrethero
|
b45de542da
|
CapturePointSystem updated, all tests are green
|
2016-01-19 17:19:58 +01:00 |
|
 Joachim Pettersson
|
dfa96f74e1
|
Merge pull request #39 from teamfisk/Forward+
Forward+
|
2016-01-19 16:53:07 +01:00 |
|
 Tleety
|
5d6d0f82b9
|
Removed some debug code
|
2016-01-19 16:48:59 +01:00 |
|
|
Tleety
|
a124ab2400
|
Some asset shit.
Fixed testworld to use the right model.
|
2016-01-19 16:11:56 +01:00 |
|
|
Tleety
|
d2263b0c90
|
Assets added
|
2016-01-19 16:09:30 +01:00 |
|
|
Tleety
|
a8ffb24040
|
latest commit fix
|
2016-01-19 16:08:09 +01:00 |
|
|
Tleety
|
893ef38237
|
Removed world from renderer and moved depth-calculation code to modeljob
|
2016-01-19 15:41:17 +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 |
|
|
Tleety
|
982837052a
|
DirectionalLight now correctly getting directions
|
2016-01-19 14:44:17 +01:00 |
|
|
Tleety
|
4cafb2fc4c
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-19 12:33:08 +01:00 |
|
|
Tleety
|
46e17b7e0d
|
Working directional light
|
2016-01-19 12:32:34 +01:00 |
|
|
Tleety
|
4b29d48f27
|
WIP
|
2016-01-18 17:57:45 +01:00 |
|
|
Tleety
|
601ce85c05
|
WIP
|
2016-01-18 16:50:41 +01:00 |
|
|
verysecrethero
|
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 |
|
|
Tleety
|
01a164847c
|
Directional light now fully added to all lists.
|
2016-01-18 15:15:33 +01:00 |
|
|
Tleety
|
794635b6a1
|
Added DirectionalLights to renderqueue jobs
|
2016-01-18 14:58:19 +01:00 |
|
|
Tleety
|
0a3b6f4da1
|
Added DirectionalLightJob
|
2016-01-18 14:57:55 +01:00 |
|
|
verysecrethero
|
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 |
|
|
Tleety
|
6f1fd19ac7
|
Directional lights now being filled into m_LightSources
|
2016-01-18 14:30:28 +01:00 |
|
|
Tleety
|
6680f6863f
|
DirectionalLight component added.
|
2016-01-18 14:30:22 +01:00 |
|
|
Tleety
|
4092f6b4d4
|
New Lightstruct working.
|
2016-01-18 14:20:28 +01:00 |
|
|
William Moberg
|
bf3f8aea89
|
Merge pull request #36 from teamfisk/PlayerMovement
Player movement
|
2016-01-18 13:32:42 +01:00 |
|
|
William Moberg
|
0669d91767
|
CollisionSystem loops over Collidable components.
|
2016-01-18 13:29:10 +01:00 |
|
|
William Moberg
|
942064c450
|
Removed class PlayerSystem and associated files.
|
2016-01-18 13:07:04 +01:00 |
|
 Jace
|
fb7e0498a8
|
Merge pull request #35 from teamfisk/DisableMemoryPool
Possible to disable the MemoryPool allocation in Config files.
|
2016-01-18 10:46:53 +01:00 |
|
|
William Moberg
|
a346a329b3
|
Added an option to disable the Pool allocation in Config.ini, in case there is a mess with the MemoryPool.
|
2016-01-18 10:16:35 +01:00 |
|
|
Jace
|
f281d220de
|
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
|
2016-01-17 01:00:48 +01:00 |
|
|
Jace
|
6385a98eca
|
Added runtime type size check to ComponentWrapper to avoid corruption when types don't match
|
2016-01-17 00:59:26 +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 |
|
|
Jace
|
f65ac65e30
|
Updated component defaults files to match component schema and made schema validation strict.
|
2016-01-16 17:03:57 +01:00 |
|
|
Jace
|
b2213dbe9a
|
Merge remote-tracking branch 'origin/master' into PlayerMovement
# Conflicts:
# include/Engine/Collision/Collision.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/CollisionTestLevel.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Collision/Collision.cpp
# src/Game/Game.cpp
|
2016-01-15 20:28:43 +01:00 |
|
|
Jace
|
bbabc84127
|
Fixed default values for CPlayerSpawn
|
2016-01-15 20:26:30 +01:00 |
|
|
Jace
|
8bd5a428b9
|
EntityFileParser now ignores component fields not present in component definition instead of crashing.
|
2016-01-15 20:25:48 +01:00 |
|
|
Jace
|
db1b972cd1
|
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
|
2016-01-15 18:32:47 +01:00 |
|
|
Jace
|
97e12ff550
|
Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.
|
2016-01-15 18:31:32 +01:00 |
|
 stiffly
|
d28583ca9e
|
Fixes for #34 (Licenses)
|
2016-01-15 17:20:11 +01:00 |
|
|
Jace
|
0469460029
|
Input binding format changed to allow custom values for bindings. Relevant code must clamp input values to prevent speedhaxx!
|
2016-01-15 16:32:04 +01:00 |
|
|
Jace
|
7b2a21f0b0
|
Merge pull request #34 from teamfisk/Sound
Sound
|
2016-01-15 16:26:55 +01:00 |
|
|
stiffly
|
5c45dbdd10
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# resources/Schema/Types/Entity.xsd
|
2016-01-15 16:25:32 +01:00 |
|
|
Jace
|
ce8dcd3022
|
Merge pull request #33 from teamfisk/Forward+
Forward+
|
2016-01-15 16:20:53 +01:00 |
|