BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
256 Commits 116 Branches 0 Tags
97f8be1915f4f7ed426cf5c3a6915c1b417bbefd
Commit Graph

154 Commits

Author SHA1 Message Date
Jocke 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 0eb51a0fea Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	include/Engine/Network/Packet.h
#	src/Engine/Network/Packet.cpp
 2015-12-18 10:16:31 +01:00
Jocke db5b6ad519 Added more error code to Packet class 2015-12-17 17:32:49 +01:00
stiffly 076030a252 Fixes, mostly name changes 2015-12-17 17:28:43 +01:00
stiffly 50822d09fc Merge remote-tracking branch 'origin/master' into Networking 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-17 14:10:02 +01:00
stiffly 4bb4e29515 More cleaning code 2015-12-17 13:23:15 +01:00
stiffly a6a08f48bb Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	include/Engine/Network/Client.h
#	src/Engine/Network/Client.cpp
 2015-12-17 11:24:34 +01:00
stiffly ba831f8a3c WIP Cleaning 2015-12-17 10:59:55 +01:00
stiffly 4c29e071af Cleaned code 2015-12-17 10:47:08 +01:00
Jocke 2cb5441b1c Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
 2015-12-17 09:47:15 +01:00
stiffly 97a0d97b0b Can now send transform components. 2015-12-16 17:56:44 +01:00
Jocke 6da5fd1263 Restructured code and added bool to stop client from spamming Snapshots to a server when 
it wasn't connected to one.
 2015-12-16 15:47:51 +01:00
Jocke 6eebce05af Merge remote-tracking branch 'origin/Networking' into Networking 2015-12-16 14:58:36 +01:00
Jocke 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
stiffly 50ccf96268 Movement code not buggy anymore. Also changed package to not allocate more data than needed. 2015-12-16 13:52:16 +01:00
Jace 661532e355 Slightly more usable entity tree 2015-12-16 12:05:55 +01:00
Jace bd6adcc157 Added SetParent to World 2015-12-16 12:05:37 +01:00
stiffly a2d55feed1 Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
#	src/Engine/Network/Server.cpp
 2015-12-16 11:12:15 +01:00
Jace 322aedaf72 Basic transformation widgets 2015-12-16 09:47:38 +01:00
stiffly 082b3fd3df Removed old input events from client 2015-12-15 17:22:46 +01:00
Jocke e940c1d604 WIP 2015-12-15 14:55:56 +01:00
stiffly 478c692315 Refactoring. Client and server has Update Loop that runs before any game logic each frame. 2015-12-15 14:53:56 +01:00
stiffly 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
stiffly 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
Jace 422e6f5264 Created a RenderState for ImGuiRenderPass 2015-12-14 20:26:04 +01:00
Jace 522679b14c Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT 2015-12-14 20:23:29 +01:00
stiffly 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
stiffly 8d9ff2b6dc Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
 2015-12-14 16:41:59 +01:00
Jocke 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
Jace cddd9026fb Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable. 2015-12-14 16:12:52 +01:00
Jace fb2cd0c6ae Fixed float angle wrapping 2015-12-14 15:20:55 +01:00
Jace 797036c204 Fixed picking event 2015-12-14 14:24:11 +01:00
Jace 545869e342 Added scene graph UI to Editor 2015-12-14 13:58:28 +01:00
Jace 07c4744436 Added World DeleteEntity, HasComponent and GetEntityChildren 2015-12-14 13:58:27 +01:00
Jace b8620eac26 Made debug camera detect UI focus properly 2015-12-14 13:58:27 +01:00
Jace 7c1182c28f Fixed absolute positions once and for all (maybe?) 2015-12-14 13:57:56 +01:00
Jace 2f3843e595 Editor version 1 2015-12-14 13:57:55 +01:00
Jace 9a119f38bb Added events processing to SystemPipeline 2015-12-14 13:57:54 +01:00
Jace 2018ba27ae Added KnowsEntity function to ComponentPool to query whether an entity has a component attached 2015-12-14 13:57:52 +01:00
Jace e5084e13ec Added EditorSystem 2015-12-14 13:57:51 +01:00
Jace 8a6030bf57 Added support for "Impure" systems, which only update once per frame and contain their own logic for manipulating the world, instead of relying on a single list of components. 2015-12-14 13:57:51 +01:00
Jace 2e321e15a5 Cleaned up ImGuiRenderPass 2015-12-14 13:57:50 +01:00
Jace c81a054601 Subscribed ImGui to MouseScroll event 2015-12-14 13:57:50 +01:00
Jace af14d60493 Added MouseScroll event to input manager 2015-12-14 13:57:49 +01:00
Jace 7db1feac17 Added basic ImGui implementation 2015-12-14 13:57:45 +01:00
Jace 653b4689b5 Added KeyboardChar event for keyboard text input 2015-12-14 13:56:24 +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
Tleety d182e6c453 Merge remote-tracking branch 'origin/master' into RendererDecoupling 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-14 13:16:56 +01:00
Jace 30474b70df MouseInputHandler 2015-12-12 13:42:46 +01:00
Jace 03e226ffea Refactored InputProxy to gracefully handle cases where multiple origins send the same command 2015-12-12 13:42:35 +01:00