Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						2f4f862480
					 | 
					
						
						
							
							Viewport: Do bounding boxes and link graph/route overlays in threaded part
						
						
						
						
						
						
					 | 
					
						2022-11-10 20:48:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						5dcffe3142
					 | 
					
						
						
							
							Add variants of Gfx draw functions which take a DPI
						
						
						
						
						
						
					 | 
					
						2022-11-10 19:48:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						1eb18e5d24
					 | 
					
						
						
							
							Debug: Add a flag to disable viewport thread jobs
						
						
						
						
						
						
					 | 
					
						2022-11-10 00:45:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						7685c36f35
					 | 
					
						
						
							
							Implement partial parallelisation of non-map mode viewport rendering
						
						
						
						
						
						
					 | 
					
						2022-11-09 22:24:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						ee2763dcfd
					 | 
					
						
						
							
							Avoid using globals to control drawing of viewport sprites
						
						
						
						
						
						
					 | 
					
						2022-11-09 01:21:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						29a1e49c28
					 | 
					
						
						
							
							Change various asserts to not be included in release builds
						
						
						
						
						
						
					 | 
					
						2022-10-22 12:34:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						8688840e24
					 | 
					
						
						
							
							Viewport route step markers are now variable size to match font/text
						
						
						
						
						
						
						
						See: #410 
						
						
					 | 
					
						2022-08-20 11:33:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						cd4a9fba68
					 | 
					
						
						
							
							Fix viewport map mode bridges/tunnels not appearing dotted at high zoom
						
						
						
						
						
						
					 | 
					
						2022-07-14 23:06:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						28724d651d
					 | 
					
						
						
							
							Tracerestrict: Add button to highlight all signals using program
						
						
						
						
						
						
					 | 
					
						2022-06-11 23:29:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						d6015194c1
					 | 
					
						
						
							
							Allow ctrl-clicking other company trains on own track to start/stop
						
						
						
						
						
						
						
						See: #392 
						
						
					 | 
					
						2022-05-30 00:58:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						6107aa9e5c
					 | 
					
						
						
							
							Render an overlay of the measurement tool area in viewport map mode
						
						
						
						
						
						
						
						See: #388 
						
						
					 | 
					
						2022-05-19 00:18:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						a9caeaa7f1
					 | 
					
						
						
							
							Fix viewport map scrolling box blend on emscripten
						
						
						
						
						
						
					 | 
					
						2022-05-19 00:09:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						b464c589af
					 | 
					
						
						
							
							Reduce blitter MoveTo calls when drawing viewport map scrolling box blend
						
						
						
						
						
						
					 | 
					
						2022-05-19 00:07:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						d4f11eca42
					 | 
					
						
						
							
							Add NewGRF object properties to set viewport map mode/smallmap tile type
						
						
						
						
						
						
					 | 
					
						2022-02-07 01:16:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						d81cbc25b8
					 | 
					
						
						
							
							Add setting to allow hiding viewport labels of inidivudal waypoints
						
						
						
						
						
						
					 | 
					
						2022-01-21 23:37:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						dfc6e309d0
					 | 
					
						
						
							
							Fix ground/tree tile vegetation changes not updating map mode viewports
						
						
						
						
						
						
						
						(In vegetation mode) 
						
						
					 | 
					
						2022-01-09 21:00:11 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						324e90e5ac
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp-beta
						
						
						
						
						
						
						
						# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h 
						
						
					 | 
					
						2021-11-02 19:23:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						fd605e3cf3
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp-beta
						
						
						
						
						
						
						
						# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp 
						
						
					 | 
					
						2021-09-27 22:47:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						0b0d154788
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp-beta
						
						
						
						
						
						
						
						# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h 
						
						
					 | 
					
						2021-09-22 21:50:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						8ab267496b
					 | 
					
						
						
							
							Codechange: reference a string by its name, not with "another + 1" (#9517)
						
						
						
						
						
						
						
						It is wrong anyway, as "TINY" normally is at -1. Just weird code. 
						
						
					 | 
					
						2021-08-28 17:08:01 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						727e7543dc
					 | 
					
						
						
							
							Show unowned roads in viewport map owner mode
						
						
						
						
						
						
					 | 
					
						2021-07-05 17:31:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						9f56818ca7
					 | 
					
						
						
							
							Fix display of high freeform edges at north edges in viewport map mode
						
						
						
						
						
						
					 | 
					
						2021-06-20 11:18:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						24ad8759db
					 | 
					
						
						
							
							Viewport map: Improve handling of sloped tile rendering
						
						
						
						
						
						
					 | 
					
						2021-06-17 17:27:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						c4cb700738
					 | 
					
						
						
							
							Viewport map: Don't double draw north tile of bridge/tunnel
						
						
						
						
						
						
					 | 
					
						2021-06-17 17:22:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium42
							
						 
					 | 
					
						
						
							
						
						55a11710a6
					 | 
					
						
						
							
							Codechange: convert printf DEBUG statements to fmt Debug statements
						
						
						
						
						
						
					 | 
					
						2021-06-13 12:45:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						1002c6d9d2
					 | 
					
						
						
							
							Fix various compiler warnings
						
						
						
						
						
						
						
						See: #267 
						
						
					 | 
					
						2021-06-11 22:54:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						c0bb428e9e
					 | 
					
						
						
							
							Fix vehicle sprites not being updated when moving viewport
						
						
						
						
						
						
						
						When move is instantaneous and old and new viewport rects do not overlap 
						
						
					 | 
					
						2021-06-07 18:08:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						5799402f7a
					 | 
					
						
						
							
							Codechange: Rename window related DeleteXXX to match new behaviour
						
						
						
						
						
						
					 | 
					
						2021-05-29 21:08:25 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium42
							
						 
					 | 
					
						
						
							
						
						2e136285e1
					 | 
					
						
						
							
							Codechange: move from C-string to std::string for DoCommand
						
						
						
						
						
						
					 | 
					
						2021-05-29 19:02:18 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium42
							
						 
					 | 
					
						
						
							
						
						b791ffc6de
					 | 
					
						
						
							
							Fix: do not hide parameter by local variable with the same name
						
						
						
						
						
						
					 | 
					
						2021-05-27 18:30:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						aa0c1ba2e0
					 | 
					
						
						
							
							Only update vehicle image when in the vicinity of a viewport
						
						
						
						
						
						
						
						This reduces the performance impact of expensive NewGRF
graphics chains. 
						
						
					 | 
					
						2021-05-20 18:03:11 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						6ea97d6068
					 | 
					
						
						
							
							Viewport: Cache viewport areas for use in MarkAllViewportsDirty
						
						
						
						
						
						
					 | 
					
						2021-05-18 21:37:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						f96f113951
					 | 
					
						
						
							
							Codechange: use IterateFromBack/Front only if the order is important.
						
						
						
						
						
						
						
						Use Iterate if the order does not matter. 
						
						
					 | 
					
						2021-05-12 23:22:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						22567a1f43
					 | 
					
						
						
							
							Codechange: use iterators instead of 'subranges' when iterating from a specific window.
						
						
						
						
						
						
						
						Using iterators makes it easier to include or exclude the start window in the iteration. 
						
						
					 | 
					
						2021-05-12 23:22:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						dfe616bef4
					 | 
					
						
						
							
							Codechange: Replace window related FOR_ALL with range-based for loops
						
						
						
						
						
						
						
						(cherry picked from commit 14e92bd8e2) 
						
						
					 | 
					
						2021-05-06 19:32:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						14e92bd8e2
					 | 
					
						
						
							
							Codechange: Replace window related FOR_ALL with range-based for loops
						
						
						
						
						
						
					 | 
					
						2021-04-29 21:08:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						227041008f
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/debug.cpp
#	src/lang/russian.txt
#	src/misc_gui.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_cmd.cpp
#	src/window_gui.h 
						
						
					 | 
					
						2021-04-11 03:05:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						f39b6f4ba3
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/cheat_gui.cpp
#	src/genworld_gui.cpp
#	src/landscape.cpp
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/screenshot.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/table/settings.ini
#	src/tile_type.h
#	src/widgets/genworld_widget.h 
						
						
					 | 
					
						2021-04-10 18:29:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						3ede756d23
					 | 
					
						
						
							
							Fix: Viewport drag tooltips not being removed when dragging over other windows
						
						
						
						
						
						
					 | 
					
						2021-04-08 19:34:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						e3d9cce3ae
					 | 
					
						
						
							
							Fix viewport drag tooltips not being removed when dragging over other windows
						
						
						
						
						
						
					 | 
					
						2021-04-05 12:30:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						7ad8b69a74
					 | 
					
						
						
							
							Fix old polyrail tooltips being left on screen
						
						
						
						
						
						
					 | 
					
						2021-04-05 11:37:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						aec2793487
					 | 
					
						
						
							
							Fix flickering of polyrail measurement tooltip
						
						
						
						
						
						
					 | 
					
						2021-03-20 11:59:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						42e57995dd
					 | 
					
						
						
							
							Improve visibility of slopes under trees in viewport map vegetation mode
						
						
						
						
						
						
						
						Loosely based on tree slope brightness adjustment from
https://github.com/nielsmh/OpenTTD/tree/tree-slope-brightness 
						
						
					 | 
					
						2021-02-25 20:35:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						2a0acd9d91
					 | 
					
						
						
							
							Fix viewport order lines with unconditional jump orders
						
						
						
						
						
						
					 | 
					
						2021-02-14 20:40:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Loïc Guilloux
							
						 
					 | 
					
						
						
							
						
						f06c16fda0
					 | 
					
						
						
							
							Fix 81d335b081: Use non-pulsating red highlight for coverage (#8622)
						
						
						
						
						
						
						
						(cherry picked from commit b927da73c1) 
						
						
					 | 
					
						2021-02-14 20:19:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Loïc Guilloux
							
						 
					 | 
					
						
						
							
						
						b927da73c1
					 | 
					
						
						
							
							Fix 81d335b081: Use non-pulsating red highlight for coverage (#8622)
						
						
						
						
						
						
					 | 
					
						2021-02-07 16:20:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						e75e2b5bdc
					 | 
					
						
						
							
							Fix left mouse button scroll in viewport map mode
						
						
						
						
						
						
					 | 
					
						2021-02-05 11:56:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SamuXarick
							
						 
					 | 
					
						
						
							
						
						a4035af337
					 | 
					
						
						
							
							Codechange: Apply coding style (#8640)
						
						
						
						
						
						
						
						* Fix: Missing or needed spaces
* Codechange: Remove space
* Codechange: Remove space
* Codechange: More missing spaces
* Codechange: Missing spaces
* Codechange: Remove space
* Codechange: Remove space 
						
						
					 | 
					
						2021-02-05 11:00:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						b7ddd486cf
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp 
						
						
					 | 
					
						2021-02-01 17:07:34 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |