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

226 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
William Moberg beb0967c3b Merge branch 'master' into OrderedSystemPipeline 
# Conflicts:
#	src/Game/Game.cpp
 2016-01-07 16:49:20 +01:00
William Moberg 7fb71f17b2 Destruct all systems properly in the pipeline. 2016-01-07 16:13:52 +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
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
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
Tleety 069a6756b9 LightcullingPass for forward+ is now separate from Renderer.cpp. 2015-12-18 14:31:16 +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
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
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 30db0b10fd Removed NetworkDefinitions.h and moved #define MAXCONNECTIONS 8 
#define INPUTSIZE 128 to Network.h.
 2015-12-18 10:36:14 +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
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
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
William Moberg 0f59b863ee Renamed IF_DEBUG_IS to DEBUG_IF, slightly different behavior and added some safety checking for auto creating AABBs from models. 2015-12-17 17:08:47 +01:00
William Moberg 46ae2d39af Merge branch 'master' into OctTree 
# Conflicts:
#	src/Game/Game.cpp
 2015-12-17 16:44:01 +01:00
Jace e9128efd13 Translation widget planes 2015-12-17 15:30:43 +01:00
Jace a655f0bae5 Drag-and-drop asset picking and base work for showing component field tooltips in the editor 2015-12-17 15:30:43 +01:00
Jace c1b9404e52 Created a FileDropped event for when a file is dropped onto the client by the OS 2015-12-17 15:30: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
William Moberg 3e2ffdb85b Fixed comment on Trigger events. 2015-12-17 13:48:35 +01:00
William Moberg 5160a45b44 Made Ray into a class with checks so the direction will always be normalized. 2015-12-17 13:41:34 +01:00
William Moberg 03d5f0dd67 Added an macro IF_DEBUG_IS(x) that executes if run in debug mode, AABB has a check so max and min corners are set properly in debug mode. 2015-12-17 13:31:54 +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
viktorljung 6a3c14540d fixes 2015-12-17 10:38:13 +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
William Moberg a23d69af9a Removed old relics from OctTree testing in OctTree. 2015-12-16 17:08:55 +01:00
William Moberg 6d1cbd928e Improved collision logic, still not perfect since it updates before PlayerSystem. 2015-12-16 16:34:27 +01:00