Commit Graph

2 Commits

Author SHA1 Message Date
Sam Mario Svensson 3c1d66e3f8 Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
Conflicts:
	Code/Dokumentation/LevelLoader.uxf
	Code/Game/GameLogic/GameLogic.vcxproj
2014-01-24 10:42:19 +01:00
Sam Mario Svensson c84ed645f0 GameLogic - implementation of LevelLoader 2014-01-24 10:22:18 +01:00