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

256 Commits

This Branch
This Branch
All Branches
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 000adb198f Reset RenderQueueFactory.cpp to original state 2015-12-17 14:36:36 +01:00
stiffly 51a2da9cc0 Removed old Event that is not used 2015-12-17 14:28:17 +01:00
stiffly 0f0a1ceca7 No more fake packet loss 2015-12-17 14:22:31 +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
Tobias Dahl 1a9b765d47 Merge pull request #17 from teamfisk/Editor 
Kinda usable editor
 2015-12-17 10:59:08 +01:00
Jace c8460e0a6c It's no use 2015-12-17 10:55:54 +01:00
stiffly 4c29e071af Cleaned code 2015-12-17 10:47:08 +01:00
Jace b87f559291 Updated default configs with editor stuff 2015-12-17 10:46:49 +01:00
Jace d4f5856304 Component attributes no longer get set on the wrong entity when switching selection while editing a field 2015-12-17 10:44:34 +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
Jace a914a7f924 Switched to deps/master branch 2015-12-16 17:22:35 +01:00
Jace dbbbb7b4e7 Working rotations and translations relative to global and local space for children 2015-12-16 17:20:56 +01:00
Jocke 425f3ca3dd Fixed "trying to read more than package size" warnings. 2015-12-16 16:49:18 +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
Jocke e74b2b6874 Made it easier for non network members to create packages and extract information from them by addin PopFrontString() and PopFrontPrimitive<type>(). 2015-12-16 10:40:40 +01:00
Jace 322aedaf72 Basic transformation widgets 2015-12-16 09:47:38 +01:00
stiffly 3f602c9d63 Test code 2015-12-15 17:55:08 +01:00
stiffly 082b3fd3df Removed old input events from client 2015-12-15 17:22:46 +01:00
stiffly 9b348a7d97 Updated movement code once again. 2015-12-15 16:50:59 +01:00
stiffly 889e0bb3d3 Cleaned up PlayerSystem. Sets velocity to 0 every frame. 2015-12-15 16:35:09 +01:00
stiffly 1669649186 Fixed bug with entityID. Also trying to fix movement WIP. 2015-12-15 16:24:09 +01:00
stiffly 472a8db81a Various bug fixes. 2015-12-15 15:32:31 +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 51dd627ae3 Added Fonts to deploy.bat 2015-12-15 09:49:43 +01:00
Jace c296c4eb3b Fixed picking pass... again... 2015-12-15 09:49:38 +01:00
Jace 422e6f5264 Created a RenderState for ImGuiRenderPass 2015-12-14 20:26:04 +01:00
Viktor Ljung 9cee8b5478 Merge pull request #16 from teamfisk/Editor 
Added BlendEquation and BlendFunc to RenderState ...
 2015-12-14 20:25:10 +01:00
Jace 522679b14c Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT 2015-12-14 20:23:29 +01:00
Viktor Ljung 25683e8a8a Merge pull request #15 from teamfisk/Editor 
Editor
 2015-12-14 19:05:27 +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 bac0a1de26 Removed annoying cube 2015-12-14 16:55:23 +01:00
stiffly bf82bbb5d5 Merge remote-tracking branch 'origin/Networking' into Networking 2015-12-14 16:50:51 +01:00
Jocke e52052b431 IdentifyPacketLoss() crashed when multiple users connected which 
also crashed the server. The function is not needed for now as the server logic is not
implemented.
 2015-12-14 16:50:16 +01:00