f377d9ba70
Fixed client movement.
2015-12-10 14:14:36 +01:00
663aca2641
Moved client and server from header.
...
Fixed so user are able to start a server and client on the same computer.
Starting 2 servers on the same computer will probably still crash the newest server (Don't do it).
2015-12-09 17:50:30 +01:00
0807a7d0ae
Fixed the bug where starting a server made the program crash on closing.
...
Fixed some memory leaks in Client.cpp.
2015-12-09 14:43:43 +01:00
ba150a264c
Fixed bug that cause the program to crash when closing if a server had been started.
...
Removed memory leaks in Client.cpp.
2015-12-09 14:41:26 +01:00
0e6353dd79
Fixed bug where closing glwindow as client crashed.
...
Server bug is still present.
2015-12-09 13:37:02 +01:00
247ff09743
Smoother movement over network. Some refactoring on client side. Now uses EKeyUp to determine if a key is pressed.
2015-12-09 13:02:39 +01:00
2a35c3055e
Renamed NetworkDefines.h --> NetworkDefinitions.h
2015-12-09 11:08:57 +01:00
58db7b755a
Random bugfixes and cleanup.
2015-12-08 18:24:08 +01:00
a8c0a1f294
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# include/Engine/Network/Client.h
# src/Engine/Network/Client.cpp
2015-12-08 18:07:18 +01:00
9f54a08536
Implemented new version of snapshot for 3D world. Also some cleanup.
2015-12-08 17:57:01 +01:00
24dada149f
Cleaned up code in Client.h and Client.cpp.
...
Moved ping code into Ping() function.
2015-12-08 17:18:03 +01:00
d1880754f5
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
2015-12-08 16:42:32 +01:00
27b44d2511
Input events for Client done. Instead of windows getAsyncKeyState();
2015-12-08 16:41:48 +01:00
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
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
e92119c99e
WIP trying to get Eventsystem to work in client.
2015-12-08 16:13:53 +01:00
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
8f55e90d2d
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
...
# Conflicts:
# include/Game/Game.h
2015-12-08 11:11:12 +01:00
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
ee41721a75
Merge remote-tracking branch 'origin/master' into Networking
2015-12-08 10:41:04 +01:00
c717dd7049
Removed sprite RenderQueue and moved FrameBuffer to rendering instead of rendering/util
2015-12-08 10:37:24 +01:00
d556f964e6
merge fixes
2015-12-08 10:15:12 +01:00
e7427bf3ad
Merge remote-tracking branch 'origin/master' into Rendering
...
# Conflicts:
# include/Game/HardcodedTestWorld.h
2015-12-08 10:15:00 +01:00
9e1a4b83ae
Linked picking to entities
2015-12-07 17:26:42 +01:00
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
cbbb7deaea
Copy pasta error. Corrected #ifndef
2015-12-07 16:53:33 +01:00
de5bdef58c
Rectangle definition conflicted with a definition included by <boost/asio.hpp>.
2015-12-07 16:52:42 +01:00
9c589a0dc6
Added support for color tinting
2015-12-07 16:33:03 +01:00
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
d8d63f804a
Added utility headers for network interface.
2015-12-07 16:11:27 +01:00
9b830526f8
Merge pull request #4 from teamfisk/ecs
...
Tests for ECS
2015-12-07 15:25:39 +01:00
6991a2be26
Renamed Networking -> Network
2015-12-07 15:22:26 +01:00
48339934b6
Created skeleton for Server/Client logic.
2015-12-07 14:32:49 +01:00
7f88a8b2d2
Merge remote-tracking branch 'origin/master' into ecs
2015-12-04 09:46:30 +01:00
aeb6c39603
Created ComponentWrapperFactory to make test mocking easier and manual component registration a little less painful
2015-12-03 19:31:55 +01:00
96a10ada38
fixed so the picking works with the new framebuffer class
2015-12-03 19:20:30 +01:00
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
dc8cc92ec2
Added a GenerateTexture function
2015-12-03 19:04:57 +01:00
aaa6b6ef20
Added FrameBuffer wrapper class
2015-12-03 18:32:01 +01:00
45a48bbbe5
Merge remote-tracking branch 'origin/master' into Rendering
2015-12-03 18:15:56 +01:00
1c06c06816
Added a ScreenCoords class with some util functions to clean up the Renderer class.
2015-12-03 18:14:52 +01:00
032b384f3f
Created framework for a hardcoded world for TESTING PURPOSES
2015-12-03 16:45:03 +01:00
d3d2e594fe
Basic and working entity system with a really ugly test case
2015-12-03 15:07:35 +01:00
0f33089039
Merge remote-tracking branch 'origin/master' into Rendering
2015-12-03 14:59:45 +01:00
983ca485f5
Picking now returning world position
2015-12-03 14:50:14 +01:00
18b63c7ef3
Added 3D picking of models to renderer
2015-12-02 18:00:11 +01:00
eb50a747fa
Added Hash for Vec2 Unordered_Map
2015-12-02 17:59:21 +01:00
c7430a9338
Fixed ComponentWrapper string scope error
2015-12-02 15:37:20 +01:00
61b7aa6b3d
Merge branch 'master' into ecs
2015-12-02 15:07:55 +01:00
b3e68c6c34
Implemented ComponentPool and initial tests for it
2015-12-02 15:07:48 +01:00
Jocke
stiffly
viktorljung
Viktor Ljung
sippeangelo
Tleety