6a3335315a
Merge branch 'master' into Networking
2015-12-10 17:26:01 +01:00
bb900c5110
Added picking event
2015-12-10 16:33:33 +01:00
99543a300d
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# include/Engine/Network/NetworkDefinitions.h
# include/Game/Game.h
# src/Engine/Network/Client.cpp
# src/Game/Game.cpp
2015-12-10 14:40:06 +01:00
d22e59f28f
Merge remote-tracking branch 'origin/master' into Networking
...
NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml
# Conflicts:
# include/Game/Game.h
# src/Game/Game.cpp
2015-12-10 13:53:18 +01:00
0367826f16
Added RaptorCopter example system
2015-12-10 10:17:18 +01:00
352074da04
Created base for systems
2015-12-10 10:17:08 +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
4de613814b
WIP Packet loss identification. Put packetID in message
2015-12-09 17:43:36 +01:00
90a79c702f
Added crude absolute positioning when rendering
2015-12-09 15:26:49 +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
578018607a
Moved decision of which map to load to Config.ini
2015-12-09 14:32:34 +01:00
58d827f7d0
Moved world definition to Schema/Entities/Test.xml and removed HardcodedTestWorld
2015-12-09 14:25:41 +01:00
0e6353dd79
Fixed bug where closing glwindow as client crashed.
...
Server bug is still present.
2015-12-09 13:37:02 +01:00
ce41421dbb
Added a "StartNetwork" bool to DefaultConfig.
2015-12-09 10:37:40 +01:00
9f54a08536
Implemented new version of snapshot for 3D world. Also some cleanup.
2015-12-08 17:57:01 +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
de5bdef58c
Rectangle definition conflicted with a definition included by <boost/asio.hpp>.
2015-12-07 16:52:42 +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
45a48bbbe5
Merge remote-tracking branch 'origin/master' into Rendering
2015-12-03 18:15:56 +01:00
032b384f3f
Created framework for a hardcoded world for TESTING PURPOSES
2015-12-03 16:45:03 +01:00
07d037ae57
Added Fly Camera and Vertex Colors
2015-12-01 15:56:26 +01:00
04d10bf7af
Functioning basic renderer for models
2015-12-01 14:07:10 +01:00
1fdf312af4
Set up Renderer base and shader compilation
2015-12-01 10:35:59 +01:00
872879c013
Engine puzzle completed
2015-11-30 17:02:24 +01:00
stiffly
viktorljung
Jocke
sippeangelo
Tleety