Jonathan G Rennison
|
25ed7c2b53
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/music.cpp
# src/script/api/script_company.cpp
# src/script/api/script_event_types.cpp
# src/script/api/script_group.cpp
# src/script/api/script_object.cpp
# src/script/api/script_road.cpp
|
2023-03-11 00:06:13 +00:00 |
|
PeterN
|
2d3250923c
|
Fix #10554: Let Scrollbar::SetPosition clamp instead of assert. (#10555)
|
2023-03-09 10:19:58 -05:00 |
|
Jonathan G Rennison
|
ae7c86c49d
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# src/industry_cmd.cpp
# src/industry_cmd.h
# src/network/core/http_curl.cpp
# src/network/core/tcp_http.cpp
# src/network/core/tcp_http.h
# src/network/network_content.h
# src/script/api/script_goal.cpp
# src/script/api/script_industry.cpp
# src/script/api/script_league.cpp
# src/script/api/script_story_page.cpp
# src/script/api/script_town.cpp
# src/train.h
# src/train_cmd.cpp
|
2023-03-04 01:17:27 +00:00 |
|
SamuXarick
|
fde7028a95
|
Fix #10059: [Script] Let custom values on a config item be up to 10 digits + 1 for sign
|
2023-02-21 00:28:21 +01:00 |
|
Jonathan G Rennison
|
ae9b416684
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
|
2023-02-11 23:05:22 +00:00 |
|
glx22
|
b080f24bd8
|
Codechange: move windows common to AI and GS out of ai_gui
|
2023-02-05 19:27:25 +01:00 |
|