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 fe730bce31 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/codeql.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # src/map.cpp # src/music/midifile.hpp # src/order_cmd.cpp # src/order_gui.cpp # src/pathfinder/yapf/yapf_rail.cpp # src/pbs.cpp # src/saveload/afterload.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/script/api/script_text.cpp # src/ship_cmd.cpp # src/train_cmd.cpp # src/vehicle.cpp # src/vehicle_base.h # src/vehicle_func.h # src/vehicle_gui.cpp # src/vehicle_gui_base.h # src/viewport.cpp # src/waypoint_cmd.cpp		2 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)	5 months ago
orig_extra	Feature: Toyland-specific river graphics (#11523)	4 months ago
road_waypoints	Add replacement sprites for road waypoint buildings	2 years ago
CMakeLists.txt	Merge branch 'master' into jgrpp	4 months ago
OpenTTD-Mono.ttf	Change: Update OpenTTD TTF fonts to v0.6	2 months ago
OpenTTD-Sans.ttf	Change: Update OpenTTD TTF fonts to v0.6	2 months ago
OpenTTD-Serif.ttf	Change: Update OpenTTD TTF fonts to v0.6	2 months ago
OpenTTD-Small.ttf	Change: Update OpenTTD TTF fonts to v0.6	2 months ago
OpenTTD-font.md	Change: Update OpenTTD TTF fonts to v0.6	2 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	5 months ago
openttd.grf.hash	Fix: Add shading to river slopes	5 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)	3 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	Feature: Toyland-specific river graphics (#11523)	4 months ago
orig_extra.grf.hash	Feature: Toyland-specific river graphics (#11523)	4 months ago
orig_tto.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	3 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	10 months ago