015d599213
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_gui.cpp
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/landscape.cpp
# src/main_gui.cpp
# src/network/core/tcp_admin.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/newgrf_class.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station_gui.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_gui.cpp
# src/tree_cmd.cpp
# src/tree_map.h
# src/vehicle_gui.cpp
# src/waypoint_gui.cpp
5 days ago
3ec25ffc9a
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/ci-emscripten.yml
# cmake/scripts/FindVersion.cmake
# src/main_gui.cpp
# src/road_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/table/sprites.h
# src/table/station_land.h
# src/viewport_gui.cpp
# src/widgets/smallmap_widget.h
6 days ago
7bbd88caa2
Documentation: Update landscape docs with upstream features
...
Fix minor grammar issue
3 weeks ago
e42ac911ff
Check for tracerestrict wait/wait at start in signal propagation
...
When using realistic braking, block/auto signals now don't default to
green on plain line where this would conflict with wait at PBS
or wait at start PBS tracerestrict actions.
3 weeks ago
f72d8d0b48
Extend station bridge above flags for more than 8 station gfx values
1 month ago
16dfb84978
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.h
# src/console_gui.cpp
# src/music.cpp
# src/pathfinder/npf/npf.cpp
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/script/api/script_types.hpp
# src/settings_gui.cpp
# src/settings_table.cpp
# src/settings_type.h
# src/ship_cmd.cpp
# src/strings.cpp
# src/table/settings/pathfinding_settings.ini
# src/train_cmd.cpp
# src/vehicle_type.h
# src/waypoint_gui.cpp
1 month ago
7dd8729a33
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/cachecheck.cpp
# src/network/network.cpp
# src/openttd.cpp
# src/pathfinder/follow_track.hpp
# src/saveload/saveload.cpp
# src/textfile_gui.cpp
1 month ago
e554cb9d62
NewGRF: Add extended house variables to get uncapped building counts, other IDs
2 months ago
318b86083b
NewGRF: Add extended house variables to get uncapped building counts
2 months ago
86e32631d7
Doc: Amend landscape grid after #12572 .
3 months ago
15f4e62936
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/network/network.cpp
# src/pathfinder/yapf/yapf.h
# src/pathfinder/yapf/yapf_ship.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/station_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
3 months ago
d3e37a251f
Doc: update main admin protocol documentation
3 months ago
c35a5e5cb1
Change: Add variable ground types for road waypoints
3 months ago
9c84e5df3f
Add: Road waypoint functionality
3 months ago
05b65703d3
Codechange: Increase size of StationType field in map array
...
Move can station have wires bit to make room
3 months ago
88b298f30e
Documentation: Remove various low level changes which are now upstream
3 months ago
019f93a65f
Doc: Clarify how to update version numbers in release guide ( #12634 )
5 months ago
16639939e9
Cleanup: remove command line option for company password
5 months ago
cb26b0e92d
Doc: Re-order release instructions to not tell the world prematurely ( #12620 )
5 months ago
6dab30f928
Documentation: Remove random_bits variable from road stops (NML)
5 months ago
6ef682cf44
Documentation: Fix typo
5 months ago
f1334b9854
Documentation: Fix typo
5 months ago
08d05bf4c0
Doc: update release documentation with the latest ( #12525 )
5 months ago
f7bd080015
Codechange: improve desync documentation ( #12521 )
5 months ago
c8709a9623
Add edge flood behaviour for land ground objects with no foundations
6 months ago
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
6 months ago
6e0f58f700
Codechange: [CI] use "cargo install --locked" to use pinned dependency versions ( #12243 )
...
Normally "cargo install" will use the latest dependencies, but
this causes an issue with "dump_syms". Use "--locked" makes sure
we use the dependency versions as indicated by "dump_syms", instead
of the latest version.
7 months ago
7e0acd686e
Add NewGRF signal style flag to draw on both sides
7 months ago
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
7 months ago
728971ddbc
Road stops: Remove 0x6B as alias of roadstop_road_info_nearby_tiles
8 months ago
9f55550417
Multi-cargo ships: Sprite group cargo thresholds refer to entire ship
8 months ago
38b7c68623
Docs: Unmark road NewGRF road stops as patch feature in landscape docs
8 months ago
090616b4c9
Add: allow loading heightmaps from command-line ( #11870 )
...
If you want to load a file from tar, you have to give the file
inside the tar in order for it to work:
<tar-file>/<dir-in-tar>/<file>.png
8 months ago
6903e5c937
Documentation: Update NewGRF road stops documents
8 months ago
d7b75614bb
Merge branch 'master' into jgrpp
...
# Conflicts:
# media/baseset/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console.cpp
# src/debug.cpp
# src/fontcache/freetypefontcache.cpp
# src/network/network.cpp
# src/openttd.cpp
# src/os/macosx/font_osx.cpp
# src/os/windows/font_win32.cpp
# src/settings_gui.cpp
# src/video/sdl2_v.cpp
# src/widgets/settings_widget.h
# src/window_gui.h
8 months ago
564441e822
Remove: Debug redirect over network
...
It does not work for dedicated servers because upon starting the process to
resolve the address to redirect to gets killed. Also with all the async going
on in the network code, the debug redirection will start very late in the
process.
8 months ago
7f6b1d6b94
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/company_cmd.cpp
# src/company_func.h
# src/core/overflowsafe_type.hpp
# src/engine.cpp
# src/music/midifile.cpp
# src/network/network_command.cpp
# src/newgrf_debug_gui.cpp
# src/newgrf_roadstop.h
# src/newgrf_spritegroup.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/pathfinder/yapf/yapf_common.hpp
# src/road_gui.cpp
# src/saveload/engine_sl.cpp
# src/script/api/script_depotlist.cpp
# src/script/api/script_roadtypelist.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/strings.cpp
# src/table/settings/game_settings.ini
9 months ago
c6dafb0865
Doc: indicate a bit better that mass-change PRs for translations are possible ( #11677 )
9 months ago
51dbcca9a7
Remove: officially mark Vista as no longer supported ( #11531 )
...
It is very likely Vista hasn't been working for years, but the
amount of users that use an OS that has been EoL for over 11 years
is very small, so reports happen rarely.
(cherry picked from commit b866e52b17
10 months ago
b866e52b17
Remove: officially mark Vista as no longer supported ( #11531 )
...
It is very likely Vista hasn't been working for years, but the
amount of users that use an OS that has been EoL for over 11 years
is very small, so reports happen rarely.
10 months ago
e47bfe47b8
Feature/Fix: [GS] Add RoadTiles and GetOneWayInfo endpoints ( #611 )
...
Feature: [GS] Add RoadTiles and GetOneWayInfo endpoints
10 months ago
ca23e31986
Add railtype variable for adjacent crossing information
10 months ago
85e1146fab
Documentation: Fix typo in NewGRF additions (NML) document
10 months ago
c929f7075e
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/SourceList.cmake
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/console_cmds.cpp
# src/depot_base.h
# src/elrail.cpp
# src/network/core/udp.cpp
# src/network/network_admin.cpp
# src/network/network_chat_gui.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/newgrf_railtype.cpp
# src/newgrf_railtype.h
# src/newgrf_storage.h
# src/os/unix/crashlog_unix.cpp
# src/rail.h
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/road_map.h
# src/saveload/labelmaps_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/sl/oldloader_sl.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/table/settings/world_settings.ini
# src/tests/test_script_admin.cpp
# src/textfile_gui.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle_gui.cpp
# src/widget.cpp
# src/window.cpp
# src/window_gui.h
# src/window_type.h
10 months ago
fc1c47cbd2
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/crashlog.h
# src/date_type.h
# src/depot_type.h
# src/landscape.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/macosx/crashlog_osx.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/script/api/script_infrastructure.cpp
# src/stdafx.h
# src/table/settings/gui_settings.ini
# src/table/settings/pathfinding_settings.ini
# src/tests/CMakeLists.txt
10 months ago
3da9f521a5
Documentation: Fix stray HTML tag in road stops documentation
11 months ago
6b649f668e
Documentation: Fix table for road stops var 42/roadstop_terrain_type
11 months ago
39247b0120
Road stops: Add tile slope to varact2 variable 0x42
11 months ago
b2a1ec96f1
Change: Store station blocked/wires/pylons flags in map.
...
This stores three flags in unused map bits, and avoids having to look up
station graphics and custom station specs to determine blocked/wires/pylons
status.
This potentially affects rail pathfinding performance.
Savegame version is not bumped, as the flags can just be updated every
time.
(cherry picked from commit cb658e6cc6e1c114c1eaafaaa5b14849f04ca083)
12 months ago
b5dc9328f2
Change: Store station blocked/wires/pylons flags in map. ( #11337 )
...
This stores three flags in unused map bits, and avoids having to look up
station graphics and custom station specs to determine blocked/wires/pylons
status.
This potentially affects rail pathfinding performance.
Savegame version is not bumped, as the flags can just be updated every
time.
12 months ago
Jonathan G Rennison
J0anJosep
Rubidium
Tyler Trahan
Patric Stout
Miika Kulmala
Peter Nelson