62c3f72355
Fixed cmake for interpolationsystem.
2016-01-18 17:27:37 +01:00
d7780d8248
WIP implementing interpolation
2016-01-18 17:11:37 +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
37aa1eaa18
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
...
# Conflicts:
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-18 16:02:43 +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
35269315cc
Rename the thingie
2016-01-18 13:51:32 +01:00
bf3f8aea89
Merge pull request #36 from teamfisk/PlayerMovement
...
Player movement
2016-01-18 13:32:42 +01:00
942064c450
Removed class PlayerSystem and associated files.
2016-01-18 13:07:04 +01:00
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
4786986abd
Rendering pipeline fixes across the board and base work on refactored editor
2016-01-17 06:29:25 +01:00
Jace
f281d220de
Working Spawner, SpawnPoint, PlayerSpawn and Team components, along with their systems.
2016-01-17 01:00:48 +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
db1b972cd1
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
2016-01-15 18:32:47 +01:00
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
c09fe4ae55
Added a bool option to disable threads in in the configfile regarding resource loading.
2016-01-15 16:18:39 +01:00
63704b2e6b
Now calculating the velocity for the listener correctly.
2016-01-15 15:43:20 +01:00
7faed50507
Merge remote-tracking branch 'origin/master' into TextRendering
2016-01-15 13:24:24 +01:00
6fbb962b5e
Merge branch 'Rendering' into TextRendering
...
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Engine/Rendering/ShaderProgram.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
2016-01-15 13:23:42 +01:00
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
c8fe6853c0
Removed ShootEvent from CapturePoint
2016-01-15 11:17:22 +01:00
76a8b43ca3
Fixed logic for CapturePointSystem
2016-01-15 11:04:00 +01:00
14bc850fab
Merge remote-tracking branch 'origin/master' into Forward+
2016-01-15 11:02:27 +01:00
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
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
32634f742e
Merge remote-tracking branch 'origin/master' into Sound
2016-01-15 09:53:39 +01:00
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
a8f7d5f6b9
Merge pull request #30 from teamfisk/Rendering
...
Rendering Scenes
2016-01-14 16:43:35 +01:00
71047b08ec
Async load works, using exceptions for special resources.
2016-01-14 16:27:45 +01:00
Jace
d34470256b
EntityWrapper to uniquely identify entities and make using them a little easier
2016-01-14 15:43:19 +01:00
b80ecc29d8
Added comments and cleaned up in Game.cpp/h
2016-01-14 15:32:53 +01:00
Jace
71d936f8d1
Start of a movement system with collisions against AABBs
2016-01-14 14:54:12 +01:00
773a417a90
Merge branch 'master' into Sound
2016-01-14 14:19:48 +01:00
cca64dca24
Refactoring and commenting.
2016-01-14 13:54:38 +01:00
5e9a3774ab
CapturePointSystem code has been refactored and some branches "optimized"
2016-01-14 10:23:27 +01:00
9f185a1e35
Wrecked the last commit. Async loading works now.
2016-01-13 18:51:45 +01:00
b8a41b7c13
Updated some CapturePointLogic in CapturePointSystem: reset timer on capture, being able to take back the progress the other team did on your capturepoint. TODO: refactor!
2016-01-13 17:07:49 +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
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
stiffly
verysecrethero
Ayumiwii
William Moberg
Jace
viktorljung
Tleety
Viktor Ljung