63db236dfa
Fixed bug which made the player not able to move diagonally.
...
Fixed a bug were m_PlayerID was not set for the client when connecting.
2015-12-14 16:35:43 +01:00
23c3f0709b
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
2015-12-11 11:59:22 +01:00
01d7388f91
Reactored the package loss logic.
...
Server cannot handle multiple clients yet.
Fixed WorldTest code by adding astrix.
2015-12-11 11:55:23 +01:00
6a3335315a
Merge branch 'master' into Networking
2015-12-10 17:26:01 +01:00
Jace
6326a60a79
Merge pull request #11 from teamfisk/Picking
...
Picking
2015-12-10 17:24:12 +01:00
641a43b2ec
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2015-12-10 17:16:22 +01:00
58952725e9
Added class Package to help refactor the code. The code got easier to read.
2015-12-10 17:07:18 +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
f377d9ba70
Fixed client movement.
2015-12-10 14:14:36 +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
9a8f5293af
Can now Identify Packet Loss. Enumerated messages that loops around 0-1000.
2015-12-10 12:55:28 +01:00
aa805f9a41
Merge remote-tracking branch 'origin/master' into Picking
2015-12-10 11:38:35 +01:00
Jace
dc4f5ad26e
Merge pull request #9 from teamfisk/ecs-systems
...
ECS Systems
2015-12-10 10:42:37 +01:00
eaca1c4dd1
Merge pull request #7 from teamfisk/ecs
...
Entity loading from schema
2015-12-10 10:32:00 +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
53ef749736
Fixed absoute positioning, I think...
2015-12-10 10:16:03 +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
3085ccdfbf
Added temporary Release function to resource manager to be able to reload a resource
2015-12-09 14:23:49 +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
c9b140bd6b
Semi-working entity loading from XML files!
2015-12-09 12:29:32 +01:00
2a35c3055e
Renamed NetworkDefines.h --> NetworkDefinitions.h
2015-12-09 11:08:57 +01:00
c9d1ba6cae
EntityIDs should start at 1, because 0 is world
2015-12-09 11:07:46 +01:00
eb9c217eb4
3D picking float value error fixed.
2015-12-09 10:44:06 +01:00
ce41421dbb
Added a "StartNetwork" bool to DefaultConfig.
2015-12-09 10:37:40 +01:00
Jace
d597c7e60e
Cleaned up custom type conversion code
2015-12-08 22:51:35 +01:00
Jace
0dbe0fe48e
Component definitions and default values loading from schema
2015-12-08 21:38:52 +01:00
f83e217638
Bugfix. if-statement was incorrect
2015-12-08 18:35:30 +01:00
58db7b755a
Random bugfixes and cleanup.
2015-12-08 18:24:08 +01:00
1e1ce4e127
Added Model component to schema
2015-12-08 18:21:24 +01:00
9fbea18330
fixup! Merge remote-tracking branch 'origin/master' into ecs
2015-12-08 18:20:42 +01:00
f337305dee
Merge remote-tracking branch 'origin/master' into ecs
2015-12-08 18:07:42 +01:00
d7de4fc694
Component definitions now loaded from schema. No default values yet.
2015-12-08 18:07:32 +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
03bbe25a1e
Fixed FindXerces.cmake
2015-12-08 17:42:59 +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
Jocke
stiffly
Jace
viktorljung
Viktor Ljung
sippeangelo
Tleety