Jonathan G Rennison 
							
						 
					 
					
						
						
							
						
						e24839ed65 
					 
					
						
						
							
							Merge branch 'master' into enhanced_viewport_overlay  
						
						 
						
						... 
						
						
						
						Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h 
						
						
					 
					
						2015-08-05 21:25:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								patch-import 
							
						 
					 
					
						
						
							
						
						536a95dfd0 
					 
					
						
						
							
							Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch  
						
						 
						
						... 
						
						
						
						https://www.tt-forums.net/viewtopic.php?f=33&t=53394  
						
						
					 
					
						2015-08-05 21:24:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						ad8a7aee30 
					 
					
						
						
							
							(svn r27286) -Fix-ish(r27140): Also fix typo in the documentation.  
						
						 
						
						
						
						
					 
					
						2015-05-16 12:08:06 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						ac23e46713 
					 
					
						
						
							
							(svn r26610) -Feature: Select an editable preset name for saving.  
						
						 
						
						
						
						
					 
					
						2014-05-24 19:11:20 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						173aed1687 
					 
					
						
						
							
							(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.  
						
						 
						
						
						
						
					 
					
						2013-06-15 15:31:22 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zuu 
							
						 
					 
					
						
						
							
						
						7a5cedf078 
					 
					
						
						
							
							(svn r25344) -Feature: GUI for viewing story pages  
						
						 
						
						
						
						
					 
					
						2013-06-09 12:48:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						71ce89c1d0 
					 
					
						
						
							
							(svn r25263) -Add: legend for linkgraph overlay (fonsinchen)  
						
						 
						
						
						
						
					 
					
						2013-05-19 14:43:23 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						0f444197c3 
					 
					
						
						
							
							(svn r24842) -Remove: News settings window.  
						
						 
						
						
						
						
					 
					
						2012-12-23 21:06:37 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						5d80d59aa6 
					 
					
						
						
							
							(svn r24791) -Remove: Difficulty settings window.  
						
						 
						
						
						
						
					 
					
						2012-12-05 19:37:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						76fef0843c 
					 
					
						
						
							
							(svn r24790) -Remove: Classic difficulty profiles.  
						
						 
						
						
						
						
					 
					
						2012-12-05 19:36:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						23a8c3ddd5 
					 
					
						
						
							
							(svn r24663) -Codechange: Unify the naming of widget enums.  
						
						 
						
						
						
						
					 
					
						2012-11-05 19:45:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						6256d64553 
					 
					
						
						
							
							(svn r23932) -Codechange: split the NewGRF text window into its own source files  
						
						 
						
						
						
						
					 
					
						2012-02-12 10:32:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						4b1404997e 
					 
					
						
						
							
							(svn r23736) -Document: document correctly that WC_GOAL_QUESTION has a WindowNumber which is identical to the uniqueid given by the GameScript  
						
						 
						
						
						
						
					 
					
						2012-01-03 20:28:28 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						59de5e9570 
					 
					
						
						
							
							(svn r23731) -Add: add GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17  
						
						 
						
						
						
						
					 
					
						2012-01-03 16:36:24 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						06597e684c 
					 
					
						
						
							
							(svn r23704) -Doc: Doxygen comment fixes and additions.  
						
						 
						
						
						
						
					 
					
						2012-01-01 17:22:32 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						ccf9b01f5d 
					 
					
						
						
							
							(svn r23630) -Add: a Goal GUI to show your current goals  
						
						 
						
						
						
						
					 
					
						2011-12-19 21:03:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						c74ccfff1b 
					 
					
						
						
							
							(svn r23601) -Fix: fix the conflict in window number  
						
						 
						
						
						
						
					 
					
						2011-12-19 20:50:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						32ca564bca 
					 
					
						
						
							
							(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class  
						
						 
						
						
						
						
					 
					
						2011-12-19 20:46:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						fd2325d205 
					 
					
						
						
							
							(svn r23599) -Codechange: document WC_ entries, and reoder a bit  
						
						 
						
						
						
						
					 
					
						2011-12-19 20:44:47 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						49e88dcbf0 
					 
					
						
						
							
							(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h  
						
						 
						
						
						
						
					 
					
						2011-12-15 22:22:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								michi_cc 
							
						 
					 
					
						
						
							
						
						b68ced52c4 
					 
					
						
						
							
							(svn r23410) -Add: A window with a detailed overview over the infrastructure of a company.  
						
						 
						
						
						
						
					 
					
						2011-12-03 23:40:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						42ba77bd11 
					 
					
						
						
							
							(svn r23248) -Codechange: Rename everything related to the NewGRF 'readme' to 'textfile', so it is more generic.  
						
						 
						
						
						
						
					 
					
						2011-11-18 13:05:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						4509f814b3 
					 
					
						
						
							
							(svn r23244) -Feature: if the installation is ananas, try to get the b without b installed  
						
						 
						
						
						
						
					 
					
						2011-11-17 21:17:17 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						60c0abb883 
					 
					
						
						
							
							(svn r23178) -Feature [FS#4780]: in-game readme.txt readmer (LordAro)  
						
						 
						
						
						
						
					 
					
						2011-11-10 06:15:03 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						fa33292aa5 
					 
					
						
						
							
							(svn r22789) -Codechange: rename generation window class to modal progress  
						
						 
						
						
						
						
					 
					
						2011-08-21 12:49:14 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						9a5f813b6d 
					 
					
						
						
							
							(svn r22618) -Fix [FS#4653]: When changing difficulty settings over the network, do not just reopen the difficulty window if any game options window is opened; instead invalidate them properly.  
						
						 
						
						
						
						
					 
					
						2011-07-02 12:58:37 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frosch 
							
						 
					 
					
						
						
							
						
						1322d59aaa 
					 
					
						
						
							
							(svn r22617) -Codechange: Add GameOptionsInvalidationData enum for data values for Window::OnInvalidateData() of windows with class WC_GAME_OPTIONS.  
						
						 
						
						
						
						
					 
					
						2011-07-02 12:49:44 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						9a466d0e04 
					 
					
						
						
							
							(svn r22358) -Codechange: WC_TOOLBAR_MENU isn't the right name when its only used for client list popups  
						
						 
						
						
						
						
					 
					
						2011-04-22 15:50:13 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						0c509c7b48 
					 
					
						
						
							
							(svn r20670) -Add: support for action F  
						
						 
						
						... 
						
						
						
						-Add: a window to select (NewGRF) objects 
						
						
					 
					
						2010-08-28 19:43:41 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								yexo 
							
						 
					 
					
						
						
							
						
						f4c46dd701 
					 
					
						
						
							
							(svn r20258) -Feature: more user-friendly gui to change NewGRF parameters  
						
						 
						
						
						
						
					 
					
						2010-07-31 12:15:12 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								alberth 
							
						 
					 
					
						
						
							
						
						b4358056ee 
					 
					
						
						
							
							(svn r20206) -Feature: Display suppliers and customers of an industry or cargo.  
						
						 
						
						
						
						
					 
					
						2010-07-23 18:39:02 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						738e71af4a 
					 
					
						
						
							
							(svn r19723) -Add: a simple sprite alignment helper. It does not store the new offsets anywhere so as soon as the sprite is reloaded the offsets are gone (use a bigger sprite cache if this happens). Also anything that reloads NewGRFs (new games, loading games or (re)applying NewGRFs) clears the sprite cache and as such resets the offsets.  
						
						 
						
						
						
						
					 
					
						2010-04-25 16:27:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						ab8562f71c 
					 
					
						
						
							
							(svn r19708) -Add: NewGRF "debugging" window and data tables; should be a useful tool for NewGRF developers to get some insights into the value of some variables  
						
						 
						
						
						
						
					 
					
						2010-04-24 13:36:29 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						9467b7c6d6 
					 
					
						
						
							
							(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 
							
						 
					 
					
						
						
							
						
						04b2a002ff 
					 
					
						
						
							
							(svn r18293) -Codechange: add a window to set the date. Based on work by PhilSophus and Maedhros.  
						
						 
						
						
						
						
					 
					
						2009-11-25 23:38:59 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						99d46e0ad7 
					 
					
						
						
							
							(svn r17248) -Fix: add GPL license notice where appropriate  
						
						 
						
						
						
						
					 
					
						2009-08-21 20:21:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								smatz 
							
						 
					 
					
						
						
							
						
						cb13180774 
					 
					
						
						
							
							(svn r15506) -Codechange: rename ScenarioEditorTownGenerationWindow to FoundTownWindow  
						
						 
						
						
						
						
					 
					
						2009-02-17 00:21:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						89e1afdaa0 
					 
					
						
						
							
							(svn r15428) -Codechange: consistently use colour instead of having both color and colour.  
						
						 
						
						
						
						
					 
					
						2009-02-09 02:57:15 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yexo 
							
						 
					 
					
						
						
							
						
						593f380462 
					 
					
						
						
							
							(svn r15175) -Feature: Add the option to select the AIs to start in a new game and configure them via the gui.  
						
						 
						
						
						
						
					 
					
						2009-01-20 16:49:10 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								truebrain 
							
						 
					 
					
						
						
							
						
						c2406cd42d 
					 
					
						
						
							
							(svn r15027) -Merge: tomatos and bananas left to be, here is NoAI for all to see.  
						
						 
						
						... 
						
						
						
						NoAI is an API (a framework) to build your own AIs in. See:
   http://wiki.openttd.org/wiki/index.php/AI:Main_Page 
 With many thanks to:
  - glx and Rubidium for their syncing, feedback and hard work
  - Yexo for his feedback, patches, and AIs which tested the system very deep
  - Morloth for his feedback and patches
  - TJIP for hosting a challenge which kept NoAI on track
  - All AI authors for testing our AI API, and all other people who helped in one way or another
-Remove: all old AIs and their cheats/hacks 
						
						
					 
					
						2009-01-12 17:11:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						7a5798695d 
					 
					
						
						
							
							(svn r14919) -Feature: distant joining of stations (Frostregen and PhilSophus)  
						
						 
						
						
						
						
					 
					
						2009-01-08 16:35:45 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						e7bb5c63a4 
					 
					
						
						
							
							(svn r14466) -Doc: remove some obsolete parameters, fix a few parameter names in comments and add a little more doxygen documentation.  
						
						 
						
						
						
						
					 
					
						2008-10-14 19:27:08 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						f56e630e5c 
					 
					
						
						
							
							(svn r14421) -Codechange: rename all player variables/types to company *or* client so it is immediatelly clear which one you are working with.  
						
						 
						
						
						
						
					 
					
						2008-09-30 20:39:50 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								belugas 
							
						 
					 
					
						
						
							
						
						d096431936 
					 
					
						
						
							
							(svn r14104) -Feature: Add a window for waypoints, allowing to view all the trains having the selected waypoint in their orders.  
						
						 
						
						... 
						
						
						
						Changing its name is also supported from the same new window.
Gui based on work done by Satyap, on FS#2025. 
						
						
					 
					
						2008-08-20 01:29:05 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								skidd13 
							
						 
					 
					
						
						
							
						
						3dea3cbe63 
					 
					
						
						
							
							(svn r13628) -Feature: enable building of aqueducts in the scenario editor  
						
						 
						
						... 
						
						
						
						-Codechange: related to this split the waterway based buttons from the landscape generation window 
						
						
					 
					
						2008-06-25 17:30:16 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						4d5b9e38d6 
					 
					
						
						
							
							(svn r13160) -Codechange: prepare GUIPlaceProcDragXY for the removal of WindowEvent.  
						
						 
						
						
						
						
					 
					
						2008-05-18 12:40:38 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						0b61b6c1d0 
					 
					
						
						
							
							(svn r13129) -Codechange: remove the WP macro and it's related variables.  
						
						 
						
						
						
						
					 
					
						2008-05-16 23:29:31 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						2704b12f2b 
					 
					
						
						
							
							(svn r13110) -Fix [FS#2018]: some toolbar buttons not being unpressed properly.  
						
						 
						
						
						
						
					 
					
						2008-05-15 20:52:28 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						c6c908aba5 
					 
					
						
						
							
							(svn r13068) -Codechange: make a class of the BuildVehicleWindow.  
						
						 
						
						
						
						
					 
					
						2008-05-13 14:28:27 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rubidium 
							
						 
					 
					
						
						
							
						
						99b51aa235 
					 
					
						
						
							
							(svn r12693) -Documentation: add some documentation to some window related stuff. Based on a patch by Albert.  
						
						 
						
						
						
						
					 
					
						2008-04-13 19:01:26 +00:00