Jonathan G Rennison
2e7f8d2e1e
Add inclined foundation option to object edge foundation mode
...
Bump feature version
2022-01-23 13:17:13 +00:00
Jonathan G Rennison
d81cbc25b8
Add setting to allow hiding viewport labels of inidivudal waypoints
2022-01-21 23:37:53 +00:00
Jonathan G Rennison
26fb0940c6
Add client setting for whether to sync locale settings with server in multiplayer
2022-01-21 01:37:15 +00:00
Jonathan G Rennison
904ff6757d
Add slot support to road vehicles, ships and aircraft
2022-01-19 00:10:49 +00:00
Jonathan G Rennison
ff3473fe6a
Add support for multiple scheduled dispatch schedules per order list
2022-01-13 19:46:43 +00:00
Yourself
7823c81597
Add: Through load speed limit setting
2022-01-08 22:27:43 -07:00
Jonathan G Rennison
7e313d120c
Fix narrowing conversion warnings
2022-01-03 22:31:36 +00:00
Jonathan G Rennison
a14df8dfe2
Merge PR #351 into jgrpp
2022-01-03 19:18:57 +00:00
Jonathan G Rennison
e993afcd99
Store encrypted company password hashes in server saves
...
Restore when loading back into the server if server has required secret
2022-01-03 03:09:32 +00:00
Jonathan G Rennison
1f50106466
Saveload: Add functions to save/load to arbitrary buffers
2022-01-03 02:35:50 +00:00
Jonathan G Rennison
89181ea9fd
Add setting to increase cost/distance of aircraft linkgraph links
2022-01-02 01:15:54 +00:00
Michael Lutz
b0990fcff7
Codechange: Make TileIndex a "strong" typedef to give it a distinct type.
...
This is accomplished by changing it to a single member struct with the
appropriate operator overloads to make it all work with not too much
source modifications.
2021-12-16 22:28:32 +01:00
Jonathan G Rennison
762b656b53
Fix #9740 : Fix loading of gamelog change items from savegame ver >= 294
2021-12-10 22:46:16 +01:00
Jonathan G Rennison
77d3be3d3b
Fix loading of gamelog revision text in upstream savegame loader
2021-12-10 01:27:19 +00:00
Jonathan G Rennison
3d0b1a3b12
Fix loading of gamelog change items from savegame ver >= 294
...
See: https://github.com/OpenTTD/OpenTTD/issues/9740
2021-12-10 01:26:15 +00:00
Jonathan G Rennison
2d71ec1c5a
Bump savegame for object ground types
2021-12-05 21:46:09 +00:00
Jonathan G Rennison
0691b25e17
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
2021-11-20 13:15:32 +00:00
Charles Pigott
cf16f452da
Fix #9680 : Recalculating aircraft positions before map array updates caused crashes ( #9699 )
2021-11-15 13:39:41 +00:00
Jonathan G Rennison
74bfe4e6d2
Allow placing routing restrictions on tunnel/bridge entrance/exit signals
...
No reserve through support
2021-11-13 22:28:14 +00:00
Jonathan G Rennison
3308edf792
Try to extend reservation when passing sighting distance of non-end signal
2021-11-12 01:02:29 +00:00
Jonathan G Rennison
3d4261a33a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/order_cmd.cpp
# src/table/settings/news_display_settings.ini
2021-11-08 00:44:18 +00:00
Dmitry Erlikh
33ef34189e
Fix #9648 : add missing commas in crash message
2021-11-03 22:10:21 +01:00
Jonathan G Rennison
486e69f1f8
Fix use of optional from wrong namespace
2021-11-03 01:33:31 +00:00
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
2021-11-03 00:45:12 +00:00
Jonathan G Rennison
3cff5e53e4
Add train cached_curve_speed_mod to VENC, cache checks and debug window
2021-11-02 22:37:34 +00:00
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
2021-11-02 17:51:38 +00:00
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
2021-11-02 00:51:54 +00:00
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
2021-11-01 18:54:43 +00:00
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
2021-11-01 18:33:39 +00:00
SamuXarick
0563c0e308
Fix #9591 : Update station docking tiles upon placing a water object on a docking tile ( #9594 )
...
(cherry picked from commit e404d16929
2021-10-31 13:26:39 +00:00
Loïc Guilloux
a84feb3444
Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit ( #9415 )
...
(cherry picked from commit ddafc0de05
2021-10-31 10:04:06 +00:00
Jonathan G Rennison
fb8020916a
Add upstream savegame version fields
2021-10-31 09:47:42 +00:00
Jonathan G Rennison
5ec1573ccd
Add separate max load savegame version, set savegame version values
2021-10-31 09:46:02 +00:00
Jonathan G Rennison
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
2021-10-29 22:22:54 +01:00
Jonathan G Rennison
6ba53a9a68
Add ifdef around 32 bit length limit check in SlSetLength
2021-10-29 20:28:03 +01:00
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
2021-10-28 01:07:51 +01:00
Jonathan G Rennison
53139c2405
Add current day/month to tracerestrict and conditional order conditionals
2021-10-26 23:39:40 +01:00
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
2021-10-25 18:10:15 +01:00
Jonathan G Rennison
ec8512e2ea
When declining to buy a company, ask the next company immediately
2021-10-24 00:07:54 +01:00
Loïc Guilloux
f2c03a77f0
Change: Don't store not to be activated newGRFs in savegames ( #9627 )
2021-10-20 22:14:23 +02:00
Jonathan G Rennison
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
2021-10-18 18:01:27 +01:00
Jonathan G Rennison
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
2021-10-17 22:55:50 +01:00
Jonathan G Rennison
b00d5e07d2
Fix fb0549ea: Incorrect cherry-pick removed end marker
2021-10-17 01:45:51 +01:00
Jonathan G Rennison
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
2021-10-17 01:44:45 +01:00
Tyler Trahan
fb0549ea59
Feature: Configurable subsidy duration
...
(cherry picked from commit d09210e1c6
2021-10-08 18:13:02 +01:00
Jonathan G Rennison
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
2021-10-08 18:12:04 +01:00
Patric Stout
573ab48e9c
Fix 81062163: for (really) old games, station bus/truck station cache was not updated ( #9366 )
...
(cherry picked from commit 1e432fbd71
2021-10-08 18:11:02 +01:00
Patric Stout
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
2021-10-08 18:11:02 +01:00
Jonathan G Rennison
6f16655e6e
Add "special events" log. Add console command, include in crash logs.
2021-10-04 20:54:12 +01:00
Jonathan G Rennison
2e022d5194
Move game events to new event_logs header/cpp files
2021-10-04 20:43:50 +01:00
