Jonathan G Rennison b72366419b Merge branch 'master' into jgrpp ... # Conflicts: # src/blitter/32bpp_anim.cpp # src/blitter/8bpp_optimized.cpp # src/gfx.cpp # src/gfx_func.h # src/gfxinit.cpp # src/network/core/os_abstraction.cpp # src/spritecache.cpp		2023-12-28 16:56:54 +00:00
..
extra_signals	Fix direction of semaphore no-entry signal sprites for W-E track	2022-12-30 00:14:40 +00:00
misc_gui	Add a baseset GRF for misc GUI sprites	2022-01-21 23:34:39 +00:00
openttd	Change: [CMake] Use explicit list for grf source files (#11539)	2023-12-04 16:41:02 +00:00
orig_extra	Feature: Toyland-specific river graphics (#11523)	2023-12-27 17:44:21 -05:00
road_waypoints	Add replacement sprites for road waypoint buildings	2022-01-26 21:46:36 +00:00
CMakeLists.txt	Merge branch 'master' into jgrpp	2023-12-17 23:00:46 +00:00
extra_signals.grf	Fix direction of semaphore no-entry signal sprites for W-E track	2022-12-30 00:14:40 +00:00
innerhighlight.grf
misc_gui.grf	Add a baseset GRF for misc GUI sprites	2022-01-21 23:34:39 +00:00
no_music.obm
no_sound.obs
openttd.grf	Fix: Add shading to river slopes	2023-11-26 23:54:10 +01:00
openttd.grf.hash	Fix: Add shading to river slopes	2023-11-26 23:54:10 +01:00
opntitle.dat
orig_dos_de.obg
orig_dos.obg
orig_dos.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	2020-12-15 22:47:57 +01:00
orig_dos.obs
orig_extra.grf	Feature: Toyland-specific river graphics (#11523)	2023-12-27 17:44:21 -05:00
orig_extra.grf.hash	Feature: Toyland-specific river graphics (#11523)	2023-12-27 17:44:21 -05:00
orig_tto.obm	Fix #8313: use correct capitalization for TTO / DOS base-music (#8385)	2020-12-15 22:47:57 +01:00
orig_win.obg
orig_win.obm
orig_win.obs
progsignals.grf
road_waypoints.grf	Add replacement sprites for road waypoint buildings	2022-01-26 21:46:36 +00:00
route_step.grf
tracerestrict.grf	Improve colouring of restricted signal posts with original TTD graphics	2023-07-08 19:12:39 +01:00