Commit Graph

15 Commits

Author SHA1 Message Date
Dander7BD 5051a9e767 Major StateStruct and API update 2013-12-20 12:07:45 +01:00
Dander7BD dbb0c38432 Big patch
Loads of collision response related implementations/edits
2013-12-20 12:07:43 +01:00
Robin Engman c740bd5935 Added some data to PhysicsAPI
GetRigidLinearVelocity() and void* as reference to game object.
2013-12-12 10:02:35 +01:00
lanariel ce294cd1d7 Forgot to add a folder 2013-12-04 09:43:43 +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 ca20a5af9e Stable Resource Management with 4 unidentified Memory Leaks 2013-11-29 10:25:27 +01:00
Linda Andersson 5ab1c39e3a GL stable - running from DanBiasGame 2013-11-28 11:46:20 +01:00
Linda Andersson 92c20b368b merge with GL 2013-11-28 11:31:00 +01:00
Erik Persson acd8681489 asd 2013-11-28 08:33:29 +01:00
lanariel 8f6ca79e6b Unstable RenderTexture 2013-11-27 15:26:29 +01:00
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 f9d9479dad Stable Dll read, unstable Pos 2013-11-26 15:33:05 +01:00
Erik Persson 5cc6ff81b5 Merge branch 'GameLogicBranch' of https://github.com/dean11/Danbias into GameLogicBranch
Conflicts:
	Code/GameLogic/Player.cpp
2013-11-26 09:26:04 +01:00
Linda Andersson f78027a1cf dll - working
fix in unique pointer and array - missing copy constructor
2013-11-26 09:16:51 +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