Merge branch 'house_placing' into jgrpp

This reverts the house picking/placing patch back to v2. This is to fix house placement/town growth desync issues introduced in v4. # Conflicts: # src/settings_gui.cpp # src/settings_type.h # src/town_gui.cpp
2016-05-12 22:57:42 +01:00
parent d8a083b666 95b65163e3
commit f6d374ade4
30 changed files with 718 additions and 1398 deletions
--- a/source.list
+++ b/source.list
@@ -391,6 +391,7 @@ tilematrix_type.hpp
 timetable.h
 toolbar_gui.h
 town.h
+town_gui.h
 town_type.h
 townname_func.h
 townname_type.h