Jonathan G Rennison
|
3d4261a33a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/order_cmd.cpp
# src/table/settings/news_display_settings.ini
|
3 years ago |
J0anJosep
|
d0655a48ba
|
Fix: Do not redraw vehicle lists when skip order command is tested.
|
3 years ago |
Patric Stout
|
78eece71d9
|
Codechange: "set but not used" warning when disabling assert() (#9613)
DebugCheckSanity() is unused when asserts are disabled. While at it,
use WITH_ASSERT over NDEBUG, as that means we also run this code
during beta/RC.
|
3 years ago |
|
Jonathan G Rennison
|
fd605e3cf3
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
|
3 years ago |
|
Jonathan G Rennison
|
0b0d154788
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
|
3 years ago |
rubidium42
|
55a11710a6
|
Codechange: convert printf DEBUG statements to fmt Debug statements
|
3 years ago |
|
Jonathan G Rennison
|
97d5982cb5
|
Fix various compiler warnings
See: #267
|
3 years ago |
|
rubidium42
|
2e136285e1
|
Codechange: move from C-string to std::string for DoCommand
|
3 years ago |
|
rubidium42
|
44ca7d9377
|
Change: Use gender-neutral pronouns
|
3 years ago |
William Davis
|
879de9781b
|
Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)
(cherry picked from commit 881e1da51d)
|
3 years ago |
|
William Davis
|
881e1da51d
|
Change: Use gender-neutral pronouns in console command messages (and comments) (#9203)
|
3 years ago |
|
Jonathan G Rennison
|
912c62d749
|
Add timetable lateness/earliness conditional order
|
3 years ago |
|
Jonathan G Rennison
|
f7dcd66f08
|
Fix unnecessary braking when leaving station with order without non-stop flag
|
3 years ago |
|
Jonathan G Rennison
|
8a814bbfe3
|
Add release slot train order
|
3 years ago |
|
Jonathan G Rennison
|
d42ad99688
|
Add conditional order for current time/date
|
3 years ago |
|
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
|
3 years ago |
|
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
3 years ago |
|
Jonathan G Rennison
|
ed0ffb6220
|
Add feature: realistic train braking
Add setting to select train braking model.
|
3 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
|
Charles Pigott
|
860c270c73
|
Codechange: Replace assert_compile macro with static_assert
|
4 years ago |
glx22
|
d8605ad18d
|
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
|
4 years ago |
|
Jonathan G Rennison
|
6472f0e203
|
Fix stack overflows due to excessive recursion updating order destination
See: #198
|
4 years ago |
|
Jonathan G Rennison
|
b20df78b49
|
Add feature to append the reverse of an order list
|
4 years ago |
|
Jonathan G Rennison
|
9984f39c96
|
Add feature to reverse the order of an order list
See: #120
|
4 years ago |
|
Jonathan G Rennison
|
83a128e8a9
|
Fix stack overflow due to excessive recursion in LinkRefresher
Clamp recursion limit to maximum of 64
See: #198
|
4 years ago |
|
Jonathan G Rennison
|
e1aca1ab34
|
Extend Order::flags to 16 bits, fixes conditional order target field size
Adjust order packing and CmdInsertOrder
See: #198
|
4 years ago |
|
Jonathan G Rennison
|
b9f7db9c7e
|
Jump counter is no longer a separate field
|
4 years ago |
|
Jonathan G Rennison
|
6e17f9bf5d
|
Use p3 for order indices which don't fit into p1
Fix insert/modify order overflowing p1
Don't use text field for change timetable
|
4 years ago |
|
Jonathan G Rennison
|
6dd7b2869c
|
Increase per-vehicle order limit to 64k
See: #110
|
4 years ago |
|
Jonathan G Rennison
|
bd2649c19e
|
Avoid unnecessary redrawing of vehicle list windows
Redraw info section every tick if values have changed
|
4 years ago |
|
Jonathan G Rennison
|
9ee8091ecc
|
Add conditional order which tests counter value
|
4 years ago |
|
Jonathan G Rennison
|
1e0005d7a0
|
Fix order lookahead changing percent of times conditional order state
|
4 years ago |
|
Jonathan G Rennison
|
37683d8f50
|
Cargo type orders window: Use single command to change all cargoes at once
|
4 years ago |
|
Jonathan G Rennison
|
cd093931db
|
Departure board: Always invalidate boards in DeleteVehicleOrders
|
4 years ago |
|
Jonathan G Rennison
|
22b13ffc26
|
Mark order/timetable windows dirty when changing game date
|
4 years ago |
|
Jonathan G Rennison
|
ca79a32890
|
Scheduled dispatch: Fixup start dates when changing game date
|
4 years ago |
|
Jonathan G Rennison
|
0202211514
|
Conditional orders: Add slot acquire modes to train in slot conditional
|
4 years ago |
|
Jonathan G Rennison
|
0100ea4e32
|
Conditional orders: Add mode to check waiting station cargo via next node
|
4 years ago |
|
Jonathan G Rennison
|
ea8a89e377
|
Reset conditional order comp operator when switching to load % or waiting cargo amount.
|
4 years ago |
|
Jonathan G Rennison
|
cb6a01cab3
|
Fix cases where departures board data was not invalidated
|
4 years ago |
|
Jonathan G Rennison
|
09b13dd484
|
Add conditional orders for cargo load percentage and waiting cargo amount
See: #90
|
5 years ago |
|
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
|
5 years ago |
|
Charles Pigott
|
d1cead7f25
|
Fix: When loading old timetabled saves, also reset cached timetable duration
|
5 years ago |
|
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
5 years ago |
|
Jonathan G Rennison
|
ec0b5e0ed0
|
Improve performance of departures window
See: #119
|
5 years ago |
|
Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
5 years ago |
S. D. Cloudt
|
13cc8a0cee
|
Cleanup: Removed SVN headers
|
5 years ago |
|
Jonathan G Rennison
|
0472327ef1
|
Scheduled dispatch: Simplify schedule copying
|
5 years ago |
|
Jonathan G Rennison
|
edfd378e93
|
Merge branch 'master' into jgrpp
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |