 Jace
|
d2bc91be48
|
Merge remote-tracking branch 'origin/master' into gui
Conflicts:
include/Core/Engine.h
include/Core/RenderQueue.h
include/Core/Renderer.h
src/game/Core/Renderer.cpp
|
2015-09-25 02:27:00 +02:00 |
|
|
Jace
|
1d500eb4f6
|
First iteration of GUI code. GUI is rendered on top of everything, world still separate.
|
2015-09-25 01:29:13 +02:00 |
|
 tleety
|
fa198cf953
|
Water now rendered in forward rendering
|
2015-09-24 23:21:46 +02:00 |
|
|
tleety
|
a1215d71e9
|
Water now blurred and looking kinda water like
|
2015-09-24 16:10:13 +02:00 |
|
|
tleety
|
d473e3711c
|
Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water.
|
2015-09-23 18:01:15 +02:00 |
|
|
tleety
|
8e2eb63c5e
|
Added renderQueue for water and created buffers for the water to use.
|
2015-09-23 12:07:28 +02:00 |
|
|
tleety
|
825f6dc991
|
Models now get a standard normal and specular map if they dont have one
|
2015-09-16 16:09:20 +02:00 |
|
|
tleety
|
b9eda67a2a
|
Added depth buffer to fix transparency, still a bug that transparency goes wrong at when you press a button.
|
2015-09-14 16:53:14 +02:00 |
|
|
tleety
|
f97112bb20
|
Backbone to deferred rendering started
|
2015-09-10 22:39:03 +02:00 |
|
|
tleety
|
58931e29b3
|
Sprites are now rendered on unitQuads instead of ScreenQuads
|
2015-09-10 17:45:26 +02:00 |
|
|
Jace
|
98e363eda6
|
Initial structure
|
2015-09-04 10:02:06 +02:00 |
|