BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
410 Commits 116 Branches 0 Tags
2bd60be741346de71e6240152a6e9514696b667b
Commit Graph

343 Commits

Author SHA1 Message Date
Tleety 2bd60be741 Merge remote-tracking branch 'origin/master' into Forward+ 
# Conflicts:
#	resources/Schema/Types/Entity.xsd
 2016-01-08 14:14:43 +01:00
Tleety dab4ba2164 Pointlights are now using the pointlight component and the Light renderqueue to draw. 2016-01-08 14:12:09 +01:00
verysecrethero 592776e783 Fixed so the PlayerDeath event doesn't get spammed while the player is dead. Also made sure that any remaining healthDeltas are cleared when dead. 2016-01-08 11:37:51 +01:00
William Moberg ef9ce7932a New small fix. 2016-01-07 17:40:47 +01:00
William Moberg beb0967c3b Merge branch 'master' into OrderedSystemPipeline 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-07 16:49:20 +01:00
verysecrethero 0e0a361a38 HotFix: Updated the CMakeList.txt in src/Game so it has the HealthSystem.cpp. This is needed otherwise the solution cant find that file 2016-01-07 16:36:18 +01:00
verysecrethero e52c0c9633 Now using the easier/cleaner way of getting/setting the HealthProperties 2016-01-07 15:27:39 +01:00
William Moberg 4048ce6bd4 Small fix. 2016-01-07 15:18:35 +01:00
William Moberg c4642cc530 Merge branch 'master' into OrderedSystemPipeline 
# Conflicts:
#	include/Engine/Core/SystemPipeline.h
 2016-01-07 15:07:16 +01:00
verysecrethero a1ed79dfbf HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes 2016-01-07 14:53:31 +01:00
verysecrethero 638c236ceb HealthSystem tested and working. Also the 3 new PlayerEvents seems to work. TODO: a proper test in the testclass 2016-01-07 14:53:31 +01:00
verysecrethero f67f22c82d Added Healthrelated events and start of HealthSystem, also reverted the crash "fix" 2016-01-07 14:53:31 +01:00
verysecrethero f3ff433bf7 Merge remote-tracking branch 'origin/master' into AndersTest 2016-01-07 14:51:08 +01:00
verysecrethero 85ff86a2fe Revert "Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point" 
This reverts commit 0ae6c42df8.
 2016-01-07 14:50:13 +01:00
William Moberg 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
Tleety 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
Tleety 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
verysecrethero 0ae6c42df8 Exit Crash has been dealt with. There is no need to unsubscribe game since m_ContextRelays has already been destroyed at that point 2016-01-05 15:22:16 +01:00
verysecrethero 3678cceb1c Merge remote-tracking branch 'origin/master' into AndersTest 2016-01-05 14:48:16 +01:00
William Moberg de8461e257 SystemPipeline should update systems in order depending on input update priority in AddSystem. 2015-12-18 15:33:25 +01:00
Tleety 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
verysecrethero 2f6d4fcd0b Adjusted some of the corefiles back to the original in preparation for the Pull Request 2015-12-18 14:49:35 +01:00
Tleety 069a6756b9 LightcullingPass for forward+ is now separate from Renderer.cpp. 2015-12-18 14:31:16 +01:00
stiffly a550b6077e Re-enabled InputCommand debugging info in console 2015-12-18 14:25:55 +01:00
verysecrethero e0cc25dbac Fixed the OctTreeTestGameClass.cpp so it draws the OctTree nicely again 2015-12-18 14:22:57 +01:00
stiffly 00bc55370d Added error check in Collision.cpp 2015-12-18 14:19:28 +01:00
stiffly 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
stiffly a0255f1b31 Now uses config file to determine if client or server should be started. 2015-12-18 13:34:21 +01:00
Tleety 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
stiffly a858dab8b6 Network not longer threaded 2015-12-18 12:00:14 +01:00
verysecrethero b1ae96f737 Merge remote-tracking branch 'origin/master' into AndersTest 
# Conflicts:
#	include/Game/Game.h
#	src/Engine/Core/OctTree.cpp
#	src/Game/Game.cpp
#	src/Tests/CMakeLists.txt
#	src/Tests/OctTreeTest.cpp
#	src/Tests/WorldTest.cpp
 2015-12-18 11:57:21 +01:00
verysecrethero 1e5e24a036 The tests seems to work under boost 1.59 but test explorer window is broken in 1.60. also changed ResourceManagerTest.cpp 2015-12-18 11:37:02 +01:00
viktorljung 3636ad45af Changed to correct branch 2015-12-18 11:29:11 +01:00
stiffly 6d649e4d35 Merge remote-tracking branch 'origin/Networking' into Networking 
# Conflicts:
#	src/Engine/Network/Client.cpp
 2015-12-18 11:26:48 +01:00
stiffly 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
viktorljung 6cf7c12d34 Forward+ working 2015-12-18 11:09:54 +01:00
Jocke ad43cc44c3 Merge remote-tracking branch 'origin/Networking' into Networking 2015-12-18 11:03:21 +01:00
Jocke 002e1d8c5a Removed magic number from Packet constructor in Packet.cpp. 2015-12-18 10:52:46 +01:00
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
verysecrethero 13f7fb2561 Stashed test fixes for boost 1.6 2015-12-18 10:01:05 +01:00
stiffly 0b714e593f Removed WinLeakCheck. Minor variable name changes. removed IsWASDKeyDown struct 2015-12-17 17:56:15 +01:00
viktorljung 4a817613e3 Forward+ semi working 2015-12-17 17:55:44 +01:00
verysecrethero 8beddca89a Merge remote-tracking branch 'origin/master' into AndersTest 2015-12-17 17:48:28 +01:00
William Moberg 5e0fe975f3 Small error handling check. 2015-12-17 17:48:00 +01:00
Jocke db5b6ad519 Added more error code to Packet class 2015-12-17 17:32:49 +01:00
William Moberg a26c8f2a24 Merge branch 'master' into OctTree 2015-12-17 17:30:44 +01:00
stiffly 076030a252 Fixes, mostly name changes 2015-12-17 17:28:43 +01:00