 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Jace
|
a2e19013c6
|
Merge pull request #32 from teamfisk/AsyncResourceLoad
Async resource load
|
2016-01-15 16:20:36 +01:00 |
|
|
William Moberg
|
c09fe4ae55
|
Added a bool option to disable threads in in the configfile regarding resource loading.
|
2016-01-15 16:18:39 +01:00 |
|
|
stiffly
|
be33dfbd69
|
Forgot to change the velocity for the emitters as well...
|
2016-01-15 16:10:02 +01:00 |
|
|
stiffly
|
63704b2e6b
|
Now calculating the velocity for the listener correctly.
|
2016-01-15 15:43:20 +01:00 |
|
 Tleety
|
3de853ac8b
|
Frustum culling now works correctly for all resolutions
|
2016-01-15 15:38:14 +01:00 |
|
|
William Moberg
|
f5ea4d513c
|
ResourceManager::Load never returns null, throws exceptions instead.
|
2016-01-15 15:25:01 +01:00 |
|
|
stiffly
|
d9dd7f535f
|
When changing camera listener is updated. Also fixed some crashes in RenderSystem when there were no cameras available.
|
2016-01-15 13:45:08 +01:00 |
|
|
verysecrethero
|
e7da11fda4
|
Removed OctTreeTests since its too annoying to update them each time RenderSystem gets updated
|
2016-01-15 11:31:21 +01:00 |
|
|
William Moberg
|
76f90ab031
|
The main thread is not mutex blocked while child threads load anymore.
|
2016-01-15 11:29:46 +01:00 |
|
|
verysecrethero
|
8f257b9a58
|
Merge remote-tracking branch 'origin/master' into CapturePointTake
# Conflicts:
# src/Game/Game.cpp
# src/Tests/ResourceManagerTest.cpp
|
2016-01-15 11:24:20 +01:00 |
|
|
stiffly
|
3e2cb33bc0
|
Played around with new map MapVersion1. Was fun ヽ(´▽`)/
|
2016-01-15 11:23:29 +01:00 |
|
|
verysecrethero
|
c8fe6853c0
|
Removed ShootEvent from CapturePoint
|
2016-01-15 11:17:22 +01:00 |
|
|
verysecrethero
|
76a8b43ca3
|
Fixed logic for CapturePointSystem
|
2016-01-15 11:04:00 +01:00 |
|
|
Tleety
|
14bc850fab
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-15 11:02:27 +01:00 |
|
|
Tleety
|
ecf524eb4e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-15 11:01:58 +01:00 |
|
|
William Moberg
|
4cf6dcfc14
|
Merge branch 'master' into AsyncResourceLoad
# Conflicts:
# include/Engine/Rendering/RawModel.h
# src/Engine/Rendering/RenderQueueFactory.cpp
|
2016-01-15 10:10:57 +01:00 |
|
|
stiffly
|
32634f742e
|
Merge remote-tracking branch 'origin/master' into Sound
|
2016-01-15 09:53:39 +01:00 |
|
|
stiffly
|
e248b37ea8
|
Merge remote-tracking branch 'origin/master' into Sound
# Conflicts:
# src/Game/Game.cpp
|
2016-01-15 09:52:52 +01:00 |
|
|
Jace
|
567173c565
|
Merge branch 'master' into PlayerMovement
# Conflicts:
# src/Engine/Rendering/RenderSystem.cpp
# src/Game/Game.cpp
|
2016-01-14 18:24:34 +01:00 |
|
|
Jace
|
5e721325a4
|
Merge fixes
|
2016-01-14 18:20:51 +01:00 |
|
|
Jace
|
627108c6ee
|
Fixes for #30
# Conflicts:
# src/Game/Game.cpp
|
2016-01-14 18:15:38 +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 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|