Commit Graph

27 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
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
01cf154f51 Import polyline rail tool patch v10b
http://www.tt-forums.net/viewtopic.php?f=33&t=57080
2016-04-13 21:03:51 +01:00
alberth
7d989073d4 (svn r21627) -Codechange: Remove _place_proc global variable. 2010-12-24 15:08:19 +00:00
alberth
852e647bcc (svn r21627) -Codechange: Remove _place_proc global variable. 2010-12-24 15:08:19 +00:00
rubidium
7127338414 (svn r18872) -Codechange: introduce PaletteID and use it 2010-01-21 01:38:13 +00:00
rubidium
f94c83a387 (svn r18872) -Codechange: introduce PaletteID and use it 2010-01-21 01:38:13 +00:00
rubidium
9467b7c6d6 (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
82fc28f77f (svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header 2010-01-15 16:41:15 +00:00
rubidium
99d46e0ad7 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 2009-08-21 20:21:05 +00:00
rubidium
e88cb7f70f (svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing 2009-04-19 10:31:30 +00:00
rubidium
329cabab4f (svn r16088) -Codechange: merge HighLightStyle and ViewportHighlightMode as they are basically the same thing 2009-04-19 10:31:30 +00:00
frosch
7014833641 (svn r15065) -Change (r14919): Allow to select a new station location by ctrl-clicking while distant-join window is open. (PhilSophus) 2009-01-13 17:28:11 +00:00
frosch
4780c73224 (svn r15065) -Change (r14919): Allow to select a new station location by ctrl-clicking while distant-join window is open. (PhilSophus) 2009-01-13 17:28:11 +00:00
rubidium
4d5b9e38d6 (svn r13160) -Codechange: prepare GUIPlaceProcDragXY for the removal of WindowEvent. 2008-05-18 12:40:38 +00:00
rubidium
fc4393dcfe (svn r13160) -Codechange: prepare GUIPlaceProcDragXY for the removal of WindowEvent. 2008-05-18 12:40:38 +00:00
rubidium
2c5db97704 (svn r13011) -Codechange: move PlaceProc_BuyLand out of rail_gui.cpp to the place where it is used and remove some unneeded globalisations of some other PlaceProc functions. 2008-05-08 13:30:50 +00:00
rubidium
c74ca38970 (svn r13011) -Codechange: move PlaceProc_BuyLand out of rail_gui.cpp to the place where it is used and remove some unneeded globalisations of some other PlaceProc functions. 2008-05-08 13:30:50 +00:00
rubidium
0c30e46c9c (svn r13010) -Codechange: move the tree building GUI out of misc_gui.cpp. 2008-05-08 13:29:35 +00:00
rubidium
cd3dda5c0c (svn r13010) -Codechange: move the tree building GUI out of misc_gui.cpp. 2008-05-08 13:29:35 +00:00
rubidium
8b9ffbe158 (svn r13009) -Codechange: move more tile highlighting related functions/types to tilehighlight_*.h. 2008-05-08 13:21:55 +00:00
rubidium
cabd771fc0 (svn r13009) -Codechange: move more tile highlighting related functions/types to tilehighlight_*.h. 2008-05-08 13:21:55 +00:00
rubidium
c28ce39e3c (svn r12987) -Codechange: split viewport and tile selection. 2008-05-07 13:10:15 +00:00
rubidium
3d5567ccf7 (svn r12987) -Codechange: split viewport and tile selection. 2008-05-07 13:10:15 +00:00