Dennis Andersen
|
0a41d20099
|
GameLogic - Merged with graphics
|
2014-01-20 16:36:25 +01:00 |
bladdidoo
|
61b8baed1b
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
Code/OysterGraphics/Shader/HLSL/Deffered Shaders/GBufferHeader.hlsli
Code/Tester/MainTest.cpp
|
2014-01-17 08:58:49 +01:00 |
|
bladdidoo
|
c48f640cdf
|
Loading .Dan geometry and material
|
2014-01-17 08:51:12 +01:00 |
lanariel
|
483236801f
|
Fixed compile warnings and crash on non existing models
|
2014-01-16 09:30:01 +01:00 |
lindaandersson
|
32e64c0dbb
|
GL - moved reciever struct to a separate file
|
2014-01-14 10:25:49 +01:00 |
|
lanariel
|
7c567ec360
|
SSAO and frame counter
|
2014-01-08 07:01:59 +01:00 |
|
lanariel
|
341e33ee78
|
Rebased Lights to Use World Coordinates
|
2013-12-18 20:36:41 +01:00 |
|
lanariel
|
718b1ade2b
|
Proper Lighting, supports Multiple Lights
|
2013-12-18 20:28:06 +01:00 |
|
lanariel
|
fb51881fab
|
Fixed Mem leaks on gpu and start on deffered pipeline
|
2013-12-05 14:56:34 +01:00 |
|
lanariel
|
469ccaab6c
|
Merge branch 'Sprint1' of https://github.com/dean11/Danbias into Graphics
Conflicts:
Bin/DLL/DebugCameraVertex.cso
Bin/DLL/DebugPixel.cso
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Bin/DLL/OysterGraphics_x86D.dll
Bin/DLL/OysterGraphics_x86D.exp
Bin/DLL/OysterGraphics_x86D.ilk
Bin/DLL/OysterGraphics_x86D.pdb
Bin/DLL/TextureDebug.cso
Bin/DLL/VertexGatherData.cso
Code/OysterGraphics/FileLoader/ObjReader.cpp
Code/OysterGraphics/FileLoader/TextureLoader.cpp
Code/OysterGraphics/FileLoader/TextureLoader.h
Code/OysterGraphics/OysterGraphics.vcxproj
Code/OysterGraphics/OysterGraphics.vcxproj.filters
Code/OysterGraphics/Render/Resources/Resources.cpp
Code/OysterGraphics/Shader/HLSL/SimpleDebug/Debug.hlsl
Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugCameraVertex.hlsl
Code/OysterGraphics/Shader/HLSL/SimpleDebug/DebugPixel.hlsl
Code/OysterGraphics/Shader/HLSL/SimpleDebug/TextureDebug.hlsl
Code/Tester/MainTest.cpp
|
2013-11-29 10:31:19 +01:00 |
|
lanariel
|
9bf84cdc65
|
Stable Graphics, hard coded texture read in ObjReader.ToModel
|
2013-11-28 14:34:52 +01:00 |
|
lanariel
|
8f6ca79e6b
|
Unstable RenderTexture
|
2013-11-27 15:26:29 +01:00 |
|
lanariel
|
2de2ef9cd0
|
Pre merge Commit
|
2013-11-26 13:44:58 +01:00 |
|
lanariel
|
973aadac2d
|
Engine tweaks + DefferedVertexDefinition
|
2013-11-26 09:09:35 +01:00 |