 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 |
|
 Jace
|
8000654005
|
Model loading now fetches material opacity value properly
|
2015-12-17 15:28:05 +01:00 |
|
|
viktorljung
|
ef07a9d536
|
Merge remote-tracking branch 'origin/master' into Rendering
# Conflicts:
# include/Engine/Rendering/RenderQueueFactory.h
|
2015-12-14 19:11:00 +01:00 |
|
|
viktorljung
|
05b78265be
|
Fixed some transparency bugs and started on component based camera
|
2015-12-14 19:10:00 +01:00 |
|
|
Jace
|
524af211e0
|
Made resource loading fail gracefully when a resource can't be loaded. Resources should now throw exceptions in their constuctor if the resource can't be loaded. This will result in ResourceManager::Load returning null.
|
2015-12-14 13:57:53 +01:00 |
|
 sippeangelo
|
c9b140bd6b
|
Semi-working entity loading from XML files!
|
2015-12-09 12:29:32 +01:00 |
|
|
sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|
|
sippeangelo
|
16eb70dd59
|
Added Model and related classes
|
2015-11-24 10:55:54 +01:00 |
|