Jonathan G Rennison a98a56669b Merge branch 'master' into jgrpp ...

# Conflicts:
#	regression/regression/result.txt
#	src/autoreplace_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/network/network_content.cpp
#	src/newgrf_roadstop.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/road_gui.cpp
#	src/saveload/ai_sl.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/station.cpp
#	src/station_gui.cpp
#	src/video/cocoa/cocoa_ogl.h
#	src/video/sdl2_opengl_v.h
#	src/video/video_driver.hpp
#	src/video/win32_v.h
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp

2024-02-19 23:11:00 +00:00

..

api

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

CMakeLists.txt

Merge branch 'master' into jgrpp

2023-02-11 23:05:22 +00:00

script_config.cpp

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

script_config.hpp

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

script_fatalerror.hpp

Script: Only log each string parameter warning message once

2023-03-27 20:14:49 +01:00

script_gui.cpp

Merge branch 'master' into jgrpp

2024-02-19 23:11:00 +00:00

script_gui.h

Change: Allow opening multiple script debug windows by holding Ctrl.

2023-12-20 20:39:07 +00:00

script_info_dummy.cpp

Use core/format.hpp for fmt includes

2023-07-20 16:34:59 +01:00

script_info.cpp

Merge tag '14.0-beta1' into jgrpp

2024-02-18 22:22:29 +00:00

script_info.hpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

script_instance.cpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

script_instance.hpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

script_scanner.cpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

script_scanner.hpp

Codechange: use fmt::format_to to format the help message

2023-05-20 16:50:03 +02:00

script_storage.hpp

Add: AI/GS Time Mode to choose between economy (default) and calendar time (#11603)

2024-02-15 17:09:59 +00:00

script_suspend.hpp

…

squirrel_class.hpp

…

squirrel_helper_type.hpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

squirrel_helper.hpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

squirrel_std.cpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

squirrel_std.hpp

…

squirrel.cpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

squirrel.hpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00