Commit Graph

16 Commits

Author SHA1 Message Date
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
2021-01-31 01:08:35 +00:00
Niels Martin Hansen
2d9fa81bd0 Feature: Plant clumps of trees in editor by dragging on the landscape 2020-12-27 01:03:27 +01:00
Niels Martin Hansen
e0ee2d530a Change: Switch tree GUI to use dynamically generated buttons
This makes it look a bit better in climates with fewer tree types.
2020-12-27 01:03:27 +01:00
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
patch-import
2e04f211df Import remove all trees in scenario editor patch.
http://www.tt-forums.net/viewtopic.php?f=33&t=49326

Update to current current version.
Use CMD_LANDSCAPE_CLEAR instead of CMD_CLEAR_AREA.
Whitespace, misc fixes.
2016-01-28 00:09:14 +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
2d56468fca (svn r23554) -Codechange: some minor consistency fixes 2011-12-16 18:42:20 +00:00
truebrain
7b80b821ff (svn r23554) -Codechange: some minor consistency fixes 2011-12-16 18:42:20 +00:00
planetmaker
3f60a3d18a (svn r23541) -Codechange: Consistent naming of widgets in NewGRF debug window 2011-12-16 17:15:40 +00:00
planetmaker
7c7bd7fe86 (svn r23541) -Codechange: Consistent naming of widgets in NewGRF debug window 2011-12-16 17:15:40 +00:00
planetmaker
44d6bb55a0 (svn r23538) -Codechange: Consistent naming of widgets in tree plant gui 2011-12-16 16:57:15 +00:00
planetmaker
5ade484ce4 (svn r23538) -Codechange: Consistent naming of widgets in tree plant gui 2011-12-16 16:57:15 +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