Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						4042480806 
					 
					
						
						
							
							Merge branch 'jgrpp' into jgrpp-beta  
						
						... 
						
						
						
						# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini 
						
						
					 
					
						2021-10-08 18:12:04 +01:00 
						 
				 
			
				
					
						
							
							
								rubidium42 
							
						 
					 
					
						
						
							
						
						9299a29a52 
					 
					
						
						
							
							Fix: limit heightmap sizes to something reasonable to prevent crafted heightmaps to OOM-crash the game  
						
						... 
						
						
						
						(cherry picked from commit 97c461d1e7 
						
						
					 
					
						2021-10-08 18:11:02 +01:00 
						 
				 
			
				
					
						
							
							
								rubidium42 
							
						 
					 
					
						
						
							
						
						44ca7d9377 
					 
					
						
						
							
							Change: Use gender-neutral pronouns  
						
						
						
						
					 
					
						2021-05-15 10:16:48 +02:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						45c2c29c35 
					 
					
						
						
							
							Add: allow setting the highest mountain for heightmaps  
						
						... 
						
						
						
						It will add some slack to the map height limit if that was set
to auto. 
						
						
					 
					
						2021-03-26 12:22:32 +01:00 
						 
				 
			
				
					
						
							
							
								Patric Stout 
							
						 
					 
					
						
						
							
						
						1a1049bc0d 
					 
					
						
						
							
							Change: rename setting "max_heightlevel" to "map_height_limit"  
						
						... 
						
						
						
						This better reflects what it is, and hopefully removes a bit of
the confusion people are having what this setting actually does.
Additionally, update the text on the setting to better inform
users what it is doing exactly, so they can make an educated
decision on how to change it.
Next commit will introduce an "auto" value, which should be the
new default. The rename has as added benefit that everyone will
start out on the "auto" value. 
						
						
					 
					
						2021-03-26 12:22:32 +01:00 
						 
				 
			
				
					
						
							
							
								S. D. Cloudt 
							
						 
					 
					
						
						
							
						
						13cc8a0cee 
					 
					
						
						
							
							Cleanup: Removed SVN  headers  
						
						
						
						
					 
					
						2019-11-10 17:59:20 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Wilson 
							
						 
					 
					
						
						
							
						
						7c8e7c6b6e 
					 
					
						
						
							
							Codechange: Use null pointer literal instead of the NULL macro  
						
						
						
						
					 
					
						2019-04-10 23:22:20 +02:00 
						 
				 
			
				
					
						
							
							
								Charles Pigott 
							
						 
					 
					
						
						
							
						
						f5b1115039 
					 
					
						
						
							
							Doc: Lots and lots of doxymentation fixes  
						
						
						
						
					 
					
						2018-10-31 12:35:54 +01:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						597380e099 
					 
					
						
						
							
							(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.  
						
						
						
						
					 
					
						2016-09-04 12:57:43 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						d98d4130bd 
					 
					
						
						
							
							(svn r27044) -Change (r26905, r26984): Scale heightmap greyscales > 0 evenly to heightlevels > 0, instead of giving heightlevel 1 a bigger loading. Sea level remains at pure black only.  
						
						
						
						
					 
					
						2014-10-25 22:24:05 +00:00 
						 
				 
			
				
					
						
							
							
								frosch 
							
						 
					 
					
						
						
							
						
						3836d83e8d 
					 
					
						
						
							
							(svn r26984) -Fix (r26905) [FS#6134]: Heightlevels must be scaled by number of intervals, not by the value of the highest interval. Otherwise the highest interval becomes non-proportionally small.  
						
						
						
						
					 
					
						2014-10-09 19:57:40 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						26239c3d89 
					 
					
						
						
							
							(svn r26905) -Change: account for the maximum map height when converting heightmaps  
						
						
						
						
					 
					
						2014-09-21 18:29:18 +00: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 
							
						 
					 
					
						
						
							
						
						b3e93d6520 
					 
					
						
						
							
							(svn r26057) -Fix: a number of possibly uninitialised variables  
						
						
						
						
					 
					
						2013-11-23 13:12:19 +00:00 
						 
				 
			
				
					
						
							
							
								zuu 
							
						 
					 
					
						
						
							
						
						b35b8aa5bb 
					 
					
						
						
							
							(svn r25848) -Codechange: Refactor check for if a tile is not an edge tile to new IsInnerTile method (cirdan, LordAro)  
						
						
						
						
					 
					
						2013-10-12 22:03:13 +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 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						4af8c2d5e1 
					 
					
						
						
							
							(svn r23704) -Doc: Doxygen comment fixes and additions.  
						
						
						
						
					 
					
						2012-01-01 17:22:32 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						58423b26d1 
					 
					
						
						
							
							(svn r23474) -Codechange: move the declaration error related functions to error.h  
						
						
						
						
					 
					
						2011-12-10 13:54:10 +00:00 
						 
				 
			
				
					
						
							
							
								truebrain 
							
						 
					 
					
						
						
							
						
						160bfd8851 
					 
					
						
						
							
							(svn r23376) -Remove: on popular demand, remove my (revoked) name from comments in the code. It was silly to name me like that to begin with ;) (based on patch by HackaLittleBit)  
						
						
						
						
					 
					
						2011-11-30 01:22:18 +00:00 
						 
				 
			
				
					
						
							
							
								michi_cc 
							
						 
					 
					
						
						
							
						
						6c7cbb1d46 
					 
					
						
						
							
							(svn r22873) -Fix [FS#4747]: Validate image dimensions before loading. (Based on patch by monoid)  
						
						
						
						
					 
					
						2011-09-02 20:16:34 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						b4edc30c64 
					 
					
						
						
							
							(svn r22827) -Codechange: pass the/a more proper sub directory when opening (some) files instead of the default one  
						
						
						
						
					 
					
						2011-08-24 13:53:34 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						7efd7e19ed 
					 
					
						
						
							
							(svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m].  
						
						
						
						
					 
					
						2011-01-18 22:31:06 +00:00 
						 
				 
			
				
					
						
							
							
								smatz 
							
						 
					 
					
						
						
							
						
						f051066bc4 
					 
					
						
						
							
							(svn r19224) -Codechange: change parameters passed to ShowErrorMessage() a bit  
						
						
						
						
					 
					
						2010-02-24 14:46:15 +00:00 
						 
				 
			
				
					
						
							
							
								glx 
							
						 
					 
					
						
						
							
						
						6179198c65 
					 
					
						
						
							
							(svn r18756) -Codechange: direct accesses to png_*_struct members are deprecated  
						
						
						
						
					 
					
						2010-01-08 03:17:12 +00:00 
						 
				 
			
				
					
						
							
							
								alberth 
							
						 
					 
					
						
						
							
						
						44aacfc59f 
					 
					
						
						
							
							(svn r17928) -Codechange: ShowErrorMessage() now takes the summary string before the details string.  
						
						... 
						
						
						
						Gentlemen, swap your string parameters. 
						
						
					 
					
						2009-10-31 19:46:51 +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 
							
						 
					 
					
						
						
							
						
						1fe3ad3288 
					 
					
						
						
							
							(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives  
						
						
						
						
					 
					
						2009-08-05 17:59:21 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						3d780608a2 
					 
					
						
						
							
							(svn r15685) -Fix [FS#2720]: do not crash when someone substitutes the "map generation" sprites with garbage.  
						
						
						
						
					 
					
						2009-03-12 14:21:18 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						0d8da02ec1 
					 
					
						
						
							
							(svn r15610) -Change: allow loading of heightmaps and savegames (any form) that are in .tar files  
						
						
						
						
					 
					
						2009-03-04 09:53:31 +00:00 
						 
				 
			
				
					
						
							
							
								smatz 
							
						 
					 
					
						
						
							
						
						d73c1fa7bf 
					 
					
						
						
							
							(svn r15568) -Cleanup: *allocT/AllocaM doesn't return NULL when allocating fails  
						
						
						
						
					 
					
						2009-02-24 20:59:17 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						c0a8d09ca7 
					 
					
						
						
							
							(svn r15428) -Codechange: consistently use colour instead of having both color and colour.  
						
						
						
						
					 
					
						2009-02-09 02:57:15 +00:00 
						 
				 
			
				
					
						
							
							
								smatz 
							
						 
					 
					
						
						
							
						
						d2a725ec94 
					 
					
						
						
							
							(svn r15332) -Fix (r15190): terrain generated from heightmaps always was at sea level at both southern borders  
						
						
						
						
					 
					
						2009-02-04 01:07:53 +00:00 
						 
				 
			
				
					
						
							
							
								smatz 
							
						 
					 
					
						
						
							
						
						0d3f5e6e74 
					 
					
						
						
							
							(svn r15299) -Cleanup: remove many redundant includes  
						
						
						
						
					 
					
						2009-01-31 20:16:06 +00:00 
						 
				 
			
				
					
						
							
							
								Yexo 
							
						 
					 
					
						
						
							
						
						db3ee34b44 
					 
					
						
						
							
							(svn r15190) -Feature: Allow terraforming of the tiles at the edges of the map.  
						
						
						
						
					 
					
						2009-01-21 02:31:55 +00:00 
						 
				 
			
				
					
						
							
							
								smatz 
							
						 
					 
					
						
						
							
						
						7368c740a6 
					 
					
						
						
							
							(svn r14828) -Codechange: move most of save/load-specific code to separate files  
						
						
						
						
					 
					
						2009-01-04 15:32:25 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						923e21129c 
					 
					
						
						
							
							(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.  
						
						
						
						
					 
					
						2008-05-29 15:13:28 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						4625695653 
					 
					
						
						
							
							(svn r13251) -Codechange: rename _patches to _settings as that is more logic.  
						
						... 
						
						
						
						-Codechange: move all Settings into substructs of _settings in a way that they are logically grouped. 
						
						
					 
					
						2008-05-25 19:17:03 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						d03994098b 
					 
					
						
						
							
							(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.  
						
						
						
						
					 
					
						2008-05-06 15:11:33 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						dc87b05e8c 
					 
					
						
						
							
							(svn r11834) -Codechange: only include settings_type.h if needed.  
						
						
						
						
					 
					
						2008-01-13 14:37:30 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						d4e6a6bf57 
					 
					
						
						
							
							(svn r11828) -Codechange: include table/* as the last includes and remove an unneeded include from openttd.h.  
						
						
						
						
					 
					
						2008-01-13 01:21:35 +00:00 
						 
				 
			
				
					
						
							
							
								belugas 
							
						 
					 
					
						
						
							
						
						5087a6cdd7 
					 
					
						
						
							
							(svn r11713) -Codechange: Move some declarations and definitions in a more logical disposition  
						
						
						
						
					 
					
						2007-12-28 03:14:55 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						429521a7d1 
					 
					
						
						
							
							(svn r11692) -Codechange: move some functions from 'functions.h' to a more logical place and remove about 50% of the includes of 'functions.h'  
						
						
						
						
					 
					
						2007-12-25 11:26:07 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						bf98e25e43 
					 
					
						
						
							
							(svn r11691) -Codechange: move+rename helpers.hpp and only include it when it is really needed.  
						
						
						
						
					 
					
						2007-12-25 09:48:53 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						a773d45885 
					 
					
						
						
							
							(svn r11684) -Codechange: split gfx.h in a type and functional header.  
						
						
						
						
					 
					
						2007-12-23 10:56:02 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						8f0e68285b 
					 
					
						
						
							
							(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.  
						
						
						
						
					 
					
						2007-12-22 23:30:28 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						e1057864d8 
					 
					
						
						
							
							(svn r9729) -Documentation: add some documentation in various places  
						
						
						
						
					 
					
						2007-04-27 21:29:36 +00:00 
						 
				 
			
				
					
						
							
							
								rubidium 
							
						 
					 
					
						
						
							
						
						36bb92ae24 
					 
					
						
						
							
							(svn r9050) -Codechange: Foo(void) -> Foo()  
						
						
						
						
					 
					
						2007-03-07 11:47:46 +00:00 
						 
				 
			
				
					
						
							
							
								truelight 
							
						 
					 
					
						
						
							
						
						657be6d2d0 
					 
					
						
						
							
							(svn r9019) -Fix: use <> for system-headers  
						
						
						
						
					 
					
						2007-03-05 18:00:18 +00:00 
						 
				 
			
				
					
						
							
							
								belugas 
							
						 
					 
					
						
						
							
						
						978d7da818 
					 
					
						
						
							
							(svn r8950) -Cleanup: doxygen changes.  Mostly @files missing tags and a few comments style.  
						
						
						
						
					 
					
						2007-03-01 01:24:44 +00:00