36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
81f0f97406
Feature: Add existing station coverage area display when placing new station parts.
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
c7b9987d08
Codechange: Switch DropDownList to directly use std::vector, thus making AutoDeleteSmallVector obsolete.
...
DropDownListItem are strongly managed using std::unique_ptr to ensure leak-free handling. Appropriate use
of move-semantics make intent a lot clearer than parameter comments and allows the compiler to generate
copy-free code for most situations.
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
6 years ago
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
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
c639fb0d8e
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
9 years ago
6cb930168f
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
9 years ago
dcced1007b
(svn r26996) -Codechange: Don't clamp airport construction window size -- this causes very poor performance if the game window is not large enough.
10 years ago
cb62e83e0e
(svn r26996) -Codechange: Don't clamp airport construction window size -- this causes very poor performance if the game window is not large enough.
10 years ago
554eec1129
(svn r26732) -Fix [FS#6083]: do not reset the last selected airport or layout (unless it is really necessary)
10 years ago
03551d2b35
(svn r26732) -Fix [FS#6083]: do not reset the last selected airport or layout (unless it is really necessary)
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
2852dbae2c
(svn r26165) -Change [FS#5832]: Improve layout of build-airport GUI (hackalittlebit)
11 years ago
4818b72c75
(svn r26165) -Change [FS#5832]: Improve layout of build-airport GUI (hackalittlebit)
11 years ago
201b3d8aa2
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
83eeba28b7
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
0284db1a31
(svn r25731) -Fix [FS#5692]: Minor RTL alignment issues. (sbr)
11 years ago
f89375aa44
(svn r25731) -Fix [FS#5692]: Minor RTL alignment issues. (sbr)
11 years ago
ac73a5fea6
(svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window.
11 years ago
5f8f71edf0
(svn r25532) -Fix: Do not make the minimal size of matrix or panel widgets depend on their number of rows, since that changes when resizing the window.
11 years ago
f6d27acb51
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 years ago
98fdd20f84
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 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
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
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
03736af2ae
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
97608f0814
(svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount()
12 years ago
c841a78f69
(svn r24167) -Codechange: Rename NewGRFClass::GetCount() to NewGRFClass::GetClassCount()
12 years ago
3d7ac6af1a
(svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount().
12 years ago
0f0e7e43cf
(svn r24166) -Codechange: Turn NewGRFClass::Get(Tid, uint) and GetCount(Tid) into non-static members GetSpec(uint) and GetSpecCount().
12 years ago
d42bd940b2
(svn r24162) -Codechange: Remove NewGRFClass::GetName() and SetName() in favour of using Get() and direct member access (which is needed anyway for GRF string resolving).
12 years ago
6f4d2160c2
(svn r24162) -Codechange: Remove NewGRFClass::GetName() and SetName() in favour of using Get() and direct member access (which is needed anyway for GRF string resolving).
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
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
ee0fd02d17
(svn r23179) -Codechange: use some tooltips that already existed (monoid)
13 years ago
82077965fc
(svn r23179) -Codechange: use some tooltips that already existed (monoid)
13 years ago
9ed9ced7ec
(svn r22716) -Fix: Murphy is a bitch
13 years ago
ad254f2b7c
(svn r22716) -Fix: Murphy is a bitch
13 years ago
8e134320d6
(svn r22715) -Fix: If there's also no point in opening the air toolbar via custom-defined global hotkeys, if there are no aircraft available
13 years ago
d20b5eb915
(svn r22715) -Fix: If there's also no point in opening the air toolbar via custom-defined global hotkeys, if there are no aircraft available
13 years ago
92a83a394f
(svn r22538) -Fix [FS#4619]: possible crash when opening the airport build window for the first time
13 years ago
015231a478
(svn r22538) -Fix [FS#4619]: possible crash when opening the airport build window for the first time
13 years ago
0b8adb8392
(svn r22497) -Codechange: Simplify button handling in airport build GUI
13 years ago
8828acd722
(svn r22497) -Codechange: Simplify button handling in airport build GUI
13 years ago
485b55e53e
(svn r22495) -Fix: The layout selectors of the airport build GUI did not latch properly
13 years ago
9a744793b0
(svn r22495) -Fix: The layout selectors of the airport build GUI did not latch properly
13 years ago
44b36cdfcf
(svn r22494) -Fix: airport preview sprite can depend on the layout, so update the cached SpriteID when the layout changes
13 years ago
4ac6f2a994
(svn r22494) -Fix: airport preview sprite can depend on the layout, so update the cached SpriteID when the layout changes
13 years ago
7b251297c9
(svn r22429) -Add: some constants for specific palette colours used in the GUI.
13 years ago
5e449b8fae
(svn r22429) -Add: some constants for specific palette colours used in the GUI.
13 years ago
7cc3d3e143
(svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices.
13 years ago
22286bd7b6
(svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices.
13 years ago
54c0dec6aa
(svn r21909) -Fix: some missing spaces
14 years ago
8017c2a3d7
(svn r21909) -Fix: some missing spaces
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
9e48ad8cdb
(svn r21580) -Codechange: Replace callback via pointer by a switch statement.
14 years ago
264acca2fa
(svn r21580) -Codechange: Replace callback via pointer by a switch statement.
14 years ago
bfb8854df1
(svn r21579) -Codechange: Remove _build_air_button_proc and its functions to a switch statement, record the last started action.
14 years ago
5a2bf89caf
(svn r21579) -Codechange: Remove _build_air_button_proc and its functions to a switch statement, record the last started action.
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
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
ba8d961664
(svn r20470) -Codechange: Make arrow buttons lower and raise like other buttons when clicked.
14 years ago
d496ec65b9
(svn r20470) -Codechange: Make arrow buttons lower and raise like other buttons when clicked.
14 years ago
Jonathan G Rennison
peter1138
Henry Wilson
Michael Lutz
patch-import
frosch
rubidium
truebrain
planetmaker
yexo
alberth