dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,181 Commits 1 Branch 0 Tags
e24839ed6525c0a08cd2913d15d11ddc46779985
Commit Graph

164 Commits

Author SHA1 Message Date
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
frosch
6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 2015-02-22 15:26:27 +00:00
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
peter1138
4f63bbedc1 (svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level. 2014-09-22 08:01:25 +00:00
rubidium
2be4215f43 (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
frosch
5c3b3f84d6 (svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose. 2014-03-23 13:28:32 +00:00
frosch
173aed1687 (svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList. 2013-06-15 15:31:22 +00:00
frosch
303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 2013-06-15 15:30:44 +00:00
frosch
1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 2013-06-15 15:28:09 +00:00
frosch
55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 2013-06-15 15:27:33 +00:00
frosch
fdd94f7601 (svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file. 2013-06-15 15:05:54 +00:00
frosch
01dc8ee620 (svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window. 2013-06-11 18:36:26 +00:00
frosch
16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
planetmaker
f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 2013-01-08 22:46:42 +00:00
frosch
336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 2012-12-23 21:09:09 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +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
000ff60e25 (svn r23531) -Codechange: document and rename widgets to be consistent and understandable 2011-12-16 16:27:45 +00:00
truebrain
49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 2011-12-15 22:22:55 +00:00
rubidium
70faeeaba9 (svn r23106) -Codechange: pass int* to GetTileSlope and friends 2011-11-04 11:30:37 +00:00
rubidium
1a54b7733c (svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT 2011-11-04 10:31:46 +00:00
rubidium
bcb93b3b75 (svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it 2011-11-04 10:22:27 +00:00
rubidium
de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 2011-11-04 10:18:13 +00:00
frosch
ba358638a8 (svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc) 2011-07-10 13:04:04 +00:00
rubidium
39a41a3a58 (svn r22266) -Fix [FS#4558]: In the scenario editor you could build a ship depot using the hotkeys. Removing that depot causes an assertions to trigger. 2011-03-20 20:51:31 +00:00
frosch
4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 2011-03-13 21:31:29 +00:00
rubidium
7086bb3017 (svn r21959) -Change: replace longbridges with custom maximum bridge and tunnel length setting 2011-02-04 15:37:23 +00:00
rubidium
05199a641a (svn r21890) -Cleanup: remove some unneeded includes 2011-01-22 14:52:20 +00:00
terkhen
9df9575e72 (svn r21806) -Codechange: Correct additional appearances of the same typo. 2011-01-15 16:27:04 +00:00
terkhen
98e0a17c47 (svn r21805) -Codechange: Correct a typo. 2011-01-15 15:58:03 +00:00
alberth
7d989073d4 (svn r21627) -Codechange: Remove _place_proc global variable. 2010-12-24 15:08:19 +00:00
alberth
38a59fb3f3 (svn r21609) -Fix (r21545,r21552,r21580,r21586): Restore diagonal clearing of areas. 2010-12-23 14:38:01 +00:00
alberth
b78387b68d (svn r21545) -Codechange: Replace the callback by another switch. 2010-12-20 13:19:59 +00:00
alberth
5a75937649 (svn r21544) -Codechange: Fold the small static click functions into the switch. 2010-12-20 13:17:54 +00:00
alberth
7ad959b4bc (svn r21543) -Codechange: Remove _build_docks_button_proc array. 2010-12-20 13:16:22 +00:00
rubidium
0f52366443 (svn r21471) -Change [FS#4153]: make building aqueducts behave more like building tunnels. They can't be built on flat (or foundationed) tiles, so there is at most one destination tile like there is only one for tunnels 2010-12-11 19:49:44 +00:00
alberth
0722492c1b (svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint(). 2010-11-26 15:22:18 +00:00
terkhen
f12391dcb0 (svn r20932) -Add [FS#4153]: Highlight all destination tiles when building a lock. (uni657) 2010-10-15 19:14:43 +00:00
terkhen
0a8adab770 (svn r20931) -Document: Waterways toolbar click functions. 2010-10-15 19:05:17 +00:00
terkhen
6c9580d6d0 (svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available. 2010-09-28 21:58:06 +00:00
rubidium
360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
rubidium
71118b60ec (svn r20438) -Fix [FS#4022]: for docks "facing" north, i.e. having the watery part a the northern side, the joiner had an off-by-one to the north w.r.t. the station spread against the actual other (correct) building tools 2010-08-10 16:13:51 +00:00
frosch
d19a8038f4 (svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar(). 2010-07-04 09:27:15 +00:00
yexo
d96aa7abfa (svn r20070) -Feature: when none of the open windows handles a keypress, try all toolbars for global hotkeys 
Users that have run a version between r20056 and r20068 should delete their hotkeys.cfg to reset the terraform toolbar hotkeys to default
 2010-07-03 21:43:44 +00:00
yexo
4cac42fa43 (svn r20063) -Feature: customizable hotkeys for the dock toolbar 2010-07-03 18:18:58 +00:00
frosch
099f734be9 (svn r19668) -Codechange: Use WaterClass in parameters of CMD_BUILD_CANAL. 2010-04-17 23:34:00 +00:00
frosch
94a5c917a5 (svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick(). 2010-01-30 18:34:48 +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