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

451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
viktorljung 96371a08c8 Changed Picking colors from vec2 to ivec2. Picking now working for multiple scenes (Solution not perfect in the editor, yet) 2016-01-14 15:26:06 +01:00
viktorljung e7f02f14a0 Added Transform.h that holds all the AbsoluteTransformation functions. Camera now working better with scenes. Changed Modeljob Matrix to only hold the model matrix instad of all matrix info 2016-01-14 11:12:02 +01:00
viktorljung 0f17f9a888 Merge remote-tracking branch 'origin/master' into Rendering 
# Conflicts:
#	include/Engine/Editor/EditorSystem.h
#	include/Engine/Rendering/EPicking.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	src/Engine/Editor/EditorSystem.cpp
#	src/Engine/Rendering/RawModel.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp
 2016-01-12 16:13:20 +01:00
viktorljung 2450769190 some cleanup 2016-01-12 11:51:47 +01:00
viktorljung d469fe6e9a Removed picking event and added a pick function to renderer 2016-01-12 11:45:50 +01:00
viktorljung 3feee7fd35 Changed the structure of how RenderJobs are handled 2016-01-11 17:01:17 +01:00
William Moberg 84818f6fcb Merge pull request #28 from teamfisk/ecs 
New entity loading and saving
 2016-01-11 16:49:40 +01:00
Jace 349fa9d7fa Fixed crash when creating new entities 2016-01-11 16:47:30 +01:00
Jace 2a5e0420c8 Added template entity "Empty.xml" for use as root entity when creating a new map. 2016-01-11 16:40:26 +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 c47ef61ddc Temporary fix for widgets being annoying entities in the editor 2016-01-11 14:35:41 +01:00
Jace e8e93587e9 Fixed weird behavior when components would register multiple times (Hint: It should never happen in the first place) 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 ad4e723677 Added nativefiledialog to README 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 c6655ce0d3 Merge pull request #26 from teamfisk/revert-25-Forward+ 
Revert "Forward+"
 2016-01-11 13:49:02 +01:00
Jace b908a9f9c6 Revert "Forward+" 2016-01-11 13:48:55 +01:00
Jace dc7ed2e0ba Merge pull request #25 from teamfisk/Forward+ 
Forward+
 2016-01-11 12:43:43 +01:00
viktorljung b8db80bc40 Added camera to PickingPass and fixed memory leak 2016-01-11 10:47:39 +01:00
Tleety f71bfca142 Fixed cullLights into CullLights 2016-01-11 10:23:22 +01:00
Tleety dbb44fb4e4 Changing cullLights to Culllights, need to do this in 2 commits since Git extensions is fucked. 2016-01-11 10:22:56 +01:00
viktorljung a7b43b06a2 Camera component and RenderQueue changes 2016-01-08 16:21:59 +01:00
Tleety 6e6460a000 Commented out the bugged models 2016-01-08 16:15:18 +01:00
Tleety 9f871bbe7c Lights now use the absolute position instead of it's local position. 2016-01-08 14:31:44 +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
Tleety 25a99a04c5 Added Visable bool and a better description to Pointlight component. 2016-01-08 14:11:35 +01:00
William Moberg 13ade6d7f2 Merge pull request #24 from teamfisk/HealthSystem 
Fixed so the PlayerDeath event doesn't get spammed while the player i…
 2016-01-08 11:54:11 +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
verysecrethero ff44dccb33 Merge pull request #23 from teamfisk/OrderedSystemPipeline 
Ordered system pipeline approved
 2016-01-08 10:32:58 +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
William Moberg 6ebc4fc784 Merge pull request #22 from teamfisk/HealthSystem 
Health system
 2016-01-07 16:17:17 +01:00
William Moberg 7fb71f17b2 Destruct all systems properly in the pipeline. 2016-01-07 16:13:52 +01:00
verysecrethero e52c0c9633 Now using the easier/cleaner way of getting/setting the HealthProperties 2016-01-07 15:27:39 +01:00
verysecrethero 578ca13f79 Merge remote-tracking branch 'origin/master' into HealthSystem 2016-01-07 15:19:32 +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
William Moberg 32ebc061b4 Merge pull request #21 from teamfisk/AndersTest 
Pull request approved.
 2016-01-07 14:57:12 +01:00