 Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
Jace
|
a6548a72b3
|
Merge remote-tracking branch 'origin/master' into EditorUsefulness
# Conflicts:
# include/Engine/Collision/CollidableOctreeSystem.h
# include/Engine/Collision/CollisionSystem.h
# include/Engine/Collision/TriggerSystem.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Systems/PlayerSystem.h
# resources/Schema/Components/Physics.xsd
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
# src/Game/Systems/HealthSystem.cpp
# src/Game/Systems/PlayerSystem.cpp
# src/Tests/OctTreeTestGameClass.cpp
|
2016-01-21 16:16:35 +01:00 |
|
|
Jace
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
 Tleety
|
01a164847c
|
Directional light now fully added to all lists.
|
2016-01-18 15:15:33 +01:00 |
|
|
Jace
|
4786986abd
|
Rendering pipeline fixes across the board and base work on refactored editor
|
2016-01-17 06:29:25 +01:00 |
|
|
Tleety
|
14bc850fab
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-15 11:02:27 +01:00 |
|
|
Tleety
|
ecf524eb4e
|
Merge remote-tracking branch 'origin/master' into Forward+
# Conflicts:
# include/Engine/Rendering/PickingPass.h
# include/Engine/Rendering/Renderer.h
# resources/Schema/Entities/Test.xml
# src/Engine/Rendering/DrawScenePass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/RenderQueueFactory.cpp
# src/Engine/Rendering/Renderer.cpp
|
2016-01-15 11:01:58 +01:00 |
|
|
Jace
|
627108c6ee
|
Fixes for #30
# Conflicts:
# src/Game/Game.cpp
|
2016-01-14 18:15:38 +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 |
|
|
viktorljung
|
a7b43b06a2
|
Camera component and RenderQueue changes
|
2016-01-08 16:21:59 +01:00 |
|
|
viktorljung
|
bd82f75dd0
|
Some merge fixes, needs more work
|
2015-12-18 15:28:44 +01:00 |
|
|
viktorljung
|
fa66e9ff47
|
Camera Switch event now working, Camera models Rotation still bugged
|
2015-12-15 15:29:19 +01:00 |
|
|
viktorljung
|
d9ea0192d1
|
Added RenderSystem and removed RenderQueueFactory
|
2015-12-14 20:07:02 +01:00 |
|