BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,835 Commits 116 Branches 0 Tags
34e551663f5774a3a2dc0a4eacd2fd3e2ecad3e5
Commit Graph

1470 Commits

Author SHA1 Message Date
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
William Moberg 04a01104b5 Merge branch 'master' into OctTree 
# Conflicts:
#	src/Engine/CMakeLists.txt
#	src/Game/Game.cpp
 2015-12-15 17:11:11 +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
Tleety 1431bd1a11 DebugChanges 2015-12-15 15:39:23 +01:00
William Moberg ed82a0939a Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-15 15:37:14 +01:00
William Moberg e2417be8c7 Very simple CollisionSystem made, 'Z','Y' to toggle on/off. 2015-12-15 15:36:28 +01:00
stiffly 472a8db81a Various bug fixes. 2015-12-15 15:32:31 +01:00
viktorljung fa66e9ff47 Camera Switch event now working, Camera models Rotation still bugged 2015-12-15 15:29:19 +01:00
Tleety 1e370bac13 ForwardPlus base debug commit. 2015-12-15 15:28:37 +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
William Moberg 170610bcb1 Added a TriggerSystem, seems to work as intended. 2015-12-15 14:49:52 +01:00
verysecrethero 454ed0032b Refactored some RayVsModel tests 2015-12-15 14:01:49 +01:00
verysecrethero 1910ab705b AndersTest misc small mergefixes 2015-12-15 13:48:14 +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
verysecrethero f9508657f5 Merge remote-tracking branch 'origin/master' into AndersTest 
# Conflicts:
#	include/Engine/Core/InputController.h
#	include/Game/Game.h
 2015-12-15 11:32:47 +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
verysecrethero 1229a99af4 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-15 11:07:51 +01:00
verysecrethero 8e431c8edd RayVsModel && RayVsAABB tests added and working. Also adjusted RayVsModel,RayVsAABB with deltas when values are very close to each other (floatingprecision problems) 2015-12-15 11:07:09 +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
Jace 522679b14c Added BlendEquation and BlendFunc to RenderState, and cleaned it up A LOT 2015-12-14 20:23:29 +01:00
viktorljung d9ea0192d1 Added RenderSystem and removed RenderQueueFactory 2015-12-14 20:07:02 +01:00
viktorljung ef07a9d536 Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Engine/Rendering/RenderQueueFactory.h
 2015-12-14 19:11:00 +01:00
viktorljung 05b78265be Fixed some transparency bugs and started on component based camera 2015-12-14 19:10:00 +01:00
verysecrethero 948f6d5de7 RayVsModel & RayVsAABB comparison continued 2015-12-14 17:53:11 +01:00
William Moberg ae7d4b9097 Put Collision folder in CMakeLists.txt and altered paths. 2015-12-14 17:35:39 +01:00
Tleety 7c714d1f98 Changed some error handling in the RenderState class. 2015-12-14 17:35:01 +01:00
William Moberg e6fa9df3a5 Merge branch 'OctTree' of github.com:teamfisk/TacticalZ into OctTree 2015-12-14 17:08:51 +01:00
William Moberg 59095c2ce5 Started on CollisionSystem and TriggerSystem. Moved collision code to Collision folder. 2015-12-14 17:08:00 +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
verysecrethero 7f8e78c8cd RayVsModel tests in progress 2015-12-14 17:04:35 +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
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 ea239b19bd Fixed component type resolution order to prioritize custom types before native ones, since namespace information doesn't exist at that stage. 2015-12-14 16:12:20 +01:00
Jace f8d927cd91 Don't render invisible model components 2015-12-14 16:11:37 +01:00
Jace 798c73132e Fixed ScreenCoords::ToPixelData stack corruption 2015-12-14 16:11:08 +01:00
Jace fb2cd0c6ae Fixed float angle wrapping 2015-12-14 15:20:55 +01:00