 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
|
d469fe6e9a
|
Removed picking event and added a pick function to renderer
|
2016-01-12 11:45:50 +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
|
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 |
|
|
viktorljung
|
aeca1dec18
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# src/Engine/Editor/EditorSystem.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Game/Game.cpp
|
2015-12-17 11:17:58 +01:00 |
|
|
Jace
|
661532e355
|
Slightly more usable entity tree
|
2015-12-16 12:05:55 +01:00 |
|
|
Jace
|
322aedaf72
|
Basic transformation widgets
|
2015-12-16 09:47:38 +01:00 |
|
|
viktorljung
|
d9ea0192d1
|
Added RenderSystem and removed RenderQueueFactory
|
2015-12-14 20:07:02 +01:00 |
|
|
Jace
|
cddd9026fb
|
Toggle editor with "ToggleEditor" command. Enable editor with "Debug.EnableEditor" config variable.
|
2015-12-14 16:12:52 +01:00 |
|
|
Jace
|
fb2cd0c6ae
|
Fixed float angle wrapping
|
2015-12-14 15:20:55 +01:00 |
|
|
Jace
|
545869e342
|
Added scene graph UI to Editor
|
2015-12-14 13:58:28 +01:00 |
|
|
Jace
|
2f3843e595
|
Editor version 1
|
2015-12-14 13:57:55 +01:00 |
|
|
Jace
|
e5084e13ec
|
Added EditorSystem
|
2015-12-14 13:57:51 +01:00 |
|