Jonathan G Rennison
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
2 weeks ago |
|
Jonathan G Rennison
|
0dcbcedbac
|
Fix ScriptRail::BuildSignal when using realistic braking with block signals
|
1 month ago |
|
Jonathan G Rennison
|
28e74005d0
|
Remove various uses of lengthof on std::array
|
1 month ago |
glx22
|
5b127ed23e
|
Revert bbdbf9a: ScriptTimeMode was not the best solution for economy/calendar support
(cherry picked from commit 704e871a0e)
# Conflicts:
# src/script/api/script_date.cpp
# src/script/script_storage.hpp
|
2 months ago |
Peter Nelson
|
1c66ac2d81
|
Fix #12347: Crash attempting to find catchment tiles of a station with no catchment area. (#12348)
(cherry picked from commit ea74ca0a76)
|
2 months ago |
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
2 months ago |
|
Jonathan G Rennison
|
fe730bce31
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows.yml
# src/map.cpp
# src/music/midifile.hpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/pbs.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/script/api/script_text.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_func.h
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/viewport.cpp
# src/waypoint_cmd.cpp
|
2 months ago |
Rubidium
|
86cb184eb4
|
Codechange: use std::source_location over __FILE__ and __LINE__ for WindowDesc
|
2 months ago |
|
Jonathan G Rennison
|
0e76f774eb
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/landscape.cpp
# src/landscape.h
# src/misc_gui.cpp
# src/newgrf_commons.cpp
# src/order_cmd.cpp
# src/pathfinder/yapf/yapf_base.hpp
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/water_cmd.cpp
# src/window.cpp
|
2 months ago |
|
Jonathan G Rennison
|
5b88ea6857
|
Revert "Add setting to disable script parameter randomisation"
This reverts commit 2bb5c9ac84.
|
2 months ago |
|
glx22
|
3a71f36393
|
Change: [Script] Match FormatString behaviour more closely
|
2 months ago |
|
glx22
|
ae27ce12a7
|
Fix 0858377: [Script] Don't output parameters more than once
|
2 months ago |
Michael Lutz
|
8dda387f82
|
Codechange: Use std::tuple for slope functions with two return values
|
2 months ago |
Loïc Guilloux
|
845b894fd8
|
Remove: [Script] random_deviation from setting description table (#12221)
|
3 months ago |
|
Jonathan G Rennison
|
2bb5c9ac84
|
Add setting to disable script parameter randomisation
|
3 months ago |
|
Jonathan G Rennison
|
a816829cd1
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/station_gui.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
|
3 months ago |
|
Peter Nelson
|
d4f0f0e2c5
|
Codechange: Use `GetVisibleRangeIterators()` in more places. (#12190)
This replaces more first/last index calculation, along with indexed array/vector access, with iterator access instead.
|
3 months ago |
|
Jonathan G Rennison
|
55410152a2
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/openttd.cpp
# src/script/api/script_text.cpp
# src/settings_type.h
|
3 months ago |
|
Loïc Guilloux
|
f612bc6ee2
|
Fix bf4b6696: [Script] Broken ScriptText circular reference detection (#12187)
|
3 months ago |
|
Jonathan G Rennison
|
828d2146eb
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/ai/ai_info.cpp
# src/company_base.h
# src/economy.cpp
# src/game/game_info.cpp
# src/gfx_type.h
# src/linkgraph/linkgraph_gui.cpp
# src/palette.cpp
# src/palette_func.h
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
# src/window.cpp
# src/window_func.h
|
3 months ago |
|
Jonathan G Rennison
|
bd04aff725
|
Use front/vehicle type filtered iteration in ScriptVehicleList
|
3 months ago |
|
Jonathan G Rennison
|
ac683bc278
|
ScriptList: Generalise FillList pool iteration
|
3 months ago |
|
Jonathan G Rennison
|
93bf033107
|
Add whether the vehicle is non-front to the vehicle pool pointer tag
Add iteration filters which check this
|
3 months ago |
|
Jonathan G Rennison
|
1f08ea54e5
|
Script: Fix narrowing conversion warning
|
3 months ago |
|
Jonathan G Rennison
|
d512602369
|
Charge scripts for use of ScriptList::FillList
See: https://github.com/OpenTTD/OpenTTD/issues/12128
|
3 months ago |
|
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
|
3 months ago |
|
Jonathan G Rennison
|
75dd135e8d
|
Merge tag '14.0-beta3' into jgrpp
# Conflicts:
# regression/regression/result.txt
# src/industrytype.h
# src/network/core/config.h
# src/network/core/network_game_info.cpp
# src/network/core/network_game_info.h
# src/network/core/packet.cpp
# src/network/core/packet.h
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_admin.cpp
# src/network/core/tcp_content.cpp
# src/network/core/tcp_coordinator.cpp
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/core/tcp_turn.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_admin.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_command.cpp
# src/network/network_content.cpp
# src/network/network_internal.h
# src/network/network_query.cpp
# src/network/network_query.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_turn.cpp
# src/network/network_udp.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
|
3 months ago |
|
Jonathan G Rennison
|
8581808952
|
Merge tag '14.0-beta2' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/cargotype.cpp
# src/console_cmds.cpp
# src/graph_gui.cpp
# src/industry_cmd.cpp
# src/industrytype.h
# src/misc_gui.cpp
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_town.cpp
# src/object_cmd.cpp
# src/openttd.cpp
# src/pathfinder/water_regions.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/table/build_industry.h
# src/table/engines.h
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
|
3 months ago |
|
Jonathan G Rennison
|
fdd666f66a
|
Merge tag '14.0-beta1' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
|
3 months ago |
|
Rubidium
|
a4d4301a0c
|
Codechange: We are heading to 15
|
3 months ago |
|
Jonathan G Rennison
|
838b166726
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/cheat_gui.cpp
# src/command.cpp
# src/command_func.h
# src/company_base.h
# src/debug.cpp
# src/debug.h
# src/economy.cpp
# src/engine_type.h
# src/graph_gui.cpp
# src/misc_cmd.cpp
# src/misc_cmd.h
# src/network/core/os_abstraction.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings_type.h
# src/ship_cmd.cpp
# src/stdafx.h
# src/tests/bitmath_func.cpp
# src/town_cmd.cpp
# src/town_gui.cpp
|
3 months ago |
|
Jonathan G Rennison
|
86a6f63e2f
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/commit-checker.yml
# .github/workflows/release-linux-legacy.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows-store.yml
# .github/workflows/release-windows.yml
# .github/workflows/upload-cdn.yml
# .github/workflows/upload-gog.yml
# .github/workflows/upload-steam.yml
# src/console_cmds.cpp
# src/core/math_func.hpp
# src/fios.cpp
# src/fios.h
# src/intro_gui.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_table.cpp
# src/settings_type.h
# src/table/settings.h.preamble
# src/table/settings/company_settings.ini
# src/table/settings/currency_settings.ini
# src/table/settings/difficulty_settings.ini
# src/table/settings/economy_settings.ini
# src/table/settings/game_settings.ini
# src/table/settings/gui_settings.ini
# src/table/settings/linkgraph_settings.ini
# src/table/settings/locale_settings.ini
# src/table/settings/misc_settings.ini
# src/table/settings/multimedia_settings.ini
# src/table/settings/network_private_settings.ini
# src/table/settings/network_settings.ini
# src/table/settings/news_display_settings.ini
# src/table/settings/old_gameopt_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/table/settings/script_settings.ini
# src/table/settings/win32_settings.ini
# src/table/settings/window_settings.ini
# src/table/settings/world_settings.ini
# src/viewport.cpp
# src/viewport_func.h
# src/window.cpp
|
3 months ago |
Tyler Trahan
|
b5b12da91b
|
Add: AI/GS Time Mode to choose between economy (default) and calendar time (#11603)
(cherry picked from commit bbdbf9a589)
|
3 months ago |
SamuXarick
|
8584d1b5bb
|
Add: [Script] GetAirportNumHelipads (#12085)
Adds a function for Scripts to get the number of helipads of an airport type.
|
3 months ago |
|
Jonathan G Rennison
|
7ce06e22b8
|
Split date types into calendar and economy dates
See: 735abfe1
|
3 months ago |
|
SamuXarick
|
fa64fff4a5
|
Fix #10405, a3dd750: [Script] Test engine and vehicle type validity for ScriptGroup::GetNumEngines (#11887)
|
3 months ago |
|
Loïc Guilloux
|
8d9fa0ea89
|
Change: [Script] Use company randomizer when adding random deviation (#12065)
|
3 months ago |
|
Loïc Guilloux
|
977aba73be
|
Change: Store running AI config inside Company (#12003)
|
3 months ago |
|
Jonathan G Rennison
|
516e8defb5
|
Add wrappers to get and update the current effective day length factor
|
3 months ago |
|
Jonathan G Rennison
|
0ea57528c9
|
Rename DateTicksScaled to StateTicks
Rename various other related/derived types and variables
|
3 months ago |
|
Loïc Guilloux
|
b0f3417025
|
Add: [Script] ScriptTileList_StationCoverage (#12015)
|
3 months ago |
|
Loïc Guilloux
|
0858377e9e
|
Fix: [Script] Don't kill GS misusing GSText (#12009)
|
3 months ago |
merni-ns
|
34b05465d5
|
Fix 5a88027: [Script] Avoid overflow in scripts when infinite money is enabled (#12016)
|
3 months ago |
|
Peter Nelson
|
2fd9096070
|
Change: Decouple and remove landscape-dependent cargo types. (#11719)
Cargo types of default engines, industries and houses are now specified in terms of label.
|
4 months ago |
|
glx22
|
48c97d6cde
|
Fix 48b6b18: Increase MAX_VALUATE_OPS to match the previous limit
(cherry picked from commit a502453033)
|
4 months ago |
|
Patric Stout
|
849fd5ae03
|
Change: [Script] replace easy/medium/hard values with default value (#11959)
|
4 months ago |
frosch
|
b1718478c8
|
Codechange: Replace old non-standard attributes with C++17/20 standard attributes.
|
4 months ago |
|
Peter Nelson
|
60dcf3b5e2
|
Codechange: Rename TownEffect to TownAcceptanceEffect.
This makes it clearer that TownEffect only affects acceptance behaviour.
|
4 months ago |
|
Loïc Guilloux
|
4e26e33805
|
Change: Improve ScriptSettings windows (#11958)
|
4 months ago |
|
Loïc Guilloux
|
3545decf2d
|
Cleanup e28edf6945: [Script] Left over CONFIG_RANDOM reference in documentation (#11954)
|
4 months ago |