Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
99f8989f0c
OpenTTD-patches/os
History
Jonathan G Rennison f7de298042 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-macos.yml
#	os/macosx/Info.plist.in
#	src/base_media_base.h
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/command_type.h
#	src/company_cmd.cpp
#	src/company_cmd.h
#	src/date_gui.cpp
#	src/dropdown.cpp
#	src/error_gui.cpp
#	src/fontcache/truetypefontcache.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/gfx_func.h
#	src/gfx_layout.cpp
#	src/graph_gui.cpp
#	src/group_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/network_game_info.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_debug_gui.cpp
#	src/newgrf_text.h
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/order_base.h
#	src/order_gui.cpp
#	src/os/macosx/font_osx.cpp
#	src/pathfinder/yapf/yapf_costcache.hpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/roadstop_base.h
#	src/screenshot.cpp
#	src/script/api/script_cargolist.cpp
#	src/script/api/script_order.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spritecache.h
#	src/station_gui.cpp
#	src/table/settings/gui_settings.ini
#	src/tests/mock_spritecache.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/video/opengl.h
#	src/widget.cpp
#	src/widget_type.h
#	src/window.cpp
#	src/window_gui.h
2024-09-02 21:41:13 +01:00
..
emscripten Codechange: upgrade Emscripten to 3.1.57 (#12526) 2024-04-18 19:37:33 +02:00
linux Fix: [CI] patch in SHF_COMPRESSED symbol for our Linux Generic binaries (#11651) 2023-12-30 14:40:09 +01:00
macosx Merge branch 'master' into jgrpp 2024-09-02 21:41:13 +01:00
steam
windows Merge branch 'master' into jgrpp 2024-05-28 20:33:35 +01:00