 Ayumiwii
|
37aa1eaa18
|
Merge remote-tracking branch 'origin/master' into CoolDeathAnimation
# Conflicts:
# include/Engine/Rendering/DrawScenePass.h
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderQueueFactory.h
# include/Engine/Rendering/Renderer.h
# include/Game/Game.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Test.xml
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-01-18 16:02:43 +01:00 |
|
|
Ayumiwii
|
35269315cc
|
Rename the thingie
|
2016-01-18 13:51:32 +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 |
|
|
Ayumiwii
|
0630885d92
|
Many more things done
|
2016-01-11 19:59:45 +01:00 |
|
|
Ayumiwii
|
3467315aef
|
Lots of things done
|
2016-01-08 16:42:59 +01:00 |
|
|
viktorljung
|
a7b43b06a2
|
Camera component and RenderQueue changes
|
2016-01-08 16:21:59 +01:00 |
|
|
viktorljung
|
05b78265be
|
Fixed some transparency bugs and started on component based camera
|
2015-12-14 19:10:00 +01:00 |
|
 Tleety
|
45b87ed6b1
|
ShaderProgram is now a Resource.
All shaderprograms are now pointers and loaded with Resourcemanager.
|
2015-12-11 16:53:46 +01:00 |
|
|
Tleety
|
433331e752
|
DrawPass now moved to it's own class to make renderer cleaner.
|
2015-12-11 14:22:54 +01:00 |
|