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 d5a7a67b8c Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # src/ai/ai_gui.cpp # src/blitter/32bpp_optimized.cpp # src/blitter/32bpp_simple.cpp # src/blitter/32bpp_sse2.cpp # src/blitter/8bpp_optimized.cpp # src/blitter/8bpp_simple.cpp # src/blitter/null.cpp # src/blitter/null.hpp # src/company_gui.cpp # src/game/game_gui.cpp # src/genworld_gui.cpp # src/gfx.cpp # src/gfx_func.h # src/graph_gui.cpp # src/industry_gui.cpp # src/linkgraph/linkgraphjob.cpp # src/network/network_gui.cpp # src/newgrf_debug_gui.cpp # src/openttd.cpp # src/pathfinder/npf/aystar.h # src/road_gui.cpp # src/saveload/order_sl.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/script/api/script_log.cpp # src/script/api/script_town.cpp # src/script/script_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_table.cpp # src/settings_type.h # src/smallmap_gui.cpp # src/sortlist_type.h # src/spritecache.cpp # src/spriteloader/grf.cpp # src/spriteloader/grf.hpp # src/spriteloader/spriteloader.hpp # src/station_cmd.cpp # src/station_cmd.h # src/station_gui.cpp # src/strings.cpp # src/toolbar_gui.cpp # src/town_cmd.cpp # src/town_gui.cpp # src/vehicle_gui.cpp # src/vehicle_gui_base.h # src/video/opengl.cpp # src/video/opengl.h # src/widgets/dropdown.cpp # src/widgets/dropdown_type.h # src/window_gui.h		6 months ago
..
extra_signals	Fix direction of semaphore no-entry signal sprites for W-E track	1 year ago
misc_gui	Add a baseset GRF for misc GUI sprites	2 years ago
openttd	Change: [CMake] Use explicit list for grf source files (#11539)	6 months ago
orig_extra	Change: [CMake] Use explicit list for grf source files (#11539)	6 months ago
road_waypoints	Add replacement sprites for road waypoint buildings	2 years ago
CMakeLists.txt	Merge branch 'master' into jgrpp	6 months ago
extra_signals.grf	Fix direction of semaphore no-entry signal sprites for W-E track	1 year ago
innerhighlight.grf	Add 3 more zoning highlight colours	4 years ago
misc_gui.grf	Add a baseset GRF for misc GUI sprites	2 years ago
no_music.obm	Codechange: rework how grf and ob[msg] are generated	4 years ago
no_sound.obs	Codechange: rework how grf and ob[msg] are generated	4 years ago
openttd.grf	Fix: Add shading to river slopes	7 months ago
openttd.grf.hash	Fix: Add shading to river slopes	7 months ago
opntitle.dat	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_dos.obg	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_dos.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	4 years ago
orig_dos.obs	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_dos_de.obg	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_extra.grf	Fix: Incorrect mask files for NE river slopes (#11503)	7 months ago
orig_extra.grf.hash	Fix: Add shading to river slopes	7 months ago
orig_tto.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	4 years ago
orig_win.obg	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_win.obm	Codechange: rework how grf and ob[msg] are generated	4 years ago
orig_win.obs	Codechange: rework how grf and ob[msg] are generated	4 years ago
progsignals.grf	CMake: Move built in GRfs to baseset dir	4 years ago
road_waypoints.grf	Add replacement sprites for road waypoint buildings	2 years ago
route_step.grf	CMake: Move built in GRfs to baseset dir	4 years ago
tracerestrict.grf	Improve colouring of restricted signal posts with original TTD graphics	11 months ago