 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
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
antc13
|
f1835fd89c
|
Animations PROBABLY works fine if all joints got keyframes.
|
2016-01-23 18:02:42 +01:00 |
|
 Jace
|
f1a54a89b3
|
Merge pull request #37 from teamfisk/OctTree
Oct tree
|
2016-01-21 09:57:46 +01:00 |
|
|
antc13
|
386e76f642
|
Puyshing
|
2016-01-20 09:49:54 +01:00 |
|
 William Moberg
|
017ad96bbe
|
Fixed some errors in Tests.
|
2016-01-19 15:20:29 +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
|
147b116f20
|
Fixed typo backslash instead of slash in various classes (the includes)
|
2016-01-13 15:58:52 +01:00 |
|
|
Jace
|
311475cbb6
|
Renamed all OctTree to Octree (More OCD)
|
2016-01-13 12:15:36 +01:00 |
|
|
Jace
|
8164a955d6
|
Renamed OctTree files to Octree (OCD to the max)
|
2016-01-13 12:15:09 +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 |
|
|
verysecrethero
|
454ed0032b
|
Refactored some RayVsModel tests
|
2015-12-15 14:01:49 +01:00 |
|
|
verysecrethero
|
1229a99af4
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-15 11:07:51 +01:00 |
|
|
verysecrethero
|
8e431c8edd
|
RayVsModel && RayVsAABB tests added and working. Also adjusted RayVsModel,RayVsAABB with deltas when values are very close to each other (floatingprecision problems)
|
2015-12-15 11:07:09 +01:00 |
|
|
verysecrethero
|
948f6d5de7
|
RayVsModel & RayVsAABB comparison continued
|
2015-12-14 17:53:11 +01:00 |
|
|
William Moberg
|
ae7d4b9097
|
Put Collision folder in CMakeLists.txt and altered paths.
|
2015-12-14 17:35:39 +01:00 |
|
|
verysecrethero
|
7f8e78c8cd
|
RayVsModel tests in progress
|
2015-12-14 17:04:35 +01:00 |
|
|
William Moberg
|
bad42fae1c
|
OctTree differentiates between static/dynamic objects now. Added a general BoxesInSameRegion method.
|
2015-12-09 13:27:00 +01:00 |
|
|
William Moberg
|
fa3816e55d
|
Fixed flawed unit test.
|
2015-12-08 10:44:12 +01:00 |
|
|
William Moberg
|
648ba502bb
|
Added small test for OctTree.
|
2015-12-07 17:27:57 +01:00 |
|
|
verysecrethero
|
17133b316a
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-03 17:31:07 +01:00 |
|
|
verysecrethero
|
28a290600b
|
BOOST MEM LEAK VS VISUAL STUDIO MEM LEAKS COMMENTED TESTS
|
2015-12-03 17:30:12 +01:00 |
|
|
William Moberg
|
af5b3a9302
|
Fixed wrong paths and added an outDistance to RayVsAABB.
|
2015-12-03 17:24:53 +01:00 |
|
|
verysecrethero
|
af294f78b7
|
czdxvxdfvxvxvc
|
2015-12-02 16:26:30 +01:00 |
|
|
verysecrethero
|
fd99562c7a
|
yrryr567yry567
|
2015-12-02 15:03:55 +01:00 |
|