Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						faa77e2605
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/script/api/script_company.cpp
#	src/script/api/script_date.cpp
#	src/script/api/script_date.hpp
#	src/script/api/script_gamesettings.cpp
#	src/script/api/script_order.hpp
#	src/script/api/script_town.cpp
#	src/script/api/script_window.cpp 
						
						
					 | 
					
						2023-03-06 01:05:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						ca149447d7
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_window
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						f752d96125
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_vehicle
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						4e48bf2e16
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_town
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						18fe0a4046
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_tilelist
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						cada18a6f8
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_tile
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						07b73a8c02
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_subsidy
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						cd80b31d19
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_storypage
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						a9a55f2153
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_station
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						446ebaa6b9
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_road
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						4f6a2f31b5
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_rail
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						cb2e76aae3
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_priorityqueue
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						777b4d0987
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_order
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						49ea69fdef
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_objecttype
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						0293fd41e5
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_news
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						f22903ab14
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_newgrf
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						ca67075397
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_map
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						a225fda9fe
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_list
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						74ab9ee9dd
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_league
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						367b2ba6d1
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_infrastructure
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						5eaf9d39bf
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_industrytype
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						6671994655
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_industry
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						8eb35633ec
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_group
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						6ca8499e6a
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_goal
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						e784915b27
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_gamesettings
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						6b8b4c392f
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_engine
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						2f40bf8097
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_date
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						424ae74504
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_companymode
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						89c0841d0a
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_company
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						7727323dbe
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_cargomonitor
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						40424601c6
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_cargo
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						83826b1793
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_bridgelist
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						58bf2f7176
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_bridge
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						73561802cb
					 | 
					
						
						
							
							Codechange: Use SQInteger for generic numbers in script_airport
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						b6f3552e4b
					 | 
					
						
						
							
							Fix: [Script] Inconsistent precondition failure return values
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						e06a666fa2
					 | 
					
						
						
							
							Fix: remove ScriptController constructor from API documentation
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						67a4c5e0db
					 | 
					
						
						
							
							Codechange: Use {fmt} for script_admin JSON generation
						
						
						
						
						
						
					 | 
					
						2023-03-06 00:32:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						983790ec7a
					 | 
					
						
						
							
							Remove unused town argument from GetTownRoadType
						
						
						
						
						
						
					 | 
					
						2023-03-05 21:28:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						ce8cde3b8d
					 | 
					
						
						
							
							Fix: [Script] Detect circular references in ScriptText
						
						
						
						
						
						
					 | 
					
						2023-03-05 22:24:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						9a957f1d4b
					 | 
					
						
						
							
							Change: [Script] Improve ScriptText validation error messages
						
						
						
						
						
						
					 | 
					
						2023-03-05 22:24:08 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rubidium
							
						 
					 | 
					
						
						
							
						
						8fa61533f0
					 | 
					
						
						
							
							Fix 30ae072: when a road type is hidden, towns may not build them even when that flag is set
						
						
						
						
						
						
					 | 
					
						2023-03-05 22:01:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								translators
							
						 
					 | 
					
						
						
							
						
						e60632bce6
					 | 
					
						
						
							
							Update: Translations from eints
						
						
						
						
						
						
						
						italian: 12 changes by Rivarossi
russian: 14 changes by Ln-Wolf
finnish: 2 changes by hpiirai
portuguese (brazilian): 14 changes by ericandradex 
						
						
					 | 
					
						2023-03-05 18:44:04 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						de17e0aa4d
					 | 
					
						
						
							
							NewGRF: Add extension for more Action2 set IDs
						
						
						
						
						
						
					 | 
					
						2023-03-05 14:40:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						2b288c8056
					 | 
					
						
						
							
							Merge PR #491: Galician language strings
						
						
						
						
						
						
					 | 
					
						2023-03-05 13:57:48 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						cbd71b3d58
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/order_cmd.cpp 
						
						
					 | 
					
						2023-03-05 12:41:58 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rubidium
							
						 
					 | 
					
						
						
							
						
						30ae07269d
					 | 
					
						
						
							
							Fix: game scripts must not build with non-existing road types
						
						
						
						
						
						
					 | 
					
						2023-03-05 07:17:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dP
							
						 
					 | 
					
						
						
							
						
						01ebfad809
					 | 
					
						
						
							
							Fix 3719f60: Crash when copying non-station orders (#10540)
						
						
						
						
						
						
					 | 
					
						2023-03-04 22:52:30 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								translators
							
						 
					 | 
					
						
						
							
						
						16a7bc54b3
					 | 
					
						
						
							
							Update: Translations from eints
						
						
						
						
						
						
						
						finnish: 2 changes by hpiirai
catalan: 2 changes by J0anJosep 
						
						
					 | 
					
						2023-03-04 18:44:24 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						2ea1766677
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp 
						
						
					 | 
					
						2023-03-04 16:45:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						4ec6a99dd8
					 | 
					
						
						
							
							Add GetTileTrackStatus wrapper for when red signals part is not needed
						
						
						
						
						
						
					 | 
					
						2023-03-04 02:01:40 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |