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
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
6cb930168f
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
9 years ago
c639fb0d8e
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
9 years ago
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
9 years ago
a8080b6256
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
9 years ago
4f63bbedc1
(svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level.
10 years ago
51fe741987
(svn r26906) -Codechange: Scale depot and station picker buttons by GUI zoom level.
10 years ago
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
10 years ago
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
10 years ago
5c3b3f84d6
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
10 years ago
5370613924
(svn r26422) -Fix [FS#5946]: Some road constructions used the rail sound effect. Rename the enum items to properly reflect their purpose.
10 years ago
173aed1687
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
fef30983e6
(svn r25414) -Codechange: Move handling of global hotkeys to HotkeyList.
11 years ago
303aa2f473
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
5cb174c6b8
(svn r25412) -Codechange: Make use of Window::OnHotkey
11 years ago
1565bb32a0
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
1b8b1f3f6c
(svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member.
11 years ago
55154f91b6
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
d9e9710cb3
(svn r25408) -Codechange: Simplify hotkeys by removing unused stuff.
11 years ago
fdd94f7601
(svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file.
11 years ago
bb308c5e30
(svn r25401) -Fix-ish: Add missing includes with prototypes to functions declared in the cpp file.
11 years ago
01dc8ee620
(svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window.
11 years ago
9cb89b3639
(svn r25395) -Fix [FS#5596]: The size of station construction windows could oscillate when resizing the window moved the mouse into the window.
11 years ago
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
11 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
11 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
32ca564bca
(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class
13 years ago
bcbdc3933c
(svn r23600) -Codechange: link WC+number to a Widget, and the Widget to a Window class
13 years ago
000ff60e25
(svn r23531) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
e9f584ac21
(svn r23531) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
70faeeaba9
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
13 years ago
19eabdba2c
(svn r23106) -Codechange: pass int* to GetTileSlope and friends
13 years ago
1a54b7733c
(svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT
13 years ago
798f5a8608
(svn r23102) -Codechange: remove the remaining pointless multiplications by TILE_HEIGHT
13 years ago
bcb93b3b75
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
13 years ago
2ed0f93bfb
(svn r23093) -Codechange: add a default NULL for the Z of GetTileSlope and use it
13 years ago
de980ef0f9
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
13 years ago
7757a2ed40
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
13 years ago
ba358638a8
(svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc)
13 years ago
a7f7a97825
(svn r22646) -Codechange: Simplify MP_WATER map accessors, esp. for locks and depots. (based on patched by adf88 and michi_cc)
13 years ago
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.
13 years ago
e645a2e066
(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.
13 years ago
4b4a40a72e
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
13 years ago
ec9540a12a
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
13 years ago
7086bb3017
(svn r21959) -Change: replace longbridges with custom maximum bridge and tunnel length setting
14 years ago
46b3d114a8
(svn r21959) -Change: replace longbridges with custom maximum bridge and tunnel length setting
14 years ago
05199a641a
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
7eba2bf4d3
(svn r21890) -Cleanup: remove some unneeded includes
14 years ago
9df9575e72
(svn r21806) -Codechange: Correct additional appearances of the same typo.
14 years ago
53c9846f14
(svn r21806) -Codechange: Correct additional appearances of the same typo.
14 years ago
98e0a17c47
(svn r21805) -Codechange: Correct a typo.
14 years ago
93b26e8e3d
(svn r21805) -Codechange: Correct a typo.
14 years ago
7d989073d4
(svn r21627) -Codechange: Remove _place_proc global variable.
14 years ago
852e647bcc
(svn r21627) -Codechange: Remove _place_proc global variable.
14 years ago
38a59fb3f3
(svn r21609) -Fix (r21545,r21552,r21580,r21586): Restore diagonal clearing of areas.
14 years ago
802ec80c5d
(svn r21609) -Fix (r21545,r21552,r21580,r21586): Restore diagonal clearing of areas.
14 years ago
b78387b68d
(svn r21545) -Codechange: Replace the callback by another switch.
14 years ago
a1cfb14d92
(svn r21545) -Codechange: Replace the callback by another switch.
14 years ago
5a75937649
(svn r21544) -Codechange: Fold the small static click functions into the switch.
14 years ago
eb99392966
(svn r21544) -Codechange: Fold the small static click functions into the switch.
14 years ago
7ad959b4bc
(svn r21543) -Codechange: Remove _build_docks_button_proc array.
14 years ago
1f9fe3999d
(svn r21543) -Codechange: Remove _build_docks_button_proc array.
14 years ago
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
14 years ago
293ede7bdf
(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
14 years ago
0722492c1b
(svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint().
14 years ago
f5c6fd1a25
(svn r21331) -Codechange: Make drawing the widgets default behaviour in OnPaint().
14 years ago
f12391dcb0
(svn r20932) -Add [FS#4153]: Highlight all destination tiles when building a lock. (uni657)
14 years ago
780f120c32
(svn r20932) -Add [FS#4153]: Highlight all destination tiles when building a lock. (uni657)
14 years ago
0a8adab770
(svn r20931) -Document: Waterways toolbar click functions.
14 years ago
46ca8778b4
(svn r20931) -Document: Waterways toolbar click functions.
14 years ago
6c9580d6d0
(svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available.
14 years ago
897bb71621
(svn r20856) -Fix [FS#4141]: Road/water toolbars did not get updated when the first vehicle of their type becomes available.
14 years ago
360d6daf34
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
30f2afac9b
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
14 years ago
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
14 years ago
2a9f9b092b
(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
14 years ago
d19a8038f4
(svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar().
14 years ago
397d1186d7
(svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar().
14 years ago
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
14 years ago
26be68ae98
(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
14 years ago
4cac42fa43
(svn r20063) -Feature: customizable hotkeys for the dock toolbar
14 years ago
243075a096
(svn r20063) -Feature: customizable hotkeys for the dock toolbar
14 years ago
099f734be9
(svn r19668) -Codechange: Use WaterClass in parameters of CMD_BUILD_CANAL.
14 years ago
893e405af0
(svn r19668) -Codechange: Use WaterClass in parameters of CMD_BUILD_CANAL.
14 years ago
94a5c917a5
(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().
15 years ago
88019e64e1
(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().
15 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
26b203e3ff
(svn r18781) -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not.
...
-Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
15 years ago
2b97f38cd1
(svn r18781) -Codechange: pass the CommandCost to the callback instead of whether it succeeded or not.
...
-Fix: AIs did update their last cost incorrectly in network games if the cost of the DC_EXEC phase differed from the ~DC_EXEC phase.
15 years ago
21f2acfd01
(svn r18324) -Codechange: there's no need for a default size when the window isn't resizable
15 years ago
1f0da3710f
(svn r18324) -Codechange: there's no need for a default size when the window isn't resizable
15 years ago
45eb0be570
(svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice.
15 years ago
293dfd7c3e
(svn r18322) -Codechange: remove the WDP duplication; no need to tell the same twice.
15 years ago
877307a0eb
(svn r18321) -Fix [FS#3331]: make the toolbars also calculate their top location based on the main toolbar's height instead of hardcoding that
15 years ago
b58b058e2b
(svn r18321) -Fix [FS#3331]: make the toolbars also calculate their top location based on the main toolbar's height instead of hardcoding that
15 years ago
ab417c6c06
(svn r18280) -Codechange: remove widget indices that are not needed for custom drawing/handling input
15 years ago
8d6e323ef8
(svn r18280) -Codechange: remove widget indices that are not needed for custom drawing/handling input
15 years ago
50359b2d08
(svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions
15 years ago
14300d309c
(svn r18277) -Codechange: remove unneeded widget indices for close, resize and sticky boxes and for window captions
15 years ago
f8b79068e6
(svn r18274) -Codechange: remove the unused WDF flags
15 years ago
69b6d9309a
(svn r18274) -Codechange: remove the unused WDF flags
15 years ago
18b33fde83
(svn r18229) -Codechange: Make fill_x, fill_y a number instead of a bool.
15 years ago
2b6f792513
(svn r18229) -Codechange: Make fill_x, fill_y a number instead of a bool.
15 years ago
12294c9426
(svn r18216) -Codechange: make the scenario editor dock tool big font aware
15 years ago
88e80d4c76
(svn r18216) -Codechange: make the scenario editor dock tool big font aware
15 years ago
f106bbbe5c
(svn r18212) -Codechange: remove unneeded 'parameters' for WWT_CAPTION, WWT_CLOSEBOX and WWT_STICKYBOX in the nested widget arrays
15 years ago
d913282e7a
(svn r18212) -Codechange: remove unneeded 'parameters' for WWT_CAPTION, WWT_CLOSEBOX and WWT_STICKYBOX in the nested widget arrays
15 years ago
8e11cd3a42
(svn r18152) -Codechange: remove the 'minimum window size' from the WindowDesc; it's determined from the (nested) widgets
15 years ago
5f2ddfbc5a
(svn r18152) -Codechange: remove the 'minimum window size' from the WindowDesc; it's determined from the (nested) widgets
15 years ago
b01251092e
(svn r18086) -Codechange: remove 'widget' from WindowDesc
15 years ago
3d2d7af88f
(svn r18086) -Codechange: remove 'widget' from WindowDesc
15 years ago
a906b4bf8e
(svn r18061) -Fix: glitches with the dock GUI when the title is very long
15 years ago
d529886056
(svn r18061) -Fix: glitches with the dock GUI when the title is very long
15 years ago
982b8ee5fc
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
d6cded5380
(svn r17693) -Cleanup: remove some unneeded includes
15 years ago
d54028fde8
(svn r17572) -Codechange: Use the Window::GetWidget() function to access nested widgets through the nested_array.
15 years ago
116c77c342
(svn r17572) -Codechange: Use the Window::GetWidget() function to access nested widgets through the nested_array.
15 years ago
d4a98be94a
(svn r17271) -Fix: SetFill sometimes used 1/0 when it should be using true/false
15 years ago
aca7ba714a
(svn r17271) -Fix: SetFill sometimes used 1/0 when it should be using true/false
15 years ago
99d46e0ad7
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
7fbc33dae1
(svn r17248) -Fix: add GPL license notice where appropriate
15 years ago
d61be2637e
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
15 years ago
1fe3ad3288
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
15 years ago
5bb7b8ad35
(svn r17062) -Change: unify the naming of some 125 strings
15 years ago
4b2592dbc0
(svn r17062) -Change: unify the naming of some 125 strings
15 years ago
3321f45246
(svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code.
15 years ago
47a37b6093
(svn r16965) -Codechange: use tile area instead of sets of variables for the station joiner code.
15 years ago
2399f91f62
(svn r16906) -Fix (r12939): Child windows of build toolbars were placed inconsistently.
15 years ago
8083d67780
(svn r16906) -Fix (r12939): Child windows of build toolbars were placed inconsistently.
15 years ago
d79a1543bc
(svn r16895) -Codechange: Build dock window uses nested widget tree.
15 years ago
c63338cd81
(svn r16895) -Codechange: Build dock window uses nested widget tree.
15 years ago
a591dc6c8c
(svn r16893) -Codechange: Ship depot build window uses nested widget tree.
15 years ago
e3752f3ef8
(svn r16893) -Codechange: Ship depot build window uses nested widget tree.
15 years ago
8af9329010
(svn r16891) -Codechange: Docks toolbar uses nested widget tree.
15 years ago
2a5784c53d
(svn r16891) -Codechange: Docks toolbar uses nested widget tree.
15 years ago
bd8f92d3ff
(svn r16789) -Codechange: unify the drawing of the Accepts/Supplies cargo lists in the station build windows.
15 years ago
4843b3c45d
(svn r16789) -Codechange: unify the drawing of the Accepts/Supplies cargo lists in the station build windows.
15 years ago
0c10daa243
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
15 years ago
871107f529
(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)
15 years ago
Jonathan G Rennison
patch-import
frosch
peter1138
rubidium
planetmaker
truebrain
terkhen
alberth
yexo
smatz