4 Commits

Author	SHA1	Message	Date
stiffly	d22e59f28f	Merge remote-tracking branch 'origin/master' into Networking ... NOTE (in config file): [Debug] LoadMap=Schema/Entities/Test.xml # Conflicts: # include/Game/Game.h # src/Game/Game.cpp	2015-12-10 13:53:18 +01:00
sippeangelo	578018607a	Moved decision of which map to load to Config.ini	2015-12-09 14:32:34 +01:00
stiffly	ce41421dbb	Added a "StartNetwork" bool to DefaultConfig.	2015-12-09 10:37:40 +01:00
sippeangelo	872879c013	Engine puzzle completed	2015-11-30 17:02:24 +01:00