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 4fac6b295c Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/release-linux.yml # src/base_consist.h # src/blitter/32bpp_optimized.cpp # src/blitter/32bpp_optimized.hpp # src/blitter/32bpp_sse2.hpp # src/blitter/8bpp_optimized.hpp # src/gfx_func.h # src/industry_cmd.cpp # src/industrytype.h # src/linkgraph/linkgraphjob.cpp # src/mixer.cpp # src/newgrf_callbacks.h # src/openttd.cpp # src/os/macosx/macos.mm # src/os/windows/win32.cpp # src/pathfinder/npf/npf.cpp # src/road_cmd.cpp # src/saveload/afterload.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/sound.cpp # src/spritecache.cpp # src/spriteloader/spriteloader.hpp # src/station_map.h # src/timetable_cmd.cpp # src/timetable_cmd.h # src/timetable_gui.cpp # src/town_cmd.cpp # src/vehicle_cmd.cpp # src/vehicle_gui_base.h # src/video/opengl.cpp # src/video/opengl.h # src/viewport.cpp		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	Fix: Incorrect y-position of monospace glyphs. (#10794)	1 year ago
orig_extra	Fix: Incorrect mask files for NE river slopes (#11503)	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	6 months ago
openttd.grf.hash	Fix: Add shading to river slopes	6 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)	6 months ago
orig_extra.grf.hash	Fix: Add shading to river slopes	6 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