 Tleety
|
2cae4e3fb2
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# include/Engine/Rendering/DrawFinalPass.h
# include/Engine/Rendering/RenderQueue.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/QualityAssurance.xml
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/Sprite.vert.glsl
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/Model.cpp
# src/Engine/Rendering/RenderSystem.cpp
# src/Engine/Rendering/Renderer.cpp
# src/Game/Game.cpp
|
2016-02-10 19:52:42 +01:00 |
|
 viktorljung
|
c09c2f4783
|
Merge remote-tracking branch 'origin/Importer' into Animations
# Conflicts:
# resources/Schema/Components.xsd
# resources/Schema/Entities/RenderingWorld.xml
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/PickingPass.cpp
# src/Engine/Rendering/Skeleton.cpp
|
2016-02-09 22:50:19 +01:00 |
|
 Teejoon
|
060e674a6f
|
Picking supports skinned meshes
|
2016-02-08 17:37:18 +01:00 |
|
|
viktorljung
|
933a32aa8d
|
Animations kind of working
|
2016-02-06 18:09:51 +01:00 |
|
|
viktorljung
|
8034b42c87
|
spriteComponent WIP
|
2016-02-05 16:43:57 +01:00 |
|
|
viktorljung
|
51075aefc8
|
Model that has animations is now visible when it does not play an animation (T-pose)
|
2016-02-01 10:24:50 +01:00 |
|
|
viktorljung
|
ada1bac2a7
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# resources/Schema/Entities/RenderingWorld.xml
# resources/Shaders/ForwardPlus.frag.glsl
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-24 20:48:17 +01:00 |
|
 antc13
|
96a735c542
|
Changed .obj to .mesh for all meshes.
|
2016-01-24 16:12:31 +01:00 |
|
|
viktorljung
|
aa3b8cd652
|
Fixed text color and removed debugging code
|
2016-01-24 13:37:07 +01:00 |
|
|
viktorljung
|
680a12d88f
|
HealthMeter
|
2016-01-23 14:53:17 +01:00 |
|
|
viktorljung
|
f3bfe388af
|
Clean up
|
2016-01-21 10:16:03 +01:00 |
|
|
viktorljung
|
ce27b224df
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Engine/Rendering/Renderer.h
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-19 17:27:09 +01:00 |
|
|
viktorljung
|
f0763bc2a3
|
Font loading crash fixed
|
2016-01-19 17:18:18 +01:00 |
|
|
viktorljung
|
dbe56280a6
|
Resolution fixed and Centered text
|
2016-01-19 11:45:34 +01:00 |
|
|
viktorljung
|
92553f1e93
|
text size can now be entered in the filepath with a comma separator, like this "filepath,16"
|
2016-01-18 17:17:12 +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 |
|