lanariel
|
3512121f52
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
Code/OysterGraphics/OysterGraphics.vcxproj
Debug/Tester.ilk
Debug/Tester.pdb
OysterGraphics/Core/ShaderManager.cpp
OysterGraphics/OysterGraphics.vcxproj.filters
Tester/Debug/CL.read.1.tlog
Tester/Debug/CL.write.1.tlog
Tester/Debug/cl.command.1.tlog
Tester/Debug/link.command.1.tlog
Tester/Debug/link.read.1.tlog
Tester/Debug/link.write.1.tlog
Tester/Tester.vcxproj
|
2013-11-20 10:35:00 +01:00 |
Tobias Grundel
|
86aac0c72a
|
Link error fixed and ObjReader
|
2013-11-19 13:30:46 +01:00 |
dean11
|
33e7afabcd
|
Restructured folders to give a flexible solution for dependencies and added to ignore list
|
2013-11-18 15:41:09 +01:00 |
|
lanariel
|
ab70bed60b
|
Shader main Rename
|
2013-11-15 11:05:19 +01:00 |
|
lanariel
|
ed3ad9fef3
|
GraphicTestTri
|
2013-11-15 08:41:11 +01:00 |
|
lanariel
|
d9bc8ce640
|
Moved to Graphics Test Environment
|
2013-11-13 10:27:37 +01:00 |