dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,820 Commits 1 Branch 0 Tags
2bfa53fcddc209418e8fbbd79f92f3e3d81d11b4
Commit Graph

707 Commits

Author SHA1 Message Date
Jonathan G Rennison
0a7a7ebcf0 Add build vehicle window sort mode: cargo capacity / running cost 2022-01-30 22:09:16 +00:00
Jonathan G Rennison
96d789dfbf Fix window preference save/load of build vehicle windows 2022-01-23 13:58:34 +00:00
Jonathan G Rennison
faf32200cf Merge tag '12.0-beta1' into jgrpp-beta 
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
 2021-11-02 17:51:38 +00:00
Jonathan G Rennison
f54d69a60a Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
072e3ff5fc Show refitted capacity when adding template vehicles with cargo filter 
See: #312
 2021-08-22 15:01:26 +01:00
Jonathan G Rennison
e76c5dfda7 Revert "Temporarily mark dual pane train purchase window as experimental" 
This reverts commit f9bb004b05.
 2021-08-04 17:49:23 +01:00
Jonathan G Rennison
4d99c501b3 Add defensive checks to DrawVehiclePurchaseInfo 2021-08-04 17:24:10 +01:00
Loïc Guilloux
9b0bb21f3b Fix 57734fd: Don't enable rename button for network clients in build vehicle window (#9452) 2021-07-19 22:38:36 +02:00
glx22
5844027eb8 Codechange: Remove FOR_ALL_SORTED_STANDARD_CARGOSPECS 2021-07-09 21:36:09 +02:00
Jonathan G Rennison
0d80b4450d Fix engine selection from click in new train purchase window 
See: #287, #296, #297
 2021-07-09 18:14:43 +01:00
Jonathan G Rennison
f9bb004b05 Temporarily mark dual pane train purchase window as experimental 
See: #287, #296, #297
 2021-07-09 18:12:55 +01:00
Jonathan G Rennison
44e9a746b7 Fix sorting by TE being always disabled in new train purchase window 2021-07-06 19:51:32 +01:00
Jonathan G Rennison
d027b70575 Fix 5230ff5e: wagon/logo sort and filter saved state mixup 2021-07-05 20:20:59 +01:00
Jonathan G Rennison
5230ff5e8d Fix crashes and wrong vehicle info in dual pane train purchase window 
Reduce code duplication/redundancy
 2021-07-05 17:24:21 +01:00
Jonathan G Rennison
0b4dc151d5 Rename to BuildVehicleWindowCommon to BuildVehicleWindowBase 
See: #287
 2021-06-29 00:56:11 +01:00
Jonathan G Rennison
dd5866c2c2 Fix loco and wagon button rows having different heights 2021-06-29 00:29:19 +01:00
Jonathan G Rennison
5e418128da Add setting for whether to use dual pane train purchase window 2021-06-29 00:11:07 +01:00
Jonathan G Rennison
70f7509126 Create common base class for build vehicle windows 2021-06-29 00:08:49 +01:00
Jonathan G Rennison
d1114b6b79 Fix build wagon button building locomotives instead 2021-06-28 23:43:37 +01:00
Jonathan G Rennison
ab5cee70ec Fix whitespace/code style issues 2021-06-28 23:38:12 +01:00
Jonathan G Rennison
42d1987713 Fix crash when building template vehicles 2021-06-28 23:35:00 +01:00
Jonathan G Rennison
1a7ebfd06c Fix duplication of sorter functions 2021-06-28 23:13:50 +01:00
Jonathan G Rennison
b4856d3164 Trim trailing whitespace 2021-06-28 23:02:16 +01:00
Andreas Schmitt
225e1ca634 Rearrange file to increase diff readability 2021-06-21 08:24:16 +02:00
Andreas Schmitt
081131c298 Make final adjustments and cleanup 2021-06-20 20:35:49 +02:00
Andreas Schmitt
58c00d169e Adjust OnClick 2021-06-20 20:35:49 +02:00
Andreas Schmitt
790b73ea3d Cleanup some code 2021-06-20 20:35:49 +02:00
Andreas Schmitt
92276518dd Adjust further to new API 2021-06-20 20:35:49 +02:00
Andreas Schmitt
40c9be0c02 Fix sorter functions 2021-06-20 20:35:49 +02:00
Andreas Schmitt
7ffd65c3e6 Add initial implementation 2021-06-20 20:35:49 +02:00
glx22
5799402f7a Codechange: Rename window related DeleteXXX to match new behaviour 2021-05-29 21:08:25 +02:00
rubidium42
2e136285e1 Codechange: move from C-string to std::string for DoCommand 2021-05-29 19:02:18 +02:00
Jonathan G Rennison
8eb27e1ac7 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h
 2021-04-25 22:14:59 +01:00
PeterN
224625942c Fix: Count engine details text in lines rather than pixels. (#9107) 
This allows the details panel to scale correctly for different zoom levels.
 2021-04-25 19:34:16 +01:00
Jonathan G Rennison
5e14b54a0c Merge branch 'master' into jgrpp 2021-04-05 17:51:45 +01:00
stormcone
9c5a7d3a57 Fix #8733: Can't buy train engine when the "Engines only" filter is active 2021-03-11 21:35:10 +00:00
Didac Perez Parera
6e2a96c133 Add: filter for "engines only" in build train window (#8733) 2021-03-08 12:03:11 +01:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
Jonathan G Rennison
bbbda0739b Add third DoCommand parameter p3 2020-10-17 17:25:44 +01:00
Jonathan G Rennison
781fd14205 Add sort by vehicle count to vehicle purchase window 2020-10-12 18:25:34 +01:00
Jonathan G Rennison
8cec0181b2 TBTR: Fix appending to template not refreshing window in MP 2020-10-09 18:45:53 +01:00
Jonathan G Rennison
11a9a4dc0c Fix no error message when attaching new template/virtual vehicle fails 
See: #187
 2020-09-08 23:56:38 +01:00
Jonathan G Rennison
d830a34394 Fix: Violation of strict weak ordering in engine name sorter 
This could be caused by an engine being renamed, and the old
name being cached from a previous sort.

See: #7838
 2020-06-18 12:38:43 +02:00
Jonathan G Rennison
4338541be8 Fix potential use of old names in group and engine name sorters 
This could result in violation of strict weak ordering
 2020-03-29 17:46:30 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
 2020-01-06 18:45:51 +00:00
stormcone
b524f1ae21 Feature: Show the name of the NewGRF in the build vehicle window. 2020-01-04 18:42:35 +01:00
glx
1f6b3a37f9 Codechange: Replace FOR_ALL_ENGINES with range-based for loops 2019-12-21 20:13:03 +01:00
Jonathan G Rennison
fd25596311 Merge upstream PR #7852 into jgrpp 
Feature: Show the name of the NewGRF in the build vehicle window

Author: stormcone

# Conflicts:
#	src/lang/english.txt
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/settings.ini
 2019-12-13 17:28:48 +00:00
stormcone
4def6cf70f Feature: Show the name of the NewGRF in the build vehicle window. 2019-12-02 21:28:29 +01:00