Commit Graph

39616 Commits (1ac632630661707c21f6ec28ac3a90a3ea7d9da3)

Author SHA1 Message Date
Jonathan G Rennison de6cf4de24 Check blocking train reservation before removing signals in CmdRemoveSingleRail 3 years ago
Jonathan G Rennison 24fb390e9f Add NewGRF object property for flood-resistance
Does not imply being able to be built on water
3 years ago
Jonathan G Rennison 06fa1ae332 Add object shore/flooding support, adjust handling of foundations
Add info to debug window
3 years ago
Jonathan G Rennison d9116106ca Add NewGRF object property for new edge foundation mode 3 years ago
Rubidium ad89601c49 Codechange: do not use all upper case enumerators in a scoped enum 3 years ago
Jonathan G Rennison 2c8b462708 Debug: Add object view and colour to debug window 3 years ago
Jonathan G Rennison c6bd01b2f2 Add an IsOddParity bitmath function 3 years ago
Jonathan G Rennison ff714b7648 Add setting to disable "big GUI" NewGRFs 3 years ago
Jonathan G Rennison 924ffb013f Add NewGRF object property/flag to use land as object ground sprite
This handles variable ground densities, snow/desert, etc.
3 years ago
Patric Stout ea4f6bb8b2
Fix #9730: [Network] connections can use an invalid socket due to a race condition
A race condition happens when an IPv6 connection takes more than
250ms to report an error, but does return before the IPv4 connection
is established.
In result, an invalid socket might be used for that connection.
3 years ago
Patric Stout 9c36c12c85
Codechange: ensure OnConnect() always gets called with a valid socket (#9729)
This should already be the case, but now assert()s will tell us
if this isn't.
3 years ago
Jonathan G Rennison 906fde15c7 Move NewGRF extension feature/property lists to separate file 3 years ago
Jonathan G Rennison aaf5cd1091 Debug: Fix dumping of randomised sprite groups 3 years ago
Jonathan G Rennison 76fcfd3efd Debug: Add sprite dump support to NewGRF objects 3 years ago
Jonathan G Rennison 5d56d12bf3 Debug: Show object class/type IDs in object debug window 3 years ago
Jonathan G Rennison 4e25fa199c Add a "default" mode to TT autofill rounding setting, set as default
Use game ticks per minute or day ticks
3 years ago
Jonathan G Rennison bc75c3af6f Debug: Show ObjectSpec flags and more fields in debug window 3 years ago
Jonathan G Rennison 431d33f149 Allow per-house town cargo generation to be truncated to 0
This effectively applies the town cargo scaling setting more strictly
3 years ago
Jonathan G Rennison a8f879251b Debug: Allow inspecting non-GRF houses 3 years ago
Jonathan G Rennison 7c1a332f84
Merge pull request #340 from telk5093/jgrpp
Update: Korean translation
3 years ago
Jonathan G Rennison 0642af2e99 Explictly suppress unsigned unary minus warning on MSVC in IntFromChars 3 years ago
TELK 6046852310 Update: Korean translation up to 8258289 3 years ago
Jonathan G Rennison 3ef6b29f4a Avoid unsigned unary minux warning on MSVC in IntFromChars 3 years ago
Jonathan G Rennison 0cdaa8ef55 Remove use of std::from_chars and <charconv>
Replace it with another implementation to avoid compilation issues
on some platforms
3 years ago
Tyler Trahan 802ca4e722
Fix: Don't try to rename OWNER_DEITY signs in-game (#9716) 3 years ago
Jonathan G Rennison cff3000358 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/galician.txt
3 years ago
Jonathan G Rennison 0aeafeaf3a Allow adding multiple scheduled dispatch departure slots at once 3 years ago
Jonathan G Rennison 6f38769b73 Rename incorrectly named set time/date window strings 3 years ago
Jonathan G Rennison 10f3641d9f Adjust road vehicle quantum tunneling setting text
See: #338
3 years ago
Jonathan G Rennison 70fdb9091b Merge PR #338 into jgrpp 3 years ago
translators 6953df7b5e Update: Translations from eints
galician: 265 changes by pvillaverde
indonesian: 8 changes by indrabagus
spanish: 7 changes by MontyMontana
3 years ago
Jonathan G Rennison ba65a5bab5 Run most "daily" vehicle tasks at a fixed frequency at day lengths >= 8
This includes: running costs, track sharing costs, breakdown checks,
servicing checks, order checks
3 years ago
Jonathan G Rennison 1ff03f8ee9 De-virtualise calls to Vehicle::OnNewDay 3 years ago
Jonathan G Rennison 0794825187 Reduce unnecessary diffs with upstream in lang/english.txt 3 years ago
Jonathan G Rennison 8bc15c10cd Fix station/waypoint vehicle tooltip showing incorrect ctrl-click text
Split ctrl-click text from original tooltip strings

See: #36
3 years ago
Jonathan G Rennison e6fbf797ff Split timetable clear/set speed/wait time tooltip strings
This is to separate the original strings from added suffixes
3 years ago
translators e0a91d7325 Update: Translations from eints
galician: 17 changes by pvillaverde
3 years ago
Jonathan G Rennison b02b154218 Also show hours and minutes for schdispatch duration in minutes mode 3 years ago
Jonathan G Rennison a7094fec3b Add a STRING8 format code 3 years ago
Jonathan G Rennison dd5d4c795b Fix entering schdispatch delay/duration when not in minutes mode 3 years ago
Jonathan G Rennison 2308345803 Improve labels of non-text scheduled dispatch date/time entry window 3 years ago
Jonathan G Rennison 766fbacd57 Debug: Click toggle between long and short vehicle flag dump in window 3 years ago
Jonathan G Rennison 5d6533e258 Debug: Add a multiline long form of DumpVehicleFlags 3 years ago
Jonathan G Rennison b5521653e0 Debug: Add general mechanism to make lines in debug window clickable 3 years ago
Jonathan G Rennison 2b56ca2b62 Debug: Create struct type for ExtraInfo output parameter 3 years ago
translators ad7bdeb73a Update: Translations from eints
chinese (simplified): 2 changes by kurax
3 years ago
Jonathan G Rennison ef1b8f159f Fix ctrl-click signal cycling setting 3 years ago
reldred f461f0de08 Introduces a new setting (defaulted off) to allow preventing road vehicles from performing so-called quantum tunelling through other vehicles blocking their path. 3 years ago
Jonathan G Rennison 9ff8643fd9 Split config transparency settings into base and extra fields
This is to avoid incorrect settings when loading in trunk,
as the min/max clamping is not bitwise.
In particular having all options set in trunk when transparent vehicles
in tunnels was set.
3 years ago
Michael Lutz 20a30825a0
Fix: Insufficient input validation for CmdIndustryCtrl. (#9711) 3 years ago
Jonathan G Rennison 5c0c057dda Adjust ConHookServerOrNoNetwork error message 3 years ago
translators 793de48e89 Update: Translations from eints
vietnamese: 2 changes by KhoiCanDev
3 years ago
Jonathan G Rennison 0691b25e17 Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/afterload.cpp
3 years ago
Jonathan G Rennison 5723c317f7 Fix trains with non-front parts needing repair not being serviced 3 years ago
Jonathan G Rennison 4db14ccd18 Fix 71c39dc: Incorrect handling of order without non-stop flag
See: #337
3 years ago
Jonathan G Rennison 4ccbb11440 Only show level crossing overlay sprites on outsides of multi-track crossings
When using both adjacent crossings and safer crossings
3 years ago
Jonathan G Rennison 551560537f Ensure that adjacent level crossings cannot leave map if there are no void tiles 3 years ago
Jonathan G Rennison 5959e1c0f9 Merge PR #336 into jgrpp 3 years ago
Jonathan G Rennison af2c51e3d4 Merge branch 'running-costs-exploration' into jgrpp 3 years ago
reldred 5a53b4d846 Additional tweaks to allow rivers to spawn in deserts (causing aditional tropic biome to spawn around them). This piggybacks off of the 'allow lakes in deserts' setting, renaming it to cover both. The actual setting name itself internally hasn't changed. 3 years ago
Jonathan G Rennison 71c39dc8c2 If train next order is for same station when leaving, do not leave
Just start loading again without moving instead
3 years ago
dP ad90e88ebd
Change: Make pf.yapf.rail_firstred_twoway_eol on by default (#9544) 3 years ago
dP 54951e39a1
Fix #8797: Use logical rail length when placing signals (#9652) 3 years ago
nchappe 2cb6351af5
Fix: Update last servicing dates when using the date cheat (#9694) 3 years ago
Bernard Teo 0533b666b7
Fix #9702: Display order window for vehicle group on ctrl-click only when using shared orders (#9704) 3 years ago
Jonathan G Rennison f22a5685c3 Divide cost instead of cost_factor in running costs division
This is to prevent 0 running costs for cheap vehicles when
cost_factor would be < 1
3 years ago
Jonathan G Rennison bb8e4eb18a Adjust stopped/depot detection for running costs division
Fix v/this use in Train::GetRunningCost
3 years ago
Jonathan G Rennison f16657ec96 Fix running costs divider settings saveload 3 years ago
Jonathan G Rennison 33bedf0061 Allow changing running cost divider settings in game 3 years ago
Jonathan G Rennison fddc9fb975 Increase max value of running cost divider settings 3 years ago
translators f6886754ff Update: Translations from eints
greek: 2 changes by dionisis84
german: 2 changes by danidoedel
3 years ago
reldred 904ff346c2 Initial commit to allow configuring running costs as a fraction (1/1 default thru 1/4) independently for both vehicles stopped in depots (doesn't work for planes, I'm not smart enuff), or vehicles that are stationary. 3 years ago
Jonathan G Rennison fc58ed9987
Codechange: Remove CargoSpec::multipliertowngrowth which is unused (#9701)
This is set by cargo property 19.
This property is only implemented in TTDPatch.
3 years ago
Jonathan G Rennison 782fba3064 Fix windows not being deleted when order changed during deletion 3 years ago
Jonathan G Rennison 25a467730e Fix signals on approach to tunnel/bridge entrance showing wrong aspect
When signal change propagated outward from the tunnel/bridge,
such as in tunnel/bridge signal add/change.
3 years ago
Jonathan G Rennison 6a4d849cba Connect new plan lines to end of previous line when ctrl pressed 3 years ago
Jonathan G Rennison f53b295a58 Fix overuse of _current_plan in struct Plan methods 3 years ago
Jonathan G Rennison 95a60d520e Increase object class ID limit 3 years ago
Charles Pigott cf16f452da
Fix #9680: Recalculating aircraft positions before map array updates caused crashes (#9699) 3 years ago
Jonathan G Rennison 76ad272f3b Fix reservation loop with single-vehicle trains and signalled tunnel/bridges 3 years ago
Jonathan G Rennison b259d04339 Add tunnel/bridge entrance/exit values to entry direction conditional 3 years ago
Jonathan G Rennison 74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
3 years ago
Jonathan G Rennison 1ee59c8333 Fix pending speed restrictions not being applied on signalled tunnel/bridges
Distance remaining was not decremented
3 years ago
Jonathan G Rennison 3ea4ac98e7 Fix missing VehicleRailFlags in DumpVehicleFlags 3 years ago
Jonathan G Rennison 8c8c0e250a Fix exit signal state when unable to leave signalled custom bridge head
When the exit direction is different to the bridge direction.
3 years ago
frosch 5f6303f985
Fix: don't complain when the sprite font is missing glyphs. (#9692)
Silently auto-pick a suitable font.
3 years ago
Jonathan G Rennison e661a07425 Fix train not stuck action clearing wait counter when in depot/tunnel/bridge 3 years ago
Jonathan G Rennison 48977853a4 Simplify some rail/signalled tunnel/bridge tile checks 3 years ago
Jonathan G Rennison dad007e16a Fix spelling of TRPRF_SPEED_RESTRICTION_SET 3 years ago
translators f8efab4653 Update: Translations from eints
japanese: 1 change by akaregi
dutch: 3 changes by Afoklala
3 years ago
Jonathan G Rennison dca7e7bc58 Merge branch 'master' into jgrpp 3 years ago
Jonathan G Rennison 3308edf792 Try to extend reservation when passing sighting distance of non-end signal 3 years ago
Jonathan G Rennison 2a2b988424 Fix premature reservation end after reversing station found
ChooseTrainTrackLookAheadStateFlags/TrainReservationLookAheadFlags mixup
3 years ago
translators 62795a2e6d Update: Translations from eints
russian: 2 changes by Ln-Wolf
3 years ago
Jonathan G Rennison 2b1993ee4d Fix crash with wrong-way running on multi-aspect signalled tunnel/bridge
When using the ignore signals buttons and updating middle signal states
3 years ago
Jonathan G Rennison 5ac6ea8cd1 Suppress unitialised warning in GenerateTownNameString on some platforms 3 years ago
Jonathan G Rennison 34f8098689 Suppress Wdeprecated-copy warning on clang/emscripten 3 years ago
Jonathan G Rennison c4e3c2cd75 Avoid unknown pragma GCC diagnostic warning on GCC < 9 3 years ago
translators 4bcbcbc58f Update: Translations from eints
tamil: 2 changes by Aswn
3 years ago
Jonathan G Rennison 58d8418f83 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/arabic_egypt.txt
3 years ago
Tyler Trahan 48c1c7f221 Cleanup: Fix typo in overflowsafe_type comment 3 years ago
translators 236f71640c Update: Translations from eints
english (us): 2 changes by 2TallTyler
arabic (egypt): 49 changes by AviationGamerX
korean: 17 changes by telk5093
catalan: 2 changes by J0anJosep
danish: 4 changes by nielsmh
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
3 years ago
Jonathan G Rennison d35b9719a9 Fix redundant declaration of GetLinkGraphJobDesc 3 years ago
Jonathan G Rennison a731da3956 Suppress Wdeprecated-copy warning in btree_iterator 3 years ago
Jonathan G Rennison 2b8018f5d6 MinGW: Avoid function cast warnings with GetProcAddress 3 years ago
translators 0ad40ee868 Update: Translations from eints
arabic (egypt): 35 changes by AviationGamerX
3 years ago
Jonathan G Rennison f67407d777 Fix missing include in core/overflowsafe_type.hpp
See: #334
3 years ago
Tyler Trahan e9cb9c1135
Fix #9579: Object and HQ construction is Construction cost, not Property Maintenance (#9673) 3 years ago
Jonathan G Rennison 8f6549aed6 Merge branch 'pr-332' into jgrpp 3 years ago
Yourself 3a1e427b0c fix infinite recursion in FindFirstBit64 3 years ago
Jonathan G Rennison fb604ded6b Fix restricted signal bit with semaphores for GRF custom signals 3 years ago
Jonathan G Rennison 3d4261a33a Merge branch 'master' into jgrpp
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
3 years ago
Guillaume Renoult c38af72978
Update: add setting to hide news about competitors vehicle crash (#9653) 3 years ago
Tyler Trahan b4bd7b367e
Feature: Ctrl-click to remove fully autoreplaced vehicles from list (#9639) 3 years ago
Tyler Trahan 08cb5ba2cd
Fix: Don't show screenshot GUI in screenshots (#9674) 3 years ago
J0anJosep d0655a48ba Fix: Do not redraw vehicle lists when skip order command is tested. 3 years ago
Michael Lutz 8c558d74a5 Fix 55a11710: Curly braces need to be double-escaped for (std::)fmt. 3 years ago
translators 73001ae1a9 Update: Translations from eints
english (au): 3 changes by LordAro
3 years ago
Michael Lutz 95c8467670 Fix 65cbde4b: Writing to uninitialized string when loading a currency NewGRF. 3 years ago
Loïc Guilloux 6ff0858b38
Fix #9669, cbe00ec: Only try valid reverse directions (#9672) 3 years ago
Dmitry Erlikh 33ef34189e
Fix #9648: add missing commas in crash message 3 years ago
dP 80e3397f85
Fix 3a1a915: Every 16th client never reconnects after server restart 3 years ago
Jonathan G Rennison 258b81ae7f Fix missing includes in mixer.cpp 3 years ago
Jonathan G Rennison 1174b0c53f Remove OrthogonalTileIteratorStep
Step sizes other than 1 are no longer used
3 years ago
Jonathan G Rennison f9e3c012f6 Fix missing include in bitmap_type.h 3 years ago
Jonathan G Rennison 85d2d0daab Fix 3rd party optional comparison operators 3 years ago
Jonathan G Rennison 486e69f1f8 Fix use of optional from wrong namespace 3 years ago
Jonathan G Rennison 168dc4678d Avoid type alias of forward-declared template class 3 years ago
Jonathan G Rennison 914da4bdb9 Fix 1e0bea5b: Incorrect extern declarations 3 years ago
Jonathan G Rennison 3373be7b0d Fix assertion failure in SyncCompanySettings 3 years ago
Jonathan G Rennison fea9acd687 Do not show signal window toggle size button in realistic braking mode 3 years ago
Jonathan G Rennison 9e946d4c5d Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
3 years ago
Jonathan G Rennison 6611ed5a53 Encode oversize map dimensions in non-extended game info serialisation
Use non power of 2 values for sizes >= 64k
3 years ago
Jonathan G Rennison eaf5908a0b Add a constant for SERVER_GAME_INFO_EXTENDED max version
Set max version correctly in QueryNetworkGameSocketHandler::SendGameInfo
3 years ago
Jonathan G Rennison 3cff5e53e4 Add train cached_curve_speed_mod to VENC, cache checks and debug window 3 years ago
Jonathan G Rennison 3ef1a0943b Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/lang/chuvash.txt
#	src/lang/czech.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/german.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/russian.txt
#	src/tree_gui.cpp
#	src/vehicle.cpp
3 years ago
Jonathan G Rennison 324e90e5ac Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h
3 years ago
translators 9edb75ec0b Update: Translations from eints
arabic (egypt): 7 changes by AviationGamerX
3 years ago
Jonathan G Rennison 9e1bb3eea7 Merge tag '12.0-beta2' into jgrpp-beta
# Conflicts:
#	docs/landscape_grid.html
#	src/lang/simplified_chinese.txt
#	src/network/network_server.cpp
#	src/station_cmd.cpp
3 years ago
Jonathan G Rennison faf32200cf Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
3 years ago
Jonathan G Rennison f764fcfb1f Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/console_cmds.cpp
#	src/debug.cpp
#	src/lang/vietnamese.txt
#	src/network/core/address.cpp
#	src/network/core/address.h
#	src/network/core/config.h
#	src/network/core/os_abstraction.cpp
#	src/network/core/os_abstraction.h
#	src/network/core/tcp_listen.h
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_gamelist.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf.cpp
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/table/settings/network_settings.ini
3 years ago
Jonathan G Rennison 80236f5c4c Remove a dubious use of FIND_FIRST_BIT 3 years ago
Jonathan G Rennison de5de583e3 Rationalise FIND_FIRST_BIT/FindFirstBit2x64
Use builtins for FindFirstBit2x64.
Apply and masks to prevent undefined behaviour if inputs out of range
3 years ago
Jonathan G Rennison 1e0bea5b8d Replace FindFirstBit/FindFirstBit64 with a single template function 3 years ago
Jonathan G Rennison d585ce75dd Use bitmath builtins for SetBitIterator when available 3 years ago
Jonathan G Rennison e1e7b67270 Fix cargo mask truncation in CargoMaskValueFilter and LinkRefresher::RefreshLinks 3 years ago
Jonathan G Rennison f54d69a60a Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
3 years ago
Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
3 years ago
translators 00a6287f97 Update: Translations from eints
arabic (egypt): 2 changes by AviationGamerX
3 years ago
Jonathan G Rennison d1f1a6942a Add support for loading trunk savegames versions 293 - 299 (12.0)
Use modified upstream saveload implementation for these versions
Re-arrange headers to support multiple saveload implementations
3 years ago
Jonathan G Rennison c6f0559ad4 Fix const-correctness in script DoCommand string validation
See: 665e3c1f
3 years ago
SamuXarick 0563c0e308 Fix #9591: Update station docking tiles upon placing a water object on a docking tile (#9594)
(cherry picked from commit e404d16929)
3 years ago
Loïc Guilloux a4a7240511 Change: Allow all tiles around docks to be docking tiles (#9578)
(cherry picked from commit 38a64eb2aa)
3 years ago
Loïc Guilloux a84feb3444 Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)
(cherry picked from commit ddafc0de05)
3 years ago
Jonathan G Rennison fb8020916a Add upstream savegame version fields 3 years ago
Jonathan G Rennison 5ec1573ccd Add separate max load savegame version, set savegame version values 3 years ago
Jonathan G Rennison 61cc60099a Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
3 years ago
Jonathan G Rennison 6bc3481931 Fix MinGW compilation issues 3 years ago
Jonathan G Rennison 5586d1a20a Remove use of deprecated allocator rebind in cpp-btree 3 years ago
Jonathan G Rennison 9540d42427 Fix cast warning in GUIHouseList
See: #307
3 years ago
Jonathan G Rennison 4a57625183 Avoid cast warnings in network packet handling
See: #307
3 years ago
Jonathan G Rennison 6ba53a9a68 Add ifdef around 32 bit length limit check in SlSetLength 3 years ago
Jonathan G Rennison 1d89fe3820 Add casts around engine property checks in GetEngineProperty 3 years ago
Jonathan G Rennison d2e757db9a Set field size for PropertyID enum 3 years ago
Jonathan G Rennison 86e1f58bc0 Avoid unused variable warning when not using threads
See: #307
3 years ago
Jonathan G Rennison 0842621653 Remove unused _network_udp_mutex
See: #307
3 years ago
Jonathan G Rennison 8a7cb10813 Fix incorrect cast/colour operation in screenshot GetIndustryValue
See: #307
3 years ago
translators ccf70fc4b3 Update: Translations from eints
dutch: 2 changes by Afoklala
3 years ago
Jonathan G Rennison 24c6dfe872 Merge branch 'master' into jgrpp-beta 3 years ago
TELK afe7824270 Update: Korean translation up to aff6dbec2d 3 years ago
TELK ed1c0c70ea Update: Korean translation up to 9254be5 3 years ago
TELK 7b12d23e4f Update: Korean translation 3 years ago
Jonathan G Rennison da282c3ecc Merge branch 'master' into jgrpp-beta
# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/misc_gui.cpp
#	src/newgrf.cpp
3 years ago
translators edf7b02ddb Update: Translations from eints
german: 2 changes by Wuzzy2
3 years ago
Jonathan G Rennison 81290df946 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/lang/spanish.txt
#	src/network/core/tcp_content_type.h
#	src/network/network_content.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/settings.h.preamble
#	src/table/settings/company_settings.ini
#	src/table/settings/currency_settings.ini
#	src/table/settings/gameopt_settings.ini
#	src/table/settings/misc_settings.ini
#	src/table/settings/settings.ini
#	src/table/settings/win32_settings.ini
#	src/table/settings/window_settings.ini
3 years ago
translators 488cf26406 Update: Translations from eints
swedish: 44 changes by joeax910
japanese: 1 change by clzls
chinese (simplified): 2 changes by clzls
3 years ago
Jonathan G Rennison aff6dbec2d Show timetabled 0 wait times for stations/depots in timetable window 3 years ago
Jonathan G Rennison 53139c2405 Add current day/month to tracerestrict and conditional order conditionals 3 years ago
translators 4487ad1a5e Update: Translations from eints
korean: 1 change by telk5093
polish: 2 changes by pAter-exe
3 years ago
Jonathan G Rennison ffef1c9e44 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/cheat_sl.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/table/settings/settings.ini
#	src/town_cmd.cpp
#	src/vehicle.cpp
3 years ago
Jonathan G Rennison 944f090b46 Add settings for minimum contiguous landmass size for town/city placement 3 years ago
Jonathan G Rennison 55620ff162 Add general function for checking size of contiguous tile area 3 years ago
translators a0831cec39 Update: Translations from eints
swedish: 1 change by joeax910
3 years ago
Jonathan G Rennison 8b5b96af77 Fix typos in PostProcessNetworks 3 years ago
Jonathan G Rennison 28fd549808 Decline company takeover offer on company's behalf if company has no client 3 years ago
Jonathan G Rennison 296987153b Add console command to offer a company for sale 3 years ago
Jonathan G Rennison ec8512e2ea When declining to buy a company, ask the next company immediately 3 years ago
translators 279fe11b03 Update: Translations from eints
indonesian: 2 changes by hadyatmo
3 years ago
frosch e8bff0ad03
Change: Suppress panning in intro game, while user is interacting with the GUI. (#9645) 3 years ago
frosch 111a47af0d Codechange: rename 'info_view' to 'rotor_in_gui', because it is only used by helicopters. 3 years ago
frosch bc984d9af5 Codechange: remove redundant 'info_view' parameter, it can be derived from 'image_type'. 3 years ago
translators bf0210229c Update: Translations from eints
english (us): 2 changes by 2TallTyler
vietnamese: 2 changes by KhoiCanDev
catalan: 2 changes by J0anJosep
portuguese (brazilian): 2 changes by Vimerum
3 years ago
Joan Josep b2e83b4da6
Fix: Draw rotor in cursor when dragging helicopters. (#9612) 3 years ago
Loïc Guilloux 08c048e0a1
Fix #9643, 95386dc: Incorrect determination of screenshot format (#9644) 3 years ago
translators ae340f415e Update: Translations from eints
russian: 2 changes by Ln-Wolf
3 years ago
Loïc Guilloux f2c03a77f0
Change: Don't store not to be activated newGRFs in savegames (#9627) 3 years ago
Loïc Guilloux bc1b84cbbb
Fix #9630: intro game could zoom in/out more than allowed by settings (#9633)
Also fixes #9622
3 years ago
translators b043d58b92 Update: Translations from eints
swedish: 4 changes by joeax910
spanish: 1 change by MontyMontana
3 years ago
Loïc Guilloux eed49d7792
Fix #9626, ddafc0d: Incorrect loading of script saved data (#9629) 3 years ago
translators e68a51eced Update: Translations from eints
korean: 3 changes by telk5093
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
3 years ago