4bb4e29515
More cleaning code
2015-12-17 13:23:15 +01:00
58a9d38e26
Added a class that client and server inherits from.
...
Class and server now share the same pointer i game.
You are now able to start a client and a server on the same computer.
2015-12-16 14:56:53 +01:00
478c692315
Refactoring. Client and server has Update Loop that runs before any game logic each frame.
2015-12-15 14:53:56 +01:00
0a8a9e5099
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# src/Engine/Rendering/RenderState.cpp
# src/Game/Game.cpp
2015-12-15 11:50:01 +01:00
b698a0d36f
WIP
...
Adding models now crashes. Threading
Added a create player event that currently is not used.
2015-12-15 11:21:46 +01:00
3f77da4a07
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
2015-12-14 17:07:12 +01:00
Jace
b66cf47ff0
Revert "Clearing raw input events from event broker to encourage use of input commands instead"
...
This reverts commit 2e7e8d3546
2015-12-14 13:57:52 +01:00
Jace
e5084e13ec
Added EditorSystem
2015-12-14 13:57:51 +01:00
Jace
7db1feac17
Added basic ImGui implementation
2015-12-14 13:57:45 +01:00
Jace
d16cbe84f0
Merge remote-tracking branch 'origin/master' into Input
...
# Conflicts:
# src/Engine/Rendering/Renderer.cpp
2015-12-14 13:40:22 +01:00
Jace
a7ed455766
Merge branch 'master' into Input
2015-12-14 13:19:38 +01:00
d182e6c453
Merge remote-tracking branch 'origin/master' into RendererDecoupling
...
# Conflicts:
# src/Game/Game.cpp
2015-12-14 13:16:56 +01:00
Jace
e76a6b74a3
Merge branch 'master' of github.com:teamfisk/TacticalZ
...
# Conflicts:
# src/Game/Game.cpp
2015-12-14 11:41:59 +01:00
Jace
e82911cb8b
Renderer FOV setting in Config.ini
2015-12-14 11:39:13 +01:00
Jace
30474b70df
MouseInputHandler
2015-12-12 13:42:46 +01:00
Jace
2e7e8d3546
Clearing raw input events from event broker to encourage use of input commands instead
2015-12-12 13:42:35 +01:00
Jace
013f911ae2
Added MouseInputHandler and firstPersonInputController to aid in creation of first person movement.
2015-12-12 13:42:34 +01:00
Jace
35624008e7
InputProxy with a KeyboardInputHandler to translate keyboard keys to input commands. Input origins are bound to commands through the BindOrigin event, or through loading them from a config file.
2015-12-12 13:42:34 +01:00
Jace
bffc97f310
Groundwork for input command proxy
2015-12-12 13:42:33 +01:00
45b87ed6b1
ShaderProgram is now a Resource.
...
All shaderprograms are now pointers and loaded with Resourcemanager.
2015-12-11 16:53:46 +01:00
53d5736420
Fixed a bugg with RenderState.
...
Renderstate now also handles the Frambuffer binding.
2015-12-11 16:07:12 +01:00
15442c8c75
Merge branch 'PlayerSystem' into Networking
...
# Conflicts:
# src/Game/Game.cpp
2015-12-11 15:45:27 +01:00
3da69c8a1b
Fixed indentation
2015-12-11 15:29:57 +01:00
16d636a87c
Removed Initialize function for systems.
2015-12-11 15:23:56 +01:00
0b60979c7b
Added a Initialize function for systems.
2015-12-11 14:03:00 +01:00
80f028edf2
Added a very basic PlayerSystem, and a PlayerComponent.
2015-12-11 13:45:19 +01:00
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
stiffly
Jocke
Jace
Tleety
viktorljung
sippeangelo