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
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
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
a84feb3444
Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit ( #9415 )
...
(cherry picked from commit ddafc0de05
3 years ago
fb8020916a
Add upstream savegame version fields
3 years ago
5ec1573ccd
Add separate max load savegame version, set savegame version values
3 years ago
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
3 years ago
6ba53a9a68
Add ifdef around 32 bit length limit check in SlSetLength
3 years ago
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
53139c2405
Add current day/month to tracerestrict and conditional order conditionals
3 years ago
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
ec8512e2ea
When declining to buy a company, ask the next company immediately
3 years ago
544da99102
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/cargopacket.h
# src/lang/korean.txt
# src/linkgraph/linkgraph.h
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.h
# src/network/network_admin.h
# src/network/network_func.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/order_base.h
# src/rail_cmd.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/economy_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/map_sl.cpp
# src/saveload/newgrf_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/signs_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/subsidy_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/script/api/script_object.cpp
# src/settings.cpp
# src/string.cpp
# src/string_func.h
# src/table/CMakeLists.txt
# src/table/settings/settings.ini
# src/viewport_sprite_sorter_sse4.cpp
3 years ago
784fcbd1e7
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
3 years ago
b00d5e07d2
Fix fb0549ea: Incorrect cherry-pick removed end marker
3 years ago
781aaa4fe5
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
3 years ago
fb0549ea59
Feature: Configurable subsidy duration
...
(cherry picked from commit d09210e1c6
3 years ago
4042480806
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
3 years ago
573ab48e9c
Fix 81062163: for (really) old games, station bus/truck station cache was not updated ( #9366 )
...
(cherry picked from commit 1e432fbd71
3 years ago
3411203e5d
Fix: compatible NewGRFs in crash-log reported wrong md5 ( #9340 )
...
The text suggests it reports the original md5, but it does in fact
report the replaced md5. Now it reports both.
(cherry picked from commit f997eb6ca4
3 years ago
6f16655e6e
Add "special events" log. Add console command, include in crash logs.
3 years ago
2e022d5194
Move game events to new event_logs header/cpp files
3 years ago
c99eaf72b7
Fix #9591 : Update station docking tiles upon placing a water object on a docking tile ( #9594 )
...
See: https://github.com/OpenTTD/OpenTTD/issues/9591
See: https://github.com/OpenTTD/OpenTTD/pull/9594
Non-extended savegame bump to be applied later
(cherry picked from commit e404d16929
3 years ago
96ea775b24
Avoid undefined behaviour in saveload chunk handlers
...
Use data() instead of &[0] to avoid issues with empty vectors
3 years ago
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
3 years ago
0b0d154788
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/ci-build.yml
# src/lang/german.txt
# src/lang/romanian.txt
# src/lang/slovak.txt
# src/lang/turkish.txt
# src/network/core/address.cpp
# src/network/core/tcp.h
# src/network/core/udp.cpp
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/newgrf_sl.cpp
# src/tree_cmd.cpp
# src/video/video_driver.hpp
# src/window.cpp
# src/window_gui.h
3 years ago
0dcb04f450
Fix #320 : Misspelling of SLXI chunk name
3 years ago
e7480620af
Include liblzma error code in message
3 years ago
54e2d1b851
Log SLXI version label at level sl=2
3 years ago
0748d540e8
Implement improved breakdown speed reductions for ships
3 years ago
5d351a14d2
Add new signal type: no-entry signal
...
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction
Add a setting for whether this is shown in the signal UI.
Off by default.
3 years ago
16f2ef227b
Store tunnel/bridge signal spacing on tile, adjust spacing to fit length
3 years ago
b2ef6c0de8
Add implementation of multi-aspect signalling and GRF support
...
Requires realistic braking
See: #247
3 years ago
13603cb8e1
Block signals into blocks with junctions now default to red with realistic braking
3 years ago
b8d5113c5a
Tracerestrict: Add slot action mode, try to acquire (only on reserve)
3 years ago
71dfd2900a
Add depot order flag for specific depot
...
Use upper half of order flags for extra depot flags
See: #302
3 years ago
6a009686c9
Fix #299 : Add estimated max speed (full) to template windows
3 years ago
4174fe727c
Add NewGRF feature: Extra station name strings
...
These are used when all the default names have been used up,
instead of "Town Station #NNN".
3 years ago
158608442c
Merge pull request #281 from VacuumBreather/train_speed_adaptation
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
3 years ago
9edc13b889
Make sure setting set correctly on loading existing saves
3 years ago
0f73fe765f
Merge pull request #293 from VacuumBreather/station_cargo_history
...
Add station cargo history
3 years ago
b438380a1e
Add station cargo history save/load support
3 years ago
5698507d0b
Change station cargo history storage format
...
Use uint16 to avoid truncation issues
Don't reserve memory for unused cargoes
Store history as ring buffer
Update history graph immediately on storage date
Show total waiting cargo
3 years ago
c4a596b756
Fix missing file from fb0403dc
3 years ago
fb0403dcee
Add save/load support for train speed adaptation
3 years ago
4d0cda12bd
Fix saving one byte at a time in Save_SPRG
3 years ago
f7f1d530b8
Codechange: instead of "naked" initializer lists, declare the type in the saveload macros
...
This to help variant's constructor to be able to resolve the constructor of the setting
3 years ago
9b1783809d
Add station cargo history
3 years ago
e1214a6d8b
Fix some type conversion warnings
3 years ago
3e66ffead0
Saveload: Allow threaded saves in network server mode
3 years ago
Jonathan G Rennison
SamuXarick
Loïc Guilloux
Tyler Trahan
Patric Stout
rubidium42
Andreas Schmitt