 viktorljung
|
9e1a4b83ae
|
Linked picking to entities
|
2015-12-07 17:26:42 +01:00 |
|
 stiffly
|
2c993e82d6
|
Added the old prototype logic to Client.h. Can now communicate with a external server(on prototype).
|
2015-12-07 16:55:12 +01:00 |
|
|
stiffly
|
de5bdef58c
|
Rectangle definition conflicted with a definition included by <boost/asio.hpp>.
|
2015-12-07 16:52:42 +01:00 |
|
|
viktorljung
|
9c589a0dc6
|
Added support for color tinting
|
2015-12-07 16:33:03 +01:00 |
|
 William Moberg
|
000ad6358f
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-07 16:26:49 +01:00 |
|
|
William Moberg
|
04a8eeebe8
|
Added test get methods and some comments.
|
2015-12-07 16:25:01 +01:00 |
|
|
viktorljung
|
1df63aecd5
|
Added a RenderQueueFactory that produces a RenderQueueCollection for the Renderer to use.
Still needs more work
|
2015-12-07 16:24:34 +01:00 |
|
|
William Moberg
|
e8d23f3b3f
|
Added AABBVsAABB function.
|
2015-12-07 15:59:41 +01:00 |
|
|
stiffly
|
3bfd08e780
|
Adapted to folder name change in the code. Networking -> Network
|
2015-12-07 15:48:17 +01:00 |
|
 Viktor Ljung
|
9b830526f8
|
Merge pull request #4 from teamfisk/ecs
Tests for ECS
|
2015-12-07 15:25:39 +01:00 |
|
 sippeangelo
|
6991a2be26
|
Renamed Networking -> Network
|
2015-12-07 15:22:26 +01:00 |
|
|
stiffly
|
dbac9a9669
|
Added filter to CMakeLists.txt.
|
2015-12-07 15:03:03 +01:00 |
|
|
stiffly
|
48339934b6
|
Created skeleton for Server/Client logic.
|
2015-12-07 14:32:49 +01:00 |
|
 verysecrethero
|
89aa8c44b0
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
|
2015-12-07 10:03:55 +01:00 |
|
|
verysecrethero
|
f0e407bec2
|
Started on OctTreeTest (Merging with OctTree)
|
2015-12-07 10:03:36 +01:00 |
|
|
sippeangelo
|
7f88a8b2d2
|
Merge remote-tracking branch 'origin/master' into ecs
|
2015-12-04 09:46:30 +01:00 |
|
|
sippeangelo
|
25258f7e78
|
Better test for World and ECS
|
2015-12-04 09:45:50 +01:00 |
|
|
William Moberg
|
8e21b1fe35
|
Added ray collision detection in leaf nodes. Fixed possible bug in OctTree::AddBox
|
2015-12-03 19:25:40 +01:00 |
|
|
viktorljung
|
96a10ada38
|
fixed so the picking works with the new framebuffer class
|
2015-12-03 19:20:30 +01:00 |
|
|
viktorljung
|
a82c7c1e3b
|
Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/Renderer.cpp
|
2015-12-03 19:06:24 +01:00 |
|
|
viktorljung
|
dc8cc92ec2
|
Added a GenerateTexture function
|
2015-12-03 19:04:57 +01:00 |
|
|
viktorljung
|
aaa6b6ef20
|
Added FrameBuffer wrapper class
|
2015-12-03 18:32:01 +01:00 |
|
 Tleety
|
45a48bbbe5
|
Merge remote-tracking branch 'origin/master' into Rendering
|
2015-12-03 18:15:56 +01:00 |
|
|
Tleety
|
1c06c06816
|
Added a ScreenCoords class with some util functions to clean up the Renderer class.
|
2015-12-03 18:14:52 +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 |
|
|
William Moberg
|
abb61d2cd6
|
Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree
# Conflicts:
# include/Engine/Core/Collision.h
# src/Engine/Core/Collision.cpp
|
2015-12-03 17:11:35 +01:00 |
|
|
William Moberg
|
2f13f5da7a
|
Relocated AABB and Ray in Collision.h to their own files. Started implementation on OctTree.
|
2015-12-03 17:03:27 +01:00 |
|
|
sippeangelo
|
9fb8af8491
|
Merge branch 'master' into ecs
|
2015-12-03 16:55:32 +01:00 |
|
|
sippeangelo
|
032b384f3f
|
Created framework for a hardcoded world for TESTING PURPOSES
|
2015-12-03 16:45:03 +01:00 |
|
|
sippeangelo
|
d3d2e594fe
|
Basic and working entity system with a really ugly test case
|
2015-12-03 15:07:35 +01:00 |
|
|
viktorljung
|
9654140fb2
|
Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering
# Conflicts:
# src/Engine/CMakeLists.txt
|
2015-12-03 15:03:52 +01:00 |
|
|
Tleety
|
64aa3a1064
|
rendering/util now added to CMakeLists.txt
|
2015-12-03 15:02:14 +01:00 |
|
|
viktorljung
|
0f33089039
|
Merge remote-tracking branch 'origin/master' into Rendering
|
2015-12-03 14:59:45 +01:00 |
|
|
viktorljung
|
983ca485f5
|
Picking now returning world position
|
2015-12-03 14:50:14 +01:00 |
|
|
viktorljung
|
18b63c7ef3
|
Added 3D picking of models to renderer
|
2015-12-02 18:00:11 +01:00 |
|
|
verysecrethero
|
464650c370
|
more tests added
|
2015-12-02 16:31:39 +01:00 |
|
|
verysecrethero
|
af294f78b7
|
czdxvxdfvxvxvc
|
2015-12-02 16:26:30 +01:00 |
|
|
verysecrethero
|
c840183467
|
Merge remote-tracking branch 'origin/master' into OctTree
|
2015-12-02 15:43:51 +01:00 |
|
|
sippeangelo
|
c7430a9338
|
Fixed ComponentWrapper string scope error
|
2015-12-02 15:37:20 +01:00 |
|
|
sippeangelo
|
91f8b4359b
|
Fixed Tests not including dependencies properly
|
2015-12-02 15:25:27 +01:00 |
|
|
verysecrethero
|
1f99d46a8d
|
Merge branch 'master' into OctTree
|
2015-12-02 15:15:05 +01:00 |
|
|
sippeangelo
|
b3e68c6c34
|
Implemented ComponentPool and initial tests for it
|
2015-12-02 15:07:48 +01:00 |
|
|
verysecrethero
|
fd99562c7a
|
yrryr567yry567
|
2015-12-02 15:03:55 +01:00 |
|
|
sippeangelo
|
f65b7d591c
|
Fixed Tests running the game when it really shouldn't.
|
2015-12-02 15:03:18 +01:00 |
|
|
sippeangelo
|
8aa72735e7
|
Fixed Tests running the game when it really shouldn't.
|
2015-12-02 15:02:18 +01:00 |
|
|
William Moberg
|
c698149bdd
|
Added Ray, AABB structs, and basic rayVsAABB test function.
|
2015-12-02 14:24:21 +01:00 |
|
|
William Moberg
|
fa0ace8c68
|
Added empty OctTree files.
|
2015-12-02 11:32:56 +01:00 |
|
|
William Moberg
|
1d19c6901e
|
Added collision files.
|
2015-12-02 11:18:52 +01:00 |
|