Jonathan G Rennison
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee
Cleanup: Removed SVN headers
2019-11-10 17:59:20 +00:00
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
Jonathan G Rennison
95b65163e3
Revert back to v2 of house picking/placing patch.
2016-05-12 22:35:39 +01:00
Jonathan G Rennison
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
2016-04-08 20:15:08 +01:00
Jonathan G Rennison
ce34225b0e
Merge branch 'house_placing' into jgrpp
2015-08-03 21:29:22 +01:00
patch-import
19dcbb1cb9
Import Picking and placing single houses in scenario editor patch
...
Minor whitespace fixes
http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696
2015-08-03 21:29:13 +01:00
patch-import
9dfdd8bce8
Import measurement patch
...
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
2015-08-02 21:04:46 +01:00
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
2013-01-08 22:46:42 +00:00
truebrain
32ca564bca
(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class
2011-12-19 20:46:17 +00:00
truebrain
bcbdc3933c
(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class
2011-12-19 20:46:17 +00:00
truebrain
e054cd36b9
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
2011-12-16 18:21:13 +00:00
truebrain
e2726ca3f1
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
2011-12-16 18:21:13 +00:00
truebrain
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
2011-12-15 22:22:55 +00:00
truebrain
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
2011-12-15 22:22:55 +00:00