Erik Persson
|
61777e23df
|
Merge remote-tracking branch 'origin/Graphics' into GameLogicBranch
Conflicts:
Bin/DLL/GamePhysics_x86D.dll
Bin/DLL/GamePhysics_x86D.exp
Bin/DLL/GamePhysics_x86D.ilk
Bin/DLL/GamePhysics_x86D.pdb
Code/OysterGraphics/OysterGraphics.vcxproj
Code/OysterGraphics/OysterGraphics.vcxproj.filters
Code/OysterGraphics/OysterGraphics.vcxproj.filters.orig
|
2013-11-27 09:12:21 +01:00 |
lanariel
|
4b6cdab17b
|
Stable Rendering
|
2013-11-27 08:22:20 +01:00 |
lanariel
|
f9d9479dad
|
Stable Dll read, unstable Pos
|
2013-11-26 15:33:05 +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 |
lanariel
|
205c58430f
|
Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Graphics
|
2013-11-22 14:14:54 +01:00 |
lanariel
|
328e4777ce
|
Started to wrap into dll
|
2013-11-22 14:09:47 +01:00 |
dean11
|
7b0265db1d
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into MiscBranch
|
2013-11-22 12:05:58 +01:00 |
lanariel
|
59dcbc9729
|
Fixed Projection
|
2013-11-22 10:55:21 +01:00 |
dean11
|
15455db1b2
|
Added a resource handler with basic byte loading
|
2013-11-22 10:46:25 +01:00 |
lanariel
|
5abaef6e86
|
Fixed render errors
|
2013-11-21 23:54:12 +01:00 |
lanariel
|
ff1695497f
|
Debug From Home
|
2013-11-21 18:31:16 +01:00 |
lanariel
|
9a0206bf35
|
More
|
2013-11-21 14:14:30 +01:00 |
Linda Andersson
|
229741e707
|
merge with graphics
|
2013-11-21 09:46:26 +01:00 |
lanariel
|
adfec528bf
|
Fixing Render Namespace, See, todo in Resources.cpp
|
2013-11-20 16:51:53 +01:00 |
Linda Andersson
|
68d516cc86
|
adding IGame interface
|
2013-11-20 15:47:11 +01:00 |
lanariel
|
425a838f31
|
Core Update
|
2013-11-20 10:22:01 +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 |