 Tleety
|
0e70dc6fa3
|
Merge remote-tracking branch 'origin/master' into NormalSpecularMapping
# Conflicts:
# include/Engine/Rendering/RenderSystem.h
# src/Engine/Rendering/DrawFinalPass.cpp
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-27 15:41:31 +01:00 |
|
 Jace
|
181017313d
|
Made entity parser give more useful errors and fixed the errors that were while I was at it
|
2016-01-27 15:16:59 +01:00 |
|
|
Tleety
|
a954cbbf50
|
Normal map support
|
2016-01-27 13:52:27 +01:00 |
|
 viktorljung
|
6aeb281249
|
Resolution fix in render stages //Tobias
|
2016-01-25 00:07:17 +01:00 |
|
 antc13
|
96a735c542
|
Changed .obj to .mesh for all meshes.
|
2016-01-24 16:12:31 +01:00 |
|
|
Tleety
|
b499f4b020
|
Fixed some rendering bugs and some code refactoring
|
2016-01-23 12:17:38 +01:00 |
|
|
Tleety
|
983f90504d
|
Bloom effect added, will have to see if it needs improving. Also added HDR colors and gamma correction.
|
2016-01-21 12:02:28 +01:00 |
|