Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						3a47b421b0
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/company_cmd.cpp
#	src/core/overflowsafe_type.hpp
#	src/economy.cpp
#	src/engine_base.h
#	src/ground_vehicle.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/newgrf_commons.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_industries.cpp
#	src/newgrf_object.cpp
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/script/api/script_log.cpp
#	src/script/api/script_log.hpp
#	src/settings_gui.cpp
#	src/settingsgen/settingsgen.cpp
#	src/station_cmd.cpp
#	src/station_cmd.h
#	src/station_gui.cpp
#	src/strgen/strgen.cpp
#	src/string_func.h
#	src/string_type.h
#	src/table/settings/network_private_settings.ini
#	src/tests/math_func.cpp
#	src/textfile_gui.cpp
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/waypoint_cmd.h
#	src/widgets/dropdown.cpp 
						
						
					 | 
					
						2023-06-03 19:16:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rubidium
							
						 
					 | 
					
						
						
							
						
						fb856e16c1
					 | 
					
						
						
							
							Codechange: replace some min/clamp constructs to ClampTo
						
						
						
						
						
						
					 | 
					
						2023-05-06 21:26:13 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium42
							
						 
					 | 
					
						
						
							
						
						55a11710a6
					 | 
					
						
						
							
							Codechange: convert printf DEBUG statements to fmt Debug statements
						
						
						
						
						
						
					 | 
					
						2021-06-13 12:45:45 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patric Stout
							
						 
					 | 
					
						
						
							
						
						ca9a7df752
					 | 
					
						
						
							
							Codechange: rename str_validate to StrMakeValid(InPlace) (#9304)
						
						
						
						
						
						
						
						This to be more explicit the function changes the value, and not
returns yes/no. 
						
						
					 | 
					
						2021-05-29 11:21:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Pigott
							
						 
					 | 
					
						
						
							
						
						9b800a96ed
					 | 
					
						
						
							
							Codechange: Remove min/max functions in favour of STL variants (#8502)
						
						
						
						
						
						
					 | 
					
						2021-01-08 11:16:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Lutz
							
						 
					 | 
					
						
						
							
						
						dd138fc460
					 | 
					
						
						
							
							Codechange: Stringify config file paths.
						
						
						
						
						
						
					 | 
					
						2020-12-27 13:19:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx
							
						 
					 | 
					
						
						
							
						
						3a14cea068
					 | 
					
						
						
							
							Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
						
						
						
						
						
						
					 | 
					
						2019-12-21 20:13:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								S. D. Cloudt
							
						 
					 | 
					
						
						
							
						
						13cc8a0cee
					 | 
					
						
						
							
							Cleanup: Removed SVN  headers
						
						
						
						
						
						
					 | 
					
						2019-11-10 17:59:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx
							
						 
					 | 
					
						
						
							
						
						ebd4f32d15
					 | 
					
						
						
							
							Cleanup: remove core/sort_func.hpp as it's not used anymore
						
						
						
						
						
						
					 | 
					
						2019-04-18 21:49:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx
							
						 
					 | 
					
						
						
							
						
						60da17418a
					 | 
					
						
						
							
							Codechange: use std::sort in SaveHighScoreValueNetwork()
						
						
						
						
						
						
					 | 
					
						2019-04-18 21:49:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Henry Wilson
							
						 
					 | 
					
						
						
							
						
						7c8e7c6b6e
					 | 
					
						
						
							
							Codechange: Use null pointer literal instead of the NULL macro
						
						
						
						
						
						
					 | 
					
						2019-04-10 23:22:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						0463dbdc9e
					 | 
					
						
						
							
							(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
						
						
						
						
						
						
					 | 
					
						2014-04-23 20:13:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						3b2a92ea97
					 | 
					
						
						
							
							(svn r26062) -Fix: beef up checks against invalid data in highscore and language files
						
						
						
						
						
						
					 | 
					
						2013-11-23 13:18:29 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						bdb62c14e2
					 | 
					
						
						
							
							(svn r25513) -Fix [FS#5623]: the high score's company/president name was stored with encoded string codes, causing it to cause trouble when the encoding of the string codes changes. Furthermore, check the incoming dangerous content better
						
						
						
						
						
						
					 | 
					
						2013-06-29 12:09:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						d1ab0f03bc
					 | 
					
						
						
							
							(svn r24790) -Remove: Classic difficulty profiles.
						
						
						
						
						
						
					 | 
					
						2012-12-05 19:36:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						a499435351
					 | 
					
						
						
							
							(svn r24786) -Codechange: Add SettingsProfile enum for difficulty profiles and highscore tables.
						
						
						
						
						
						
					 | 
					
						2012-12-05 19:34:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alberth
							
						 
					 | 
					
						
						
							
						
						a825b4fa5f
					 | 
					
						
						
							
							(svn r20266) -Doc: Mostly typo fixes, a few doxygen-related improvements.
						
						
						
						
						
						
					 | 
					
						2010-07-31 21:02:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						b8487afe54
					 | 
					
						
						
							
							(svn r20192) -Cleanup: bye bye variables.h, bye bye VARDEF... you won't be missed :)
						
						
						
						
						
						
					 | 
					
						2010-07-19 17:28:27 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						eb30ebe1a4
					 | 
					
						
						
							
							(svn r20188) -Codechange: unVARDEF the _[config|log|highscore]_file variables and move them to a more logical location
						
						
						
						
						
						
					 | 
					
						2010-07-19 17:11:09 +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
							
						 
					 | 
					
						
						
							
						
						d6cded5380
					 | 
					
						
						
							
							(svn r17693) -Cleanup: remove some unneeded includes
						
						
						
						
						
						
					 | 
					
						2009-10-04 17:16:41 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						7fbc33dae1
					 | 
					
						
						
							
							(svn r17248) -Fix: add GPL license notice where appropriate
						
						
						
						
						
						
					 | 
					
						2009-08-21 20:21:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						59d45a04d6
					 | 
					
						
						
							
							(svn r16118) -Change/cleanup: remove the hexadecimal 'in TTD the string had this ID' from 'some' strings and replace the string name with something more sensible.
						
						
						
						
						
						
					 | 
					
						2009-04-21 23:40:56 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						0d3f5e6e74
					 | 
					
						
						
							
							(svn r15299) -Cleanup: remove many redundant includes
						
						
						
						
						
						
					 | 
					
						2009-01-31 20:16:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						11da45ee55
					 | 
					
						
						
							
							(svn r14949) -Cleanup: pointer coding style
						
						
						
						
						
						
					 | 
					
						2009-01-10 00:31:47 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								smatz
							
						 
					 | 
					
						
						
							
						
						09cd9a8017
					 | 
					
						
						
							
							(svn r14815) -Codechange: separate 'highscore' code from 'company' code
						
						
						
						
						
						
					 | 
					
						2009-01-03 18:44:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |