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
9683676df1
OpenTTD-patches/media/baseset
History
Jonathan G Rennison 8eb27e1ac7 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h
2021-04-25 22:14:59 +01:00
..
openttd Change: use icons to indicate you/host in Online Players GUI 2021-04-24 21:43:58 +02: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 Change: use icons to indicate you/host in Online Players GUI 2021-04-24 21:43:58 +02: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