Merge branch 'house_placing' into jgrpp

Browse Source

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

...

This commit is contained in:

Jonathan G Rennison

2016-05-12 22:57:42 +01:00

parent d8a083b666 95b65163e3

commit f6d374ade4

30 changed files with 718 additions and 1398 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

798

src/town_gui.cpp

File diff suppressed because it is too large Load Diff