Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						5b490b243d
					 | 
					
						
						
							
							Merge branch 'master' into jgrpp
						
						
						
						
						
						
						
						# Conflicts:
#	src/industry_cmd.cpp
#	src/landscape.cpp
#	src/object_cmd.cpp
#	src/rail_cmd.cpp
#	src/script/api/script_tile.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/world_settings.ini
#	src/terraform_cmd.cpp
#	src/tilearea_type.h
#	src/tree_cmd.cpp
#	src/tree_cmd.h
#	src/tree_gui.cpp
#	src/water_cmd.cpp 
						
						
					 | 
					
						2023-01-14 16:49:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rubidium
							
						 
					 | 
					
						
						
							
						
						f667a831a5
					 | 
					
						
						
							
							Codechange: unify creation of diagonal/orthogonal iterator using smart pointers
						
						
						
						
						
						
					 | 
					
						2023-01-13 21:09:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan G Rennison
							
						 
					 | 
					
						
						
							
						
						29a1e49c28
					 | 
					
						
						
							
							Change various asserts to not be included in release builds
						
						
						
						
						
						
					 | 
					
						2022-10-22 12:34:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								glx22
							
						 
					 | 
					
						
						
							
						
						38c97e1492
					 | 
					
						
						
							
							Codechange: Replace TILE_AREA_LOOP with range-based for loops
						
						
						
						
						
						
					 | 
					
						2021-05-13 00:13:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Charles Pigott
							
						 
					 | 
					
						
						
							
						
						9b800a96ed
					 | 
					
						
						
							
							Codechange: Remove min/max functions in favour of STL variants (#8502)
						
						
						
						
						
						
					 | 
					
						2021-01-08 11:16:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								S. D. Cloudt
							
						 
					 | 
					
						
						
							
						
						13cc8a0cee
					 | 
					
						
						
							
							Cleanup: Removed SVN  headers
						
						
						
						
						
						
					 | 
					
						2019-11-10 17:59:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								PeterN
							
						 
					 | 
					
						
						
							
						
						abe8cf4985
					 | 
					
						
						
							
							Codechange: Replace duplicated code with TileArea::Expand() (#7467)
						
						
						
						
						
						
					 | 
					
						2019-04-13 14:12:34 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								fonsinchen
							
						 
					 | 
					
						
						
							
						
						547e521381
					 | 
					
						
						
							
							(svn r26289) -Codechange: Make tile areas and iterators more consistent to each other.
						
						
						
						
						
						
					 | 
					
						2014-02-02 14:53:26 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								planetmaker
							
						 
					 | 
					
						
						
							
						
						c24374f99c
					 | 
					
						
						
							
							(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
						
						
						
						
						
						
					 | 
					
						2013-01-08 22:46:42 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terkhen
							
						 
					 | 
					
						
						
							
						
						bf1b6d570b
					 | 
					
						
						
							
							(svn r23402) -Add: Function to check if a TileArea contains a tile. (michi_cc)
						
						
						
						
						
						
					 | 
					
						2011-12-03 20:19:33 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						1a515e6344
					 | 
					
						
						
							
							(svn r22405) -Document: some more "random-ish" tidbits
						
						
						
						
						
						
					 | 
					
						2011-05-01 19:14:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						7eba2bf4d3
					 | 
					
						
						
							
							(svn r21890) -Cleanup: remove some unneeded includes
						
						
						
						
						
						
					 | 
					
						2011-01-22 14:52:20 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						d89095b3ec
					 | 
					
						
						
							
							(svn r21843) -Codechange: move documentation towards the code to make it more likely to be updates [t-z].
						
						
						
						
						
						
					 | 
					
						2011-01-18 21:58:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								frosch
							
						 
					 | 
					
						
						
							
						
						12b4fa7dba
					 | 
					
						
						
							
							(svn r21768) -Fix [FS#4396]: Diagonal tile iterator needed a special case for A * 0 selections.
						
						
						
						
						
						
					 | 
					
						2011-01-11 16:45:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						ade2f29f5d
					 | 
					
						
						
							
							(svn r21747) -Fix [FS#4395]: the diagonal iterator would iterate twice over some tiles (fonsinchen)
						
						
						
						
						
						
					 | 
					
						2011-01-09 14:55:22 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						b20e77be92
					 | 
					
						
						
							
							(svn r21499) -Add: diagonal tile iterator. Based on patch by fonsinchen
						
						
						
						
						
						
					 | 
					
						2010-12-13 15:13:05 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rubidium
							
						 
					 | 
					
						
						
							
						
						30f2afac9b
					 | 
					
						
						
							
							(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
						
						
						
						
						
						
					 | 
					
						2010-08-26 22:01:16 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alberth
							
						 
					 | 
					
						
						
							
						
						a6e8c747c9
					 | 
					
						
						
							
							(svn r19041) -Codechange: Improve selection of tile to draw in zoomed-out smallmaps.
						
						
						
						
						
						
					 | 
					
						2010-02-06 13:19:46 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								alberth
							
						 
					 | 
					
						
						
							
						
						05388c953a
					 | 
					
						
						
							
							(svn r19038) -Codechange: Move TileArea methods to their own file.
						
						
						
						
						
						
					 | 
					
						2010-02-06 12:56:13 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |