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

254 Commits

Author SHA1 Message Date
Tleety fa6dd2dc67 Basic transparancy working. 2016-01-11 17:57:15 +01:00
Tleety 3c5966d174 Now sort models according to depth. 2016-01-11 17:57:15 +01:00
Tleety 0cf8d26557 Revert "Revert "Forward+"" 
This reverts commit b908a9f9c6.
 2016-01-11 17:56:58 +01:00
Jace 4a516a4d86 Added ComponentInfo::FieldsInOrder to be able to loop through component fields in a consistent order based on the component XSD definition 2016-01-11 14:56:53 +01:00
Jace 21aea6f31d Added World::ValidEntity for checking if an entity exists or not 2016-01-11 14:35:41 +01:00
Jace 297a3fb493 Support for "name" attribute on entities 2016-01-11 14:35:41 +01:00
Jace 39dd27726d MAJOR BREAKING CHANGE: EntityID 0 is now a valid entity. Use EntityID_Invalid as sentry for checks! 
Also contains inseparable editor changes.
 2016-01-11 14:35:41 +01:00
Jace 6adc98eea5 Now writes entities to file instead of stdout... 2016-01-11 14:35:41 +01:00
Jace 11d547cde8 Entity 0 is now a real entity in the world, created by the first entity read while importing. This makes the difference between map files and entity files automatic, since consecutive entity file loads should automatically get the world as parent, as long as the world entity has been created earlier. 2016-01-11 14:35:41 +01:00
Jace 24b9e951c2 Added stride information to ComponentInfo, refactored FieldOffsets and FieldTypes into new struct Field_t Fields while I was at it. 2016-01-11 14:35:41 +01:00
Jace 81024b4a1d First work on EntityFileWriter for saving levels 2016-01-11 14:35:41 +01:00
Jace 23e78c4947 Cleaned up code 2016-01-11 14:35:15 +01:00
Jace 3e7f27e1fe Added error handler for DOM parsers 2016-01-11 14:35:15 +01:00
Jace ee83394678 Unified some previously duplicated code 2016-01-11 14:35:15 +01:00
Jace 03456ad731 EntityFileParser 2016-01-11 14:35:15 +01:00
Jace 0bcbcda8b8 EntityFilePreprocessor 
WIP

WIP

EntityFilePreprocessor
 2016-01-11 14:35:15 +01:00
Jace b908a9f9c6 Revert "Forward+" 2016-01-11 13:48:55 +01:00
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