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
|
4 years ago |
Charles Pigott
|
9b800a96ed
|
Codechange: Remove min/max functions in favour of STL variants (#8502)
|
4 years ago |
|
Jonathan G Rennison
|
32284e6449
|
Linkgraph: Fix demand allocation in partitioned graphs
|
5 years ago |
|
Jonathan G Rennison
|
5b83e5ff78
|
Linkgraph: Handle non-integer multiple total demand in AsymmetricScalerEq
|
5 years ago |
|
Jonathan G Rennison
|
e7a916d2ce
|
Linkgraph: Add asymmetric: equal and nearest demand distribution modes
|
5 years ago |
|
Charles Pigott
|
f5b1115039
|
Doc: Lots and lots of doxymentation fixes
|
6 years ago |
fonsinchen
|
e2426b22fa
|
(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)
|
8 years ago |
rubidium
|
fddeeb5e49
|
(svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param
|
10 years ago |
|
fonsinchen
|
957f5ca117
|
(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.
|
10 years ago |
|
fonsinchen
|
56e8ea6dde
|
(svn r26484) -Change: Remove demand calculation based on tiles.
|
11 years ago |
|
rubidium
|
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
|
11 years ago |
|
fonsinchen
|
afd1263ce1
|
(svn r26411) -Change [FS#5941]: Use better distance metric for link graph (MildaIV)
|
11 years ago |
|
fonsinchen
|
6a46b5262f
|
(svn r25355) -Add: demand handler for link graph
|
11 years ago |