NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game/GameClient
History
Pontus Fransson 6c19c12682 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 
Conflicts:
	Code/Game/GameLogic/LevelLoader/LevelLoader.cpp
	Code/Game/GameLogic/LevelLoader/LevelLoader.h
	Code/Game/GameLogic/LevelLoader/LevelParser.cpp
	Code/Game/GameLogic/LevelLoader/LevelParser.h
	Code/Game/GameLogic/LevelLoader/Loader.cpp
	Code/Game/GameLogic/LevelLoader/Loader.h
	Code/Game/GameLogic/LevelLoader/ObjectDefines.h
	Code/Game/GameLogic/LevelLoader/ParseFunctions.cpp
 		2014-02-19 11:25:33 +01:00
..
GameClientState Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:25:33 +01:00
Include Major cleanup 2014-02-17 10:38:11 +01:00
DLLMain.cpp Major cleanup 2014-02-17 10:38:11 +01:00
DanBiasGame_Impl.cpp Debug hack + actual fixings 2014-02-18 10:32:09 +01:00
GameClient.vcxproj Moved LevelLoader to a seperate lib project. 2014-02-19 11:00:16 +01:00
GameClient.vcxproj.user Fixed server-client communication 2014-02-18 13:12:08 +01:00