 antc13
|
4c5d17b203
|
Merge remote-tracking branch 'origin/master' into Importer
# Conflicts:
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Network/Server.cpp
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Tests/OctTreeTestGameClass.cpp
# src/Tests/OctTreeTestHardCodedTestWorld.h
# src/Tests/ResourceManagerTest.cpp
|
2016-01-24 14:40:52 +01:00 |
|
|
antc13
|
f1835fd89c
|
Animations PROBABLY works fine if all joints got keyframes.
|
2016-01-23 18:02:42 +01:00 |
|
 Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +01:00 |
|
|
antc13
|
a47317bb32
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
# Conflicts:
# include/Engine/Collision/Collision.h
# resources/Shaders/ForwardPlus.frag.glsl
# resources/Shaders/ForwardPlus.vert.glsl
|
2016-01-19 18:26:45 +01:00 |
|
 William Moberg
|
713ebbe18c
|
Can add any objects that inherit from AABB into the Octree.
|
2016-01-19 14:50:46 +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 |
|
|
antc13
|
2a3009212a
|
Importing custom mesh without material.
|
2016-01-18 19:37:55 +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 |
|
|
antc13
|
16c39df439
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
# Conflicts:
# include/Engine/Collision/Collision.h
# src/Engine/Rendering/Model.cpp
# src/Engine/Rendering/RawModelAssimp.cpp
|
2016-01-15 18:00:30 +01:00 |
|
|
antc13
|
8437b9c734
|
Commit for Pull
|
2016-01-15 17:58:26 +01:00 |
|
|
Jace
|
5e721325a4
|
Merge fixes
|
2016-01-14 18:20:51 +01:00 |
|
|
Jace
|
d34470256b
|
EntityWrapper to uniquely identify entities and make using them a little easier
|
2016-01-14 15:43:19 +01:00 |
|
|
Jace
|
71d936f8d1
|
Start of a movement system with collisions against AABBs
|
2016-01-14 14:54:12 +01:00 |
|
|
William Moberg
|
a143ae7c85
|
Changed to relative #include paths.
|
2016-01-13 15:53:55 +01:00 |
|
|
Jace
|
d6ef527f25
|
Basic collisions using Octree. Seems buggy over octree boundaries.
|
2016-01-13 15:34:43 +01:00 |
|
|
William Moberg
|
3e2ffdb85b
|
Fixed comment on Trigger events.
|
2015-12-17 13:48:35 +01:00 |
|
|
William Moberg
|
5160a45b44
|
Made Ray into a class with checks so the direction will always be normalized.
|
2015-12-17 13:41:34 +01:00 |
|
|
William Moberg
|
6d1cbd928e
|
Improved collision logic, still not perfect since it updates before PlayerSystem.
|
2015-12-16 16:34:27 +01:00 |
|
|
William Moberg
|
cf0ff9bfe5
|
Simple quickly made CollisionSystem.
|
2015-12-16 12:23:08 +01:00 |
|
|
William Moberg
|
d10df6ae09
|
TriggerSystem implemented and working.
|
2015-12-16 12:22:15 +01:00 |
|
|
William Moberg
|
e2417be8c7
|
Very simple CollisionSystem made, 'Z','Y' to toggle on/off.
|
2015-12-15 15:36:28 +01:00 |
|
|
William Moberg
|
170610bcb1
|
Added a TriggerSystem, seems to work as intended.
|
2015-12-15 14:49:52 +01:00 |
|
|
William Moberg
|
ae7d4b9097
|
Put Collision folder in CMakeLists.txt and altered paths.
|
2015-12-14 17:35:39 +01:00 |
|
|
William Moberg
|
59095c2ce5
|
Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder.
|
2015-12-14 17:08:00 +01:00 |
|