 Jocke
|
d1880754f5
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
|
2015-12-08 16:42:32 +01:00 |
|
 stiffly
|
27b44d2511
|
Input events for Client done. Instead of windows getAsyncKeyState();
|
2015-12-08 16:41:48 +01:00 |
|
|
Jocke
|
94adaf8ae3
|
Added support for multiplayer.
Reactored code, clumped together variables in PlayerDefinition.h.
Integrated server with entity system.
|
2015-12-08 16:41:22 +01:00 |
|
|
stiffly
|
6dc5112c26
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Engine/Network/Client.h
# src/Game/Game.cpp
|
2015-12-08 16:15:50 +01:00 |
|
|
stiffly
|
e92119c99e
|
WIP trying to get Eventsystem to work in client.
|
2015-12-08 16:13:53 +01:00 |
|
|
Jocke
|
c48c9e1f86
|
Added leak check when using windows (WinLeakCheck.h).
Added server to project.
A server can now be started in the project.
|
2015-12-08 13:54:18 +01:00 |
|
|
Jocke
|
8f55e90d2d
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Game/Game.h
|
2015-12-08 11:11:12 +01:00 |
|
|
Jocke
|
b5a010a517
|
Network now runs on it's own thread.
Network now sends Disconnect message when game is terminated.
|
2015-12-08 11:02:40 +01:00 |
|
 William Moberg
|
b87e543420
|
Merge branch 'master' into OctTree
|
2015-12-08 10:47:27 +01:00 |
|
|
William Moberg
|
fa3816e55d
|
Fixed flawed unit test.
|
2015-12-08 10:44:12 +01:00 |
|
|
stiffly
|
ee41721a75
|
Merge remote-tracking branch 'origin/master' into Networking
|
2015-12-08 10:41:04 +01:00 |
|
 viktorljung
|
c717dd7049
|
Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util
|
2015-12-08 10:37:24 +01:00 |
|
|
viktorljung
|
d556f964e6
|
merge fixes
|
2015-12-08 10:15:12 +01:00 |
|
|
viktorljung
|
e7427bf3ad
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Game/HardcodedTestWorld.h
|
2015-12-08 10:15:00 +01:00 |
|
|
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 |
|
|
viktorljung
|
9c589a0dc6
|
Added support for color tinting
|
2015-12-07 16:33:03 +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 |
|
 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 |
|
|
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 |
|
|
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
|
d3d2e594fe
|
Basic and working entity system with a really ugly test case
|
2015-12-03 15:07:35 +01:00 |
|
|
Tleety
|
64aa3a1064
|
rendering/util now added to CMakeLists.txt
|
2015-12-03 15:02:14 +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
|
af294f78b7
|
czdxvxdfvxvxvc
|
2015-12-02 16:26:30 +01:00 |
|
|
verysecrethero
|
1f99d46a8d
|
Merge branch 'master' into OctTree
|
2015-12-02 15:15:05 +01:00 |
|
|
verysecrethero
|
fd99562c7a
|
yrryr567yry567
|
2015-12-02 15:03:55 +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 |
|
|
viktorljung
|
1a963e823e
|
Scale, Rotate and Translate widgets up and working
|
2015-12-01 17:46:09 +01:00 |
|
|
sippeangelo
|
6ca1977e78
|
Added Xerces dependency
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
6ded34d160
|
Made Rendering/Util visible to CMake project
|
2015-12-01 17:04:03 +01:00 |
|
|
viktorljung
|
07d037ae57
|
Added Fly Camera and Vertex Colors
|
2015-12-01 15:56:26 +01:00 |
|
|
viktorljung
|
04d10bf7af
|
Functioning basic renderer for models
|
2015-12-01 14:07:10 +01:00 |
|
|
viktorljung
|
1fdf312af4
|
Set up Renderer base and shader compilation
|
2015-12-01 10:35:59 +01:00 |
|