You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jonathan G Rennison 32b8ec34ff Merge branch 'master' into jgrpp ... # Conflicts: # src/autoreplace_gui.cpp # src/build_vehicle_gui.cpp # src/cheat_gui.cpp # src/company_gui.cpp # src/debug.cpp # src/engine_gui.h # src/error_gui.cpp # src/group_gui.cpp # src/industry_cmd.cpp # src/industry_gui.cpp # src/misc_gui.cpp # src/network/network_gui.cpp # src/newgrf.cpp # src/newgrf_debug_gui.cpp # src/newgrf_gui.cpp # src/order_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/saveload/saveload.cpp # src/screenshot_gui.cpp # src/sound/win32_s.cpp # src/statusbar_gui.cpp # src/strgen/strgen.cpp # src/table/newgrf_debug_data.h # src/timetable_gui.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/viewport.cpp		4 days ago
..
CMakeLists.txt	…
demands.cpp	Linkgraph: Increase effect strength of distance scaling setting	2 months ago
demands.h	Link graph: Change distance scaling algorithm in demand scaler	2 months ago
flowmapper.cpp	Change link graph join and compression times to use scaled tick counter	4 months ago
flowmapper.h	Codechange: Add missing override specifiers.	8 months ago
init.h	Codechange: Add missing override specifiers.	8 months ago
linkgraph.cpp	Clamp link graph compression ticks when loading old saves	3 months ago
linkgraph.h	Change link graph join and compression times to use scaled tick counter	4 months ago
linkgraph_base.h	…
linkgraph_gui.cpp	Merge branch 'master' into jgrpp	4 days ago
linkgraph_gui.h	Merge branch 'master' into jgrpp	4 days ago
linkgraph_type.h	Merge branch 'master' into jgrpp	4 weeks ago
linkgraphjob.cpp	Change link graph join and compression times to use scaled tick counter	4 months ago
linkgraphjob.h	Change link graph join and compression times to use scaled tick counter	4 months ago
linkgraphjob_base.h	…
linkgraphschedule.cpp	Change link graph join and compression times to use scaled tick counter	4 months ago
linkgraphschedule.h	Codechange: Split dates and timers into Economy and Calendar time (#10700)	4 months ago
mcf.cpp	Merge branch 'master' into jgrpp	4 months ago
mcf.h	Merge branch 'master' into jgrpp	7 months ago
refresh.cpp	Merge branch 'master' into jgrpp	4 weeks ago
refresh.h	Merge branch 'master' into jgrpp	5 months ago