0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
b52561fd38
Codechange: use std::sort() in EngList_Sort[Partial]()
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
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
5 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
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
7c81f8e076
Codechange: Simplify refit cargo filter condition and stop mixing enum types
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
5795f66d2e
Codechange: Replaced SmallVector::Contains() with std::find() pattern
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
9cba6f7193
Codechange: Replaced SmallVector::Compact() with std::vector::shrink_to_fit()
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
e6bb90543e
Change: Show additional cost and refitted capacity in build vehicle window.
5 years ago
d54b6ac09b
Feature: When filtering purchase list by cargo type, make buy button perform a refit if required.
5 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
5 years ago
36ac643749
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
5 years ago
57734fd85d
Fix #6599 : Disable build and rename button in build vehicle window when no vehicle is selected.
5 years ago
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
5 years ago
a18b0eba5b
Add: more options for translators
5 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
a6a1e67dbc
Scale displayed running costs by day length factor
6 years ago
b3fd11efd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse4.cpp
7 years ago
319de74d99
(svn r27799) -Add: Display aircraft type in buy window (patch by Samu)
7 years ago
fa5fd39c23
(svn r27799) -Add: Display aircraft type in buy window (patch by Samu)
7 years ago
fba4268127
Build and refit vehicle test no longer needs to match exec command.
7 years ago
0779c7b7a9
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/saveload/afterload.cpp
8 years ago
98fc4493c8
TBTR: Delete duplicated build vehicle window.
...
Add a virtual train mode to the existing build vehicle window.
Simplify some of the inter-window notify logic.
Disable all buttons when a new template/edit is in progress.
8 years ago
2f077f0c42
Use a single action for build & refit, to make it MP safe.
...
Pass the cargo ID through the text field (in binary mode).
9 years ago
40b7d6d335
Import, rebase and make changes to build and refit patch.
...
http://www.tt-forums.net/viewtopic.php?f=33&t=35805
9 years ago
6872b647f1
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
0877f892c5
(svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width.
10 years ago
f7f49c15a3
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
10 years ago
ce9fab58bc
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
10 years ago
1e7992d4f9
(svn r26849) -Fix[FS#6113]: Better display of refit information in articulated vehicles.
10 years ago
bc84c52b30
(svn r26849) -Fix[FS#6113]: Better display of refit information in articulated vehicles.
10 years ago
f24aa8807d
(svn r26811) -Fix[FS#6108]: Fixed spelling error in widget name.
10 years ago
22b967676e
(svn r26811) -Fix[FS#6108]: Fixed spelling error in widget name.
10 years ago
cb3f69f746
(svn r26804) -Feature: Allow hiding of non-interesting engines in the build vehicle GUI.
10 years ago
a49744b50c
(svn r26804) -Feature: Allow hiding of non-interesting engines in the build vehicle GUI.
10 years ago
48c5bb4dc0
(svn r26803) -Doc: Document some fields in the build vehicle gui, and the rail definition struct.
10 years ago
dcc67681ad
(svn r26803) -Doc: Document some fields in the build vehicle gui, and the rail definition struct.
10 years ago
427fdb2fb3
(svn r26799) -Codechange: Export vehicle sorting data and functions.
10 years ago
0e3647d4e3
(svn r26799) -Codechange: Export vehicle sorting data and functions.
10 years ago
8292133522
(svn r26798) -Codechange: Code style fixes.
10 years ago
83f0b02ff5
(svn r26798) -Codechange: Code style fixes.
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
7b238142b8
(svn r26241) -Codechange: Remember the GRFFile which filled the TextRefStack in the TextRefStack.
11 years ago
Jonathan G Rennison
glx
Henry Wilson
glx22
Charles Pigott
peter1138
PeterN
alberth
rubidium
frosch