Commit Graph

10 Commits

Author SHA1 Message Date
Erik Persson acd8681489 asd 2013-11-28 08:33: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 2de2ef9cd0 Pre merge Commit 2013-11-26 13:44:58 +01:00
lanariel abed0157ec Do fix during weekend; Non stable 2013-11-22 15:18:52 +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 2408bf49a1 projectfiles 2013-11-21 12:31:31 +01:00
lanariel 16be725743 Project Include Model 2013-11-20 16:55:13 +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
Renamed from OysterGraphics/OysterGraphics.vcxproj.filters (Browse further)