Jonathan G Rennison
0d4d4a9cac
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/3rdparty/squirrel/squirrel/sqclosure.h
# src/3rdparty/squirrel/squirrel/sqobject.h
# src/3rdparty/squirrel/squirrel/sqvm.h
# src/aircraft.h
# src/airport_gui.cpp
# src/blitter/32bpp_sse_func.hpp
# src/blitter/null.hpp
# src/bridge_gui.cpp
# src/build_vehicle_gui.cpp
# src/cargotype.h
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_gui.cpp
# src/console_gui.cpp
# src/date_gui.cpp
# src/depot_gui.cpp
# src/dock_gui.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/fileio.cpp
# src/fios.cpp
# src/fios_gui.cpp
# src/fontcache/spritefontcache.h
# src/framerate_gui.cpp
# src/game/game_text.cpp
# src/gamelog.cpp
# src/genworld_gui.cpp
# src/gfx_layout_fallback.cpp
# src/group_gui.cpp
# src/highscore_gui.cpp
# src/hotkeys.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/main_gui.cpp
# src/misc_cmd.cpp
# src/misc_gui.cpp
# src/network/core/tcp_game.cpp
# src/network/core/udp.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_airport.cpp
# src/newgrf_airport.h
# src/newgrf_airporttiles.cpp
# src/newgrf_airporttiles.h
# src/newgrf_animation_base.h
# src/newgrf_canal.cpp
# src/newgrf_commons.h
# src/newgrf_config.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_engine.cpp
# src/newgrf_engine.h
# src/newgrf_generic.cpp
# src/newgrf_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/newgrf_industries.cpp
# src/newgrf_industries.h
# src/newgrf_industrytiles.cpp
# src/newgrf_industrytiles.h
# src/newgrf_object.cpp
# src/newgrf_object.h
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_roadstop.cpp
# src/newgrf_roadstop.h
# src/newgrf_roadtype.cpp
# src/newgrf_roadtype.h
# src/newgrf_spritegroup.cpp
# src/newgrf_spritegroup.h
# src/newgrf_station.cpp
# src/newgrf_station.h
# src/newgrf_town.cpp
# src/newgrf_town.h
# src/news_gui.cpp
# src/object_gui.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/os/windows/win32.cpp
# src/os/windows/win32_main.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/npf/queue.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/roadveh.h
# src/saveload/saveload.cpp
# src/screenshot.cpp
# src/script/api/script_text.hpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/signs_cmd.cpp
# src/signs_gui.cpp
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/spriteloader/grf.hpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/station_map.h
# src/statusbar_gui.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/table/newgrf_debug_data.h
# src/terraform_gui.cpp
# src/timer/timer_game_calendar.cpp
# src/timer/timer_window.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/transparency_gui.cpp
# src/vehicle_gui.cpp
# src/water_cmd.cpp
# src/waypoint_cmd.cpp
# src/widget.cpp
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/rail_widget.h
# src/widgets/terraform_widget.h
# src/window.cpp
# src/window_gui.h
2023-11-20 22:27:05 +00:00
..
2023-04-16 20:00:55 +01:00
2023-04-16 20:00:55 +01:00
2023-02-18 09:58:02 +01:00
2023-06-04 11:15:35 +02:00
2023-01-26 16:07:14 +01:00
2023-01-26 16:07:14 +01:00
2023-09-02 19:26:54 +01:00
2023-11-19 13:00:21 +00:00
2023-11-19 13:00:21 +00:00
2023-07-19 19:30:14 +02:00
2023-03-06 22:34:09 +01:00
2023-06-04 11:15:35 +02:00
2023-09-25 21:27:45 +01:00
2023-09-19 22:49:59 +02:00
2023-07-19 19:30:14 +02:00
2023-08-12 18:14:21 +00:00
2023-07-01 02:42:51 +01:00
2023-08-15 18:12:05 +02:00
2023-07-19 19:30:14 +02:00
2023-03-06 00:32:12 +01:00
2023-03-06 00:32:12 +01:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-05-25 21:25:46 +01:00
2023-03-06 00:32:12 +01:00
2023-03-06 00:32:12 +01:00
2023-08-12 18:14:21 +00:00
2023-07-19 19:30:14 +02:00
2023-01-26 16:07:14 +01:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-03-08 22:33:47 +01:00
2023-03-08 22:33:47 +01:00
2023-07-20 16:34:59 +01:00
2023-07-01 02:42:51 +01:00
2023-09-10 08:40:25 -04:00
2023-09-10 08:40:25 -04:00
2023-08-15 18:12:05 +02:00
2023-08-12 18:14:21 +00:00
2023-07-01 02:42:51 +01:00
2023-03-08 22:33:47 +01:00
2023-05-14 22:54:10 +02:00
2023-07-01 02:42:51 +01:00
2023-11-19 13:00:21 +00:00
2023-11-19 13:00:21 +00:00
2023-08-19 15:28:45 +01:00
2023-01-26 16:07:14 +01:00
2023-09-25 21:27:45 +01:00
2023-03-11 00:06:13 +00:00
2023-01-26 16:07:14 +01:00
2023-07-01 02:42:51 +01:00
2023-07-19 19:30:14 +02:00
2023-09-02 19:26:54 +01:00
2023-09-02 19:26:54 +01:00
2023-07-19 19:30:14 +02:00
2023-07-01 02:42:51 +01:00
2023-04-17 17:59:16 +02:00
2023-04-17 17:59:16 +02:00
2023-09-02 19:33:00 +01:00
2023-09-02 19:33:00 +01:00
2023-05-24 17:34:11 +01:00
2023-07-19 19:30:14 +02:00
2023-07-01 02:42:51 +01:00
2022-09-05 21:07:06 +01:00
2022-09-05 21:07:06 +01:00
2023-07-19 19:30:14 +02:00
2023-11-13 19:08:22 +00:00
2023-03-06 00:32:12 +01:00
2023-07-03 18:08:03 +02:00
2023-03-06 22:34:09 +01:00
2023-11-20 22:27:05 +00:00
2023-08-05 20:03:33 +01:00
2023-08-18 21:25:36 +01:00
2023-07-01 02:42:51 +01:00
2023-07-01 02:42:51 +01:00
2023-03-06 01:05:43 +00:00
2023-08-15 18:12:05 +02:00
2023-03-06 21:43:40 +00:00
2023-03-06 21:43:40 +00:00
2023-05-14 22:54:10 +02:00
2023-07-01 02:42:51 +01:00
2023-07-19 19:30:14 +02:00
2023-03-08 22:33:47 +01:00
2023-07-01 02:42:51 +01:00
2023-11-17 19:17:14 +00:00
2023-07-01 02:42:51 +01:00
2023-07-01 02:42:51 +01:00
2023-04-02 22:42:38 +01:00
2021-09-25 13:39:40 +02:00
2023-03-11 00:06:13 +00:00
2023-05-26 19:36:48 +01:00
2023-03-06 00:32:12 +01:00
2023-05-08 16:49:23 +02:00
2023-11-19 13:00:21 +00:00
2023-07-01 02:42:51 +01:00
2023-09-11 08:55:12 +00:00
2023-08-15 18:12:05 +02:00
2023-07-19 19:30:14 +02:00
2023-07-01 02:42:51 +01:00
2023-07-01 02:42:51 +01:00
2023-07-01 02:42:51 +01:00
2023-10-01 23:40:38 +01:00
2023-03-11 00:06:13 +00:00
2023-10-01 23:40:38 +01:00
2021-05-14 18:15:00 +01:00
2023-08-12 18:14:21 +00:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-03-11 00:06:13 +00:00
2023-04-16 20:00:55 +01:00
2023-09-25 21:27:45 +01:00
2023-11-09 01:55:23 +00:00
2023-11-20 22:27:05 +00:00
2023-03-11 00:06:13 +00:00
2023-03-06 22:34:09 +01:00
2023-08-15 18:12:05 +02:00
2023-06-04 17:45:18 +00:00
2023-09-10 08:40:25 -04:00
2023-07-19 19:30:14 +02:00
2023-08-15 18:12:05 +02:00
2023-03-06 22:34:09 +01:00
2023-07-19 19:30:14 +02:00
2023-08-12 18:14:21 +00:00
2023-07-01 02:42:51 +01:00
2023-04-17 17:59:16 +02:00
2023-04-17 17:59:16 +02:00
2023-03-06 21:43:40 +00:00
2023-03-06 22:34:09 +01:00
2023-03-08 22:33:47 +01:00
2023-03-08 22:33:47 +01:00
2021-05-15 10:16:48 +02:00
2023-09-15 21:17:25 +01:00
2023-07-19 19:30:14 +02:00