Commit Graph

58949 Commits (971a917c7ab73f9a609cc52c2d374520720307fe)
 

Author SHA1 Message Date
Jonathan G Rennison c40ba9782c Add more information to getfulldate console command 1 month ago
Jonathan G Rennison 397a30bffc Change INITIAL_STATE_TICKS_VALUE to be an integer multiple of useful values 1 month ago
Jonathan G Rennison fd66e9d8cc Codefix: Move saveload of road stop tile data (#12883)
So that road stop tile data is also saved/loaded for road waypoints

(cherry picked from commit 39465d7f5c)

# Conflicts:
#	src/saveload/saveload.h
1 month ago
Jonathan G Rennison 12c38fff52 Add support for SLV_COMPANY_INAUGURATED_PERIOD (no changes) 1 month ago
Jonathan G Rennison 45f86a2ac3 Add support for upstream road waypoints savegame version 1 month ago
Joan Josep 6bb52b86eb Fix: typo in picker mode tooltip. (#12834)
(cherry picked from commit e7982e8082)
1 month ago
Peter Nelson a6a72c68d1 Fix: Crash if interface scale or font size changes with chat box present. (#12705)
Caused by the chat box being undrawn with the new dimensions, leading to out-of-bounding memory access.

(cherry picked from commit 7e12b5ff0f)
1 month ago
Peter Nelson 06b84f7c00 Fix: Unable to choose a font containing hyphen. (#12684)
FcNameParse may require some characters be escaped. Instead, pass name as FC_FAMILY.

(cherry picked from commit ca52da6c95)
1 month ago
Jonathan G Rennison c5f49ba0e8 Increase width of picker window class column 1 month ago
Jonathan G Rennison 1133ce2432 Fix: Picker window 'used' filter for rail waypoints
The first two field of struct PickerItem were not populated.
These are required for set operations.

StationUsesDefaultType always returned false for rail waypoints.
1 month ago
Jonathan G Rennison f72d8d0b48 Extend station bridge above flags for more than 8 station gfx values 1 month ago
Peter Nelson 84c6a917d8 Add: [NewGRF] Extended custom waypoint classes. (#12653)
This allows waypoints to be split into categories just like stations, instead of all being lumped together.

Station class labels with the first byte set to 0xFF will be treated in the same way as the 'WAYP' class.

(cherry picked from commit 2c70ccb137)
1 month ago
Peter Nelson fe14fe6d3c Codechange: Store custom station layouts in a map instead of nested vectors. (#12898)
The map key is the platforms and length combined. This simplifies allocation and searching for layouts.

(cherry picked from commit ff972ec4ff)

# Conflicts:
#	src/newgrf.cpp
#	src/newgrf_station.h
1 month ago
Peter Nelson 839ec6f1e8 Add: [NewGRF] Station property 1E, extended station tile flags.
Properties 11, 14 and 15 to set pylons/nowires/blocked intrinsically only support 8 station tiles.

Add new property to define all three flags for each station tile layout.

(cherry picked from commit a03ddb3ccb)

# Conflicts:
#	src/newgrf.cpp
#	src/newgrf_station.h
#	src/station_cmd.cpp
1 month ago
Peter Nelson c709976703 Feature: [NewGRF] Allow fixed layout up to 256 tiles per NewGRF rail station.
Allow using up to 256 tile layouts in property 0E or callback 24, which defines the layout to be saved into the map.

This was originally limited to 8, because station graphics above 8 referred to other station types but that was changed in 2007.

1) More efficient than using callback 14, as that needs to be checked every time a station tile is rendered.
2) The layout does not get changed when the station is changed (this may or may not be desirable!)

Using more than 256 layouts still requires callback 14.

(cherry picked from commit 6e553410d3)
1 month ago
Peter Nelson c001ee507e Codechange: Rename CBID_STATION_SPRITE_LAYOUT and CBID_STATION_TILE_LAYOUT.
These callbacks both select rail station tile layouts, the difference is one happens when drawing, the other happens when building. Change the names to make this clearer.

(cherry picked from commit 70a2ed062d)

# Conflicts:
#	src/newgrf_station.cpp
#	src/station_cmd.cpp
1 month ago
Peter Nelson 6b5e4108a9 Codefix: Find GRF override entries properly. (#12743)
My naive code from 16 years ago tested for GRF overrides in a way that will create empty 0 entries for each source GRF tested.

(cherry picked from commit 579ce8eae0)
1 month ago
Peter Nelson 1e55fd4667 Change: [NewGRF] Treat house max year 0xFFFF as MAX_YEAR. (#12740)
(cherry picked from commit 96fc367bcf)
1 month ago
Jonathan G Rennison 1154fff48a Fix a2b63635: Scheduled dispatch info panel was one line too short 1 month ago
Jonathan G Rennison e6afaed4fc Scheduled dispatch: Show slots for different clock hours on separate lines
See: #722
1 month ago
Jonathan G Rennison f75f9f11de Merge branch 'master' into jgrpp
# Conflicts:
#	src/CMakeLists.txt
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_class.h
#	src/newgrf_class_func.h
#	src/newgrf_object.h
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/pathfinder/aystar.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/station_sl.cpp
#	src/script/api/script_rail.cpp
#	src/settings.cpp
#	src/table/object_land.h
#	src/widgets/CMakeLists.txt
1 month ago
Jonathan G Rennison 5ad010b06f Timer: Add equivalent timer interface for upstream TimerGameCalendar 1 month ago
Jonathan G Rennison c7904e23f0 Timer: Add upstream TimerWindow 1 month ago
Jonathan G Rennison a56efeb609 Timer: Add utility to ensure safe iteration of timers 1 month ago
Jonathan G Rennison 5eae56fd23 Lang: Reformat lang files, remove unused string 1 month ago
Jonathan G Rennison c21d6607dd Hotkeys: Use std::vector, remove HOTKEY_LIST_END sentinel 1 month ago
Jonathan G Rennison 44dffb0e81 cpp-btree: Add contains method to match STL 1 month ago
Jonathan G Rennison e060e9b83d Fix: DepotWindow::GetVehicleFromDepotWndPt not refreshing vehicle list 1 month ago
Jeremy Gao 4fb677bdfe
Update: Simplified Chinese translations (#721) 1 month ago
Jonathan G Rennison 5fe5519a66 Lang: Remove unused extra string 1 month ago
Jonathan G Rennison f76204475b Merge PR #729 into jgrpp 1 month ago
Qwest8K 5aca3bd4ab Update russian.txt 1 month ago
Jonathan G Rennison 6b8a37d0e9 Remove unused headers from road.cpp 1 month ago
Jonathan G Rennison e760a4eff6 Tracerestrict: Use spans for drop down list sets in GUI 1 month ago
Jonathan G Rennison 591fe96a71 Saveload: Support upstream wider station type field size version 1 month ago
Jonathan G Rennison 782840a62b Remove leftover debug prints 1 month ago
Jonathan G Rennison 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
Jonathan G Rennison e2510b4627 Merge branch 'master' into jgrpp
Company password removal/pubkey access: mostly skipped

# Conflicts:
#	src/company_cmd.h
#	src/network/core/tcp_game.h
#	src/network/network_server.cpp
#	src/saveload/saveload.h
1 month ago
Jonathan G Rennison 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
Jonathan G Rennison 1406b36fde Set default hotkey for picker tool to / (SLASH) 1 month ago
Jonathan G Rennison 5b36c1db11 Merge branch 'master' into jgrpp
# Conflicts:
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/core/geometry_func.hpp
#	src/disaster_vehicle.cpp
#	src/dropdown.cpp
#	src/dropdown_func.h
#	src/engine_gui.h
#	src/genworld_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/network/network_content.cpp
#	src/newgrf.cpp
#	src/newgrf_airport.h
#	src/newgrf_engine.cpp
#	src/order_gui.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/town_sl.cpp
#	src/slider_func.h
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/table/airport_defaults.h
#	src/tilematrix_type.hpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/video/sdl_v.cpp
1 month ago
Jonathan G Rennison fbfb752b1c Simplify texts and GUI behaviour for cargo scaling mode settings 1 month ago
Jonathan G Rennison 4c3072e719 Departures: Fix manual memory management, avoid leaks 1 month ago
Jonathan G Rennison 3717b5b934 Sign window: Ctrl-click sign to open extra viewport at sign coordinates 1 month ago
Jonathan G Rennison 7b26ec91c6 Sign window: Remove dead code for WID_SIL_FILTER_ENTER_BTN 1 month ago
Jonathan G Rennison 13e13e875c Order window: Clicking selected label order opens edit window 1 month ago
Jonathan G Rennison 157f713388 Departures: Support scheduled dispatch vehicle slot conditionals
Also iterate orders more times when these are present
1 month ago
Jonathan G Rennison 371d7c10d7 Departures: Fix wrong tick in scheduled dispatch evaluation 1 month ago
Jonathan G Rennison 3003f8796e Add conditional order sub-mode for vehicle dispatch slot 1 month ago
Jonathan G Rennison a2b6363584 Scheduled dispatch: Store vehicle last dispatch records 1 month ago