Jonathan G Rennison f6d374ade4
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
2014-09-11 17:10:38 +00:00
2015-09-12 22:05:00 +01:00
2015-11-01 11:15:59 +00:00
2015-08-05 21:24:30 +01:00
2015-08-05 21:24:30 +01:00
2015-08-11 21:41:41 +01:00
2014-09-21 12:25:04 +00:00
2016-01-19 21:16:25 +00:00
2015-03-01 08:17:14 +00:00
2014-05-24 19:15:57 +00:00
2015-10-29 00:59:42 +00:00
2015-08-05 21:24:30 +01:00
2016-04-13 21:14:47 +01:00
2014-10-11 13:22:37 +00:00
2014-10-15 18:31:37 +00:00
2015-08-04 01:26:32 +01:00
2015-08-01 19:48:19 +01:00
2014-04-03 10:54:37 +00:00
2016-05-12 22:57:42 +01:00
2016-05-08 01:12:07 +01:00
2016-05-12 22:35:39 +01:00
2015-07-30 00:32:55 +01:00
2016-01-28 00:09:14 +00:00
2015-08-01 19:48:19 +01:00
f6d374ade4