Jonathan G Rennison
|
5b7db9d849
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/commit-checker.yml
# src/command.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/crashlog.cpp
# src/economy.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/misc_gui.cpp
# src/newgrf_config.cpp
# src/openttd.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/table/settings/gui_settings.ini
|
2 years ago |
Tyler Trahan
|
ebc76a4200
|
Change: Use an indent, not a dash, to list train capacity
|
2 years ago |
Michael Lutz
|
41fa16f325
|
Codechange: Don't use globals for return values from vehicle command procs.
|
2 years ago |
|
Michael Lutz
|
8503854655
|
Codechange: Pass unpacked command arguments to command callbacks (except Script).
|
2 years ago |
|
Michael Lutz
|
21675ec7e2
|
Codechange: Un-bitstuff vehicle/engine commands.
|
2 years ago |
|
Michael Lutz
|
eab18f06a4
|
Codechange: Pass additional data as byte stream to command callbacks.
|
2 years ago |
|
Michael Lutz
|
0f64ee5ce1
|
Codechange: Template DoCommandP to automagically reflect the parameters of the command proc.
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
|
2 years ago |
|
Michael Lutz
|
4fc055d6e9
|
Codechange: Align parameter order of command callbacks to command handlers.
|
2 years ago |
|
Michael Lutz
|
a38bbefe1b
|
Codechange: Untangle command code, flags and error string for DoCommand*.
|
2 years ago |
|
Michael Lutz
|
549caca39c
|
Codechange: Move command arguments to the back of the networked command function calls.
|
2 years ago |
|
Jonathan G Rennison
|
502af119e5
|
Rename and move train max speed estimation functions
|
3 years ago |
Andreas Schmitt
|
77e4e13644
|
Only show information for realistic acceleration model
|
3 years ago |
|
Andreas Schmitt
|
9bd79d03d1
|
Fix speed calculation
|
3 years ago |
|
Andreas Schmitt
|
9a72d741ad
|
Fix weight calculation
|
3 years ago |
|
Andreas Schmitt
|
49226eac5d
|
Fix some compiler warnings regarding types
|
3 years ago |
|
Andreas Schmitt
|
d954c461b0
|
Add information about vehicle loads and speeds
|
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 |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
3 years ago |
|
Jonathan G Rennison
|
bbbda0739b
|
Add third DoCommand parameter p3
|
4 years ago |
|
Jonathan G Rennison
|
cb6a01cab3
|
Fix cases where departures board data was not invalidated
|
4 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
|
4 years ago |
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
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
|
1f535915d1
|
Merge branch 'master' into jgrpp-nrt
# Conflicts:
# config.lib
# src/core/bitmath_func.hpp
# src/lang/korean.txt
# src/main_gui.cpp
# src/order_gui.cpp
# src/script/api/script_object.cpp
# src/station_cmd.cpp
# src/video/cocoa/wnd_quartz.mm
|
5 years ago |
glx22
|
b3fd787959
|
Fix #7188: check the validity of command callback for scripts (#7701)
|
5 years ago |
|
Jonathan G Rennison
|
96f000226e
|
Exclude virtual trains from various vehicle list iterations
|
5 years ago |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
5 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
5 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
|
5 years ago |
|
Henry Wilson
|
c01a2e2a81
|
Codechange: Removed SmallVector completely
|
5 years ago |
|
Henry Wilson
|
ab711e6942
|
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
|
5 years ago |
|
Henry Wilson
|
a0f36a50e6
|
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
|
5 years ago |
|
Henry Wilson
|
81315939b9
|
Codechange: Replaced SmallVector::Find() non-const with std::find()
|
5 years ago |
|
Henry Wilson
|
a690936ed7
|
Codechange: Replace SmallVector::Length() with std::vector::size()
|
5 years ago |
|
Henry Wilson
|
bfd79e59dc
|
Codechange: Replace SmallVector::Clear() with std::vector::clear()
|
5 years ago |
|
Jonathan G Rennison
|
f59535c0b7
|
Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
# src/train_cmd.cpp
|
6 years ago |
|
Jonathan G Rennison
|
60cc1a48ac
|
Refresh trace restrict slots window as with the train list window
|
6 years ago |
|
Jonathan G Rennison
|
4a0d949d83
|
Merge branch 'master' into jgrpp
|
6 years ago |
frosch
|
6f36c52736
|
(svn r27936) -Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain.
|
7 years ago |
|
frosch
|
432edcd4a5
|
(svn r27936) -Fix: When moving wagons in the depot, the drag highlight did not exactly match the length of the dragged wagon chain.
|
7 years ago |
|
Jonathan G Rennison
|
cea0d42548
|
Merge branch 'master' into jgrpp
|
8 years ago |
|
frosch
|
1db921bedb
|
(svn r27689) -Fix: MSVC warnings.
|
8 years ago |
|
frosch
|
149adc9cc1
|
(svn r27689) -Fix: MSVC warnings.
|
8 years ago |
|
Jonathan G Rennison
|
7f10d83a4a
|
Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
# src/linkgraph/linkgraphjob.cpp
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
|
8 years ago |
|
frosch
|
a37bb32fd6
|
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
|
8 years ago |
|
frosch
|
c175067ed9
|
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
|
8 years ago |
|
frosch
|
f36539837e
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
8 years ago |
|
frosch
|
d2393b4f6c
|
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
|
8 years ago |
|
Jonathan G Rennison
|
761463d134
|
Merge branch 'template_train_replacement-sx' into jgrpp
# Conflicts:
# src/window.cpp
|
8 years ago |