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 |