Jonathan G Rennison
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Jonathan G Rennison
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
6 years ago
Henry Wilson
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
Michael Lutz
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.
6 years ago
Jonathan G Rennison
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
6 years ago
glx22
66dd7c3879
Fix: MSVC warnings ( #7423 )
6 years ago
Jonathan G Rennison
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
6 years ago
Henry Wilson
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
Henry Wilson
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
Henry Wilson
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 years ago
Henry Wilson
9cba6f7193
Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit()
6 years ago
Henry Wilson
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
6 years ago
peter1138
317f69c152
Codechange: Use override specifier in Window-derived classes.
6 years ago
peter1138
b3ef06fdf3
Fix #7384 : Industry Chain tooltips did not display on right-click.
...
This is fixed by handling the new Window::OnTooltip() event instead of OnHover()
6 years ago
Jonathan G Rennison
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
6 years ago
Niels Martin Hansen
08ffa16d51
Fix 8859381: Display of requires/produces in Build Industry window
...
Change the window to use a dynamically generated string of cargoes,
instead of one of a few fixed-length lists. With up to 16 cargoes
on each list, having 16 with the only difference how many are listed
seems like a bad maintenance idea.
6 years ago
Jonathan G Rennison
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
Peter Nelson
15320a37b9
Change: OnGameTick() is only called when not paused.
6 years ago
Peter Nelson
2a8fa5fef9
Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks.
6 years ago
Jonathan G Rennison
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
Niels Martin Hansen
9b560eaa51
Fix: Industry chain window layout no more unnecessarily large when the number of cargoes in/out isn't large either
6 years ago
Niels Martin Hansen
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
Niels Martin Hansen
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
Charles Pigott
e0c0394e37
Fix: Remove various dead or unnecessary assignments
6 years ago
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
Jonathan G Rennison
4a0d949d83
Merge branch 'master' into jgrpp
7 years ago
frosch
0d1cc32b19
(svn r27952) -Change: Reword texts in industry view, when stockpiling is used.
7 years ago
frosch
150ef3999c
(svn r27952) -Change: Reword texts in industry view, when stockpiling is used.
7 years ago
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
Jonathan G Rennison
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
8 years ago
alberth
dcc240f826
(svn r27751) -Feature: Display cargo suffix of accepted cargoes in industry view based on cb37 result type.
...
Industry-sets that have no stockpiling get better control over the displayed accepted cargo information.
- result 0401 only prints the accepted cargo
- results 0800-0BFF prints the accepted cargo and a string (but not the amount)
8 years ago
alberth
34ca88c098
(svn r27751) -Feature: Display cargo suffix of accepted cargoes in industry view based on cb37 result type.
...
Industry-sets that have no stockpiling get better control over the displayed accepted cargo information.
- result 0401 only prints the accepted cargo
- results 0800-0BFF prints the accepted cargo and a string (but not the amount)
8 years ago
alberth
325a46e8ed
(svn r27750) -Codechange: Add cb37 result type to the cargo suffix.
8 years ago
alberth
5bcca41ace
(svn r27750) -Codechange: Add cb37 result type to the cargo suffix.
8 years ago
alberth
e8635aca1a
(svn r27749) -Codechange: Fold cb37 cargo suffix text in a structure.
8 years ago
alberth
c9a8360419
(svn r27749) -Codechange: Fold cb37 cargo suffix text in a structure.
8 years ago
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
9 years ago
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
9 years ago
frosch
5e47c27550
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
10 years ago
frosch
4a6036208a
(svn r27277) -Codechange: Make _displayed_industries a std::bitset.
10 years ago
peter1138
6872b647f1
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
peter1138
0877f892c5
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
alberth
633ac888f6
(svn r26723) -Fix[FS#5997]: Properly check for cargo acceptance of houses.
10 years ago
alberth
be4bbf7dd9
(svn r26723) -Fix[FS#5997]: Properly check for cargo acceptance of houses.
10 years ago
planetmaker
796fcaa9e1
(svn r26656) -Fix [FS#6044]: Production cheat cannot not be allowed to be active in multiplayer for desync reasons, even when activated in singleplayer previously
10 years ago
planetmaker
73bfec0fc8
(svn r26656) -Fix [FS#6044]: Production cheat cannot not be allowed to be active in multiplayer for desync reasons, even when activated in singleplayer previously
10 years ago
frosch
7b3ead329b
(svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours.
10 years ago
frosch
1b0929a9f0
(svn r26640) -Cleanup: Remove some pointless STR_JUST_STRING detours.
10 years ago
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
11 years ago
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
11 years ago
frosch
7b238142b8
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
11 years ago
frosch
ba1779b978
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
11 years ago
rubidium
201b3d8aa2
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
rubidium
83eeba28b7
(svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns
11 years ago
rubidium
3784110fe6
(svn r26080) -Fix: possible out of bounds array access
11 years ago
rubidium
a8e8f606d8
(svn r26080) -Fix: possible out of bounds array access
11 years ago
frosch
670c4879cf
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
frosch
6a0439a789
(svn r25838) -Codechange: Rename HOUSE_MAX to NUM_HOUSES.
11 years ago
frosch
0c42bd6a7b
(svn r25732) -Fix: In BuildIndustryWindow in RTL mode, draw industry color icon at the right. (sbr)
11 years ago
frosch
87ef3ab449
(svn r25732) -Fix: In BuildIndustryWindow in RTL mode, draw industry color icon at the right. (sbr)
11 years ago
fonsinchen
4396dcf642
(svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0
11 years ago
fonsinchen
0baa72aff9
(svn r25714) -Fix: explicitly cast some things to silence warnings on GCC 4.0
11 years ago
frosch
538159cb1d
(svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size.
11 years ago
frosch
43ec0bf0c1
(svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size.
11 years ago
frosch
f6d27acb51
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 years ago
frosch
98fdd20f84
(svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets.
11 years ago
frosch
13badddd75
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
12 years ago
frosch
4e4e635916
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
12 years ago
frosch
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
12 years ago
frosch
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
12 years ago
frosch
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
12 years ago
frosch
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
12 years ago
alberth
41ddef3018
(svn r25238) -Feature: Display imminent closure of an industry in its view window.
12 years ago
alberth
1b5b4db690
(svn r25238) -Feature: Display imminent closure of an industry in its view window.
12 years ago
planetmaker
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
planetmaker
c24374f99c
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
frosch
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
frosch
3ce8d2ce70
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
alberth
19adc87262
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
alberth
732e073261
(svn r24776) -Doc: Typo fixes, additions, and additional dots collected from various sources (including Eagle_rainbow, MinchinWeb)
12 years ago
alberth
443d666bba
(svn r24764) -Change: Disable horizontal resizing of the industry chain window, it's not useful.
12 years ago
alberth
a2b07adf43
(svn r24764) -Change: Disable horizontal resizing of the industry chain window, it's not useful.
12 years ago
alberth
9f8184e71e
(svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window.
12 years ago
alberth
fb892f4b20
(svn r24763) -Feature: Add industry type and cargo dropdown selection for easier navigating in the industry chain window.
12 years ago
frosch
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
frosch
03736af2ae
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
alberth
67f599f9db
(svn r24395) -Doc: Fixed argument references in @param descriptions.
12 years ago
alberth
2ab7c82b31
(svn r24395) -Doc: Fixed argument references in @param descriptions.
12 years ago
frosch
23ad97e755
(svn r24310) -Codechange: Add named constants for the dimensions of settings buttons, and generally make their usage more consistent.
13 years ago
frosch
056f779334
(svn r24310) -Codechange: Add named constants for the dimensions of settings buttons, and generally make their usage more consistent.
13 years ago
frosch
70d3206320
(svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h
13 years ago
frosch
198de5397e
(svn r24309) -Codechange: Split some functions from gui.h to settings_gui.h
13 years ago
rubidium
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
rubidium
6d6be50ae0
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
smatz
cf54bc425f
(svn r23706) -Codechange: prevent 'unknown command' doxygen errors
13 years ago
smatz
bcd3f2bb59
(svn r23706) -Codechange: prevent 'unknown command' doxygen errors
13 years ago
truebrain
733516639d
(svn r23534) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
truebrain
cb8e37197d
(svn r23534) -Codechange: document and rename widgets to be consistent and understandable
13 years ago