NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Danbias/Code/Game
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
..
GameClient Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:25:33 +01:00
GameLauncher Major cleanup 2014-02-17 10:38:11 +01:00
GameLogic Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 11:25:33 +01:00
GameProtocols Broekn 2014-02-18 08:55:38 +01:00
GameServer GameLogic - Merged with GameServer and fixed some merge errors 2014-02-18 21:50:51 +01:00
LanServer GameServer - Some minor features to Standalone server 2014-02-19 02:10:13 +01:00
LevelLoader Moved LevelLoader to a seperate lib project. 2014-02-19 11:00:16 +01:00