Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
f94eb286f2
OpenTTD-patches/media/baseset
History
Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
2021-02-01 18:58:36 +00:00
..
openttd Add: [NewGRF] new GUI sprites for 'rename' and 'go to location'. 2021-01-11 22:15:58 +01:00
orig_extra Codechange: Make codestyle for CMake files consistent for 'control' statements 2020-09-25 14:43:13 +01:00
CMakeLists.txt Merge branch 'master' into jgrpp 2020-10-14 17:38:23 +01:00
innerhighlight.grf Add 3 more zoning highlight colours 2020-10-28 00:27:48 +00:00
no_music.obm Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
no_sound.obs Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
openttd.grf Add: [NewGRF] new GUI sprites for 'rename' and 'go to location'. 2021-01-11 22:15:58 +01:00
opntitle.dat Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_dos_de.obg Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_dos.obg Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
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 Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_extra.grf Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02: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 Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_win.obm Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
orig_win.obs Codechange: rework how grf and ob[msg] are generated 2020-06-05 19:36:05 +02:00
progsignals.grf CMake: Move built in GRfs to baseset dir 2020-06-28 21:57:02 +01:00
route_step.grf CMake: Move built in GRfs to baseset dir 2020-06-28 21:57:02 +01:00
tracerestrict.grf CMake: Move built in GRfs to baseset dir 2020-06-28 21:57:02 +01:00