Jonathan G Rennison
|
d09b504bc5
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-source.yml
# .github/workflows/release.yml
# CMakeLists.txt
# COMPILING.md
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/bridge_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/CMakeLists.txt
# src/core/smallmap_type.hpp
# src/disaster_vehicle.h
# src/effectvehicle_base.h
# src/fontcache.cpp
# src/game/game_core.cpp
# src/game/game_gui.cpp
# src/gamelog.cpp
# src/gamelog_internal.h
# src/group_gui.cpp
# src/linkgraph/linkgraph.h
# src/misc.cpp
# src/network/core/config.h
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/newgrf.cpp
# src/newgrf_gui.cpp
# src/newgrf_profiling.cpp
# src/newgrf_profiling.h
# src/object_gui.cpp
# src/openttd.cpp
# src/openttd.h
# src/order_gui.cpp
# src/os/windows/font_win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/script/api/script_controller.cpp
# src/script/api/script_roadtypelist.cpp
# src/script/script_config.cpp
# src/script/script_config.hpp
# src/script/script_instance.cpp
# src/script/script_scanner.cpp
# src/script/squirrel.cpp
# src/script/squirrel_helper.hpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/table/settings/network_private_settings.ini
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/window_gui.h
|
2023-07-01 02:42:51 +01:00 |
|
Patric Stout
|
199e41c762
|
Codechange: use default dtor instead of empty (#10826)
|
2023-05-14 23:31:03 +02:00 |
|
Jonathan G Rennison
|
32284e6449
|
Linkgraph: Fix demand allocation in partitioned graphs
|
2020-01-25 12:34:20 +00:00 |
|
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
|
2019-10-05 21:45:54 +01:00 |
|
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
2019-09-29 21:27:32 +01:00 |
|
Jonathan G Rennison
|
e7a916d2ce
|
Linkgraph: Add asymmetric: equal and nearest demand distribution modes
|
2019-05-01 20:57:59 +01:00 |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
2018-10-31 12:35:54 +01:00 |
|
fonsinchen
|
6a46b5262f
|
(svn r25355) -Add: demand handler for link graph
|
2013-06-09 12:59:51 +00:00 |
|