db18a45368
We are now sending EPlayerDamage events.
...
Client now listens to EPlayerDamage events and send them to Server.
Server publishes EPlayerDamage events received from Client.
2016-01-14 10:16:11 +01:00
a060640da3
Removed unnecessary unnecessary if in Client::OnInputCommand.
...
Change name from Server::parseEvent to Server::parseOnInputCommand
2016-01-13 18:00:12 +01:00
f47f913bf5
Added logic for sending input from Client to Server.
...
Fixed so that snapshots set their parent correctly. Will get problems if we have more components
than unsigned int max size, but that was already a problem.
Client now maps Entitys received from server with local Entitys by mapping their EntityIDs.
2016-01-13 16:09:16 +01:00
2284399538
Removed Close method from Client, Server and Network.
...
Removed legacy variable m_ThreadIsRunning in Client.h and Server.h.
Removed m_EventBroker->Unsubscribe(m_EInputCommand) in Client destructor.
2016-01-12 17:47:03 +01:00
2bf1d53f2c
Merge remote-tracking branch 'origin/master' into Networking
2016-01-12 13:17:00 +01:00
236230d12c
Packets now dynamically allocates more memory when they need it.
...
Increased local receive buffer for Client and Server() and removed the magic number that was used
In Server.h and Client.h
(char readBuffer[INPUTSIZE] = { 0 }).
Packets start size has now been increased to 512 bytes.
Changed ComponentInfo::FieldsInOrder to store strings instead of pointers.
Removed HasEntity() and are now using ValidEntity() instead.
2016-01-12 12:00:19 +01:00
Jace
349fa9d7fa
Fixed crash when creating new entities
2016-01-11 16:47:30 +01:00
b37ffc7449
WIP Model component not working.
2016-01-11 14:58:49 +01:00
6c13916eec
Removed unnecessary code.
2016-01-11 14:58:30 +01:00
f0ad28bac4
Removed some comments. Basically did nothing
2016-01-11 14:58:15 +01:00
Jace
4a516a4d86
Added ComponentInfo::FieldsInOrder to be able to loop through component fields in a consistent order based on the component XSD definition
2016-01-11 14:56:53 +01:00
Jace
21aea6f31d
Added World::ValidEntity for checking if an entity exists or not
2016-01-11 14:35:41 +01:00
Jace
297a3fb493
Support for "name" attribute on entities
2016-01-11 14:35:41 +01:00
Jace
c47ef61ddc
Temporary fix for widgets being annoying entities in the editor
2016-01-11 14:35:41 +01:00
Jace
e8e93587e9
Fixed weird behavior when components would register multiple times (Hint: It should never happen in the first place)
2016-01-11 14:35:41 +01:00
Jace
39dd27726d
MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks!
...
Also contains inseparable editor changes.
2016-01-11 14:35:41 +01:00
Jace
6adc98eea5
Now writes entities to file instead of stdout...
2016-01-11 14:35:41 +01:00
Jace
11d547cde8
Entity 0 is now a real entity in the world, created by the first entity read while importing. This makes the difference between map files and entity files automatic, since consecutive entity file loads should automatically get the world as parent, as long as the world entity has been created earlier.
2016-01-11 14:35:41 +01:00
Jace
24b9e951c2
Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it.
2016-01-11 14:35:41 +01:00
Jace
81024b4a1d
First work on EntityFileWriter for saving levels
2016-01-11 14:35:41 +01:00
Jace
23e78c4947
Cleaned up code
2016-01-11 14:35:15 +01:00
Jace
0bcbcda8b8
EntityFilePreprocessor
...
WIP
WIP
EntityFilePreprocessor
2016-01-11 14:35:15 +01:00
Jace
b908a9f9c6
Revert "Forward+"
2016-01-11 13:48:55 +01:00
dbb44fb4e4
Changing cullLights to Culllights, need to do this in 2 commits since Git extensions is fucked.
2016-01-11 10:22:56 +01:00
9f871bbe7c
Lights now use the absolute position instead of it's local position.
2016-01-08 14:31:44 +01:00
2bd60be741
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# resources/Schema/Types/Entity.xsd
2016-01-08 14:14:43 +01:00
dab4ba2164
Pointlights are now using the pointlight component and the Light renderqueue to draw.
2016-01-08 14:12:09 +01:00
beb0967c3b
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# src/Game/Game.cpp
2016-01-07 16:49:20 +01:00
c4642cc530
Merge branch 'master' into OrderedSystemPipeline
...
# Conflicts:
# include/Engine/Core/SystemPipeline.h
2016-01-07 15:07:16 +01:00
f67f22c82d
Added Healthrelated events and start of HealthSystem, also reverted the crash "fix"
2016-01-07 14:53:31 +01:00
fa8775a72e
Renamed vars and added some comments.
2016-01-07 10:28:18 +01:00
Jace
49884d7e60
Fix for crash when unsubscription during event processing (untested)
2016-01-06 13:47:02 +01:00
e7bb8954bf
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/Renderer.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/Renderer.cpp
2016-01-06 11:35:55 +01:00
e510f2b88c
Forward plus render pass now removed from Renderer.cpp to it's own class.
2016-01-06 11:32:42 +01:00
Jace
34cbbb3eb1
Fixed exit crash(es)
2016-01-06 11:20:16 +01:00
d38f58165f
Merge remote-tracking branch 'origin/master' into Forward+
...
# Conflicts:
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderState.cpp
# src/Engine/Rendering/Renderer.cpp
2015-12-18 15:27:47 +01:00
069a6756b9
LightcullingPass for forward+ is now separate from Renderer.cpp.
2015-12-18 14:31:16 +01:00
a550b6077e
Re-enabled InputCommand debugging info in console
2015-12-18 14:25:55 +01:00
00bc55370d
Added error check in Collision.cpp
2015-12-18 14:19:28 +01:00
330f08b926
Merge remote-tracking branch 'origin/master' into Networking
...
# Conflicts:
# include/Game/PlayerSystem.h
# src/Game/Game.cpp
# src/Game/PlayerSystem.cpp
2015-12-18 14:18:53 +01:00
a0255f1b31
Now uses config file to determine if client or server should be started.
2015-12-18 13:34:21 +01:00
ab6af30a28
Base classes for decoupled forward+ renderer and a fix where if you had to many lights in a tile(200-300+) the list would fill up before the end of frustums.
2015-12-18 12:02:02 +01:00
a858dab8b6
Network not longer threaded
2015-12-18 12:00:14 +01:00
3636ad45af
Changed to correct branch
2015-12-18 11:29:11 +01:00
6d649e4d35
Merge remote-tracking branch 'origin/Networking' into Networking
...
# Conflicts:
# src/Engine/Network/Client.cpp
2015-12-18 11:26:48 +01:00
5c1a93021b
Client now reads address and port from config file. Default address is set to local host.
2015-12-18 11:22:13 +01:00
6cf7c12d34
Forward+ working
2015-12-18 11:09:54 +01:00
ad43cc44c3
Merge remote-tracking branch 'origin/Networking' into Networking
2015-12-18 11:03:21 +01:00
002e1d8c5a
Removed magic number from Packet constructor in Packet.cpp.
2015-12-18 10:52:46 +01:00
97f8be1915
Made Network.h's Start() and Update pure virtual and removed cpp.
...
Removed unnecessary code from NetworkDefinitions.h.
Renamed sizeOfPackage to sizeOfPacket in Packet.cpp.
2015-12-18 10:21:56 +01:00
Jocke
Jace
stiffly
Tleety
William Moberg
verysecrethero
viktorljung