BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,835 Commits 116 Branches 0 Tags
34e551663f5774a3a2dc0a4eacd2fd3e2ecad3e5
Commit Graph

641 Commits

Author SHA1 Message Date
stiffly ad9bb5fba4 Added an extra interpolation point. 2016-01-19 15:03:10 +01:00
William Moberg 713ebbe18c Can add any objects that inherit from AABB into the Octree. 2016-01-19 14:50:46 +01:00
stiffly e0c4394f20 Merge. Also fixed interpolation for scale and rotation. 
Merge remote-tracking branch 'origin/master' into Networking

# Conflicts:
#	include/Game/Game.h
#	src/Game/CMakeLists.txt
#	src/Game/Game.cpp
 2016-01-19 14:04:25 +01:00
stiffly 3142c701e3 WIP interpolating scale and orientation 2016-01-19 11:42:30 +01:00
Jace 9e3dfff7b6 WIP world pausing 2016-01-19 00:52:17 +01:00
Jace 51979d7f0c Changed System to take World through constructor and store it instead, cause it makes more sense. 2016-01-18 23:59:33 +01:00
William Moberg b2358a1854 Added bool in Physics to toggle gravity for entities. 2016-01-18 18:16:24 +01:00
stiffly a6425160fd Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking 
# Conflicts:
#	include/Game/InterpolationSystem.h
#	src/Game/InterpolationSystem.cpp
 2016-01-18 18:13:19 +01:00
stiffly 88eb3ca2db Scraping queues for interpolation 2016-01-18 18:07:59 +01:00
Jocke 3e90ed564c Moved Struct in InterpolationSystem.h and fixed bug. 2016-01-18 18:07:39 +01:00
viktorljung 2a93e2ae7f Merge remote-tracking branch 'origin/master' into TextRendering 
# Conflicts:
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-18 17:44:26 +01:00
stiffly 765509b510 Added interpolationsystem to pipeline. 2016-01-18 17:34:17 +01:00
stiffly 62c3f72355 Fixed cmake for interpolationsystem. 2016-01-18 17:27:37 +01:00
stiffly d7780d8248 WIP implementing interpolation 2016-01-18 17:11:37 +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
Ayumiwii 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
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
Ayumiwii 35269315cc Rename the thingie 2016-01-18 13:51:32 +01:00
William Moberg bf3f8aea89 Merge pull request #36 from teamfisk/PlayerMovement 
Player movement
 2016-01-18 13:32:42 +01:00
William Moberg 942064c450 Removed class PlayerSystem and associated files. 2016-01-18 13:07:04 +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 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
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
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 63704b2e6b Now calculating the velocity for the listener correctly. 2016-01-15 15:43:20 +01:00
viktorljung 7faed50507 Merge remote-tracking branch 'origin/master' into TextRendering 2016-01-15 13:24:24 +01:00
viktorljung 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
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
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
Viktor Ljung a8f7d5f6b9 Merge pull request #30 from teamfisk/Rendering 
Rendering Scenes
 2016-01-14 16:43:35 +01:00
William Moberg 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
stiffly 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
stiffly 773a417a90 Merge branch 'master' into Sound 2016-01-14 14:19:48 +01:00