Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,460 Commits 12 Branches 180 Tags 451 MiB
670dbc739d
Commit Graph

52460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
73001ae1a9 Update: Translations from eints 
english (au): 3 changes by LordAro
 2021-11-06 18:47:14 +00:00
Michael Lutz
95c8467670 Fix 65cbde4b: Writing to uninitialized string when loading a currency NewGRF. 2021-11-06 19:15:29 +01:00
Loïc Guilloux
6ff0858b38
Fix #9669, cbe00ec: Only try valid reverse directions (#9672) 2021-11-06 17:32:37 +01:00
Dmitry Erlikh
33ef34189e
Fix #9648: add missing commas in crash message 2021-11-03 22:10:21 +01:00
dP
80e3397f85
Fix 3a1a915: Every 16th client never reconnects after server restart 2021-11-03 21:33:38 +01:00
Jonathan G Rennison
10c46946ae Version: Committing version data for tag: jgrpp-0.44-rc1 2021-11-03 02:57:16 +00:00
Jonathan G Rennison
258b81ae7f Fix missing includes in mixer.cpp 2021-11-03 02:56:24 +00:00
Jonathan G Rennison
ed92b2f59f Merge branch 'jgrpp-beta' into jgrpp 2021-11-03 02:32:17 +00:00
Jonathan G Rennison
1174b0c53f Remove OrthogonalTileIteratorStep 
Step sizes other than 1 are no longer used
 2021-11-03 02:26:46 +00:00
Jonathan G Rennison
f9e3c012f6 Fix missing include in bitmap_type.h 2021-11-03 02:12:54 +00:00
Jonathan G Rennison
e5668cb9ad CI: Remove regression test from MSYS job 2021-11-03 02:04:12 +00:00
Jonathan G Rennison
85d2d0daab Fix 3rd party optional comparison operators 2021-11-03 02:02:18 +00:00
Jonathan G Rennison
486e69f1f8 Fix use of optional from wrong namespace 2021-11-03 01:33:31 +00:00
Jonathan G Rennison
168dc4678d Avoid type alias of forward-declared template class 2021-11-03 01:29:27 +00:00
Jonathan G Rennison
914da4bdb9 Fix 1e0bea5b: Incorrect extern declarations 2021-11-03 01:18:36 +00:00
Jonathan G Rennison
3373be7b0d Fix assertion failure in SyncCompanySettings 2021-11-03 01:07:09 +00:00
Jonathan G Rennison
fea9acd687 Do not show signal window toggle size button in realistic braking mode 2021-11-03 00:51: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
6611ed5a53 Encode oversize map dimensions in non-extended game info serialisation 
Use non power of 2 values for sizes >= 64k
 2021-11-02 23:29:46 +00:00
Jonathan G Rennison
eaf5908a0b Add a constant for SERVER_GAME_INFO_EXTENDED max version 
Set max version correctly in QueryNetworkGameSocketHandler::SendGameInfo
 2021-11-02 22:49:26 +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
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
 2021-11-02 21:11:11 +00:00
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
 2021-11-02 19:23:24 +00:00
translators
9edb75ec0b Update: Translations from eints 
arabic (egypt): 7 changes by AviationGamerX
 2021-11-02 18:49:30 +00:00
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
 2021-11-02 18:02:37 +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
80236f5c4c Remove a dubious use of FIND_FIRST_BIT 2021-11-01 23:14:44 +00:00
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
 2021-11-01 23:14:29 +00:00
Jonathan G Rennison
1e0bea5b8d Replace FindFirstBit/FindFirstBit64 with a single template function 2021-11-01 23:00:44 +00:00
Jonathan G Rennison
d585ce75dd Use bitmath builtins for SetBitIterator when available 2021-11-01 22:11:27 +00:00
Jonathan G Rennison
e1e7b67270 Fix cargo mask truncation in CargoMaskValueFilter and LinkRefresher::RefreshLinks 2021-11-01 22:10:03 +00:00
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
 2021-11-01 21:18:24 +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
translators
00a6287f97 Update: Translations from eints 
arabic (egypt): 2 changes by AviationGamerX
 2021-11-01 18:49:20 +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
Jonathan G Rennison
c6f0559ad4 Fix const-correctness in script DoCommand string validation 
See: 665e3c1f
 2021-11-01 18:16:46 +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
a4a7240511 Change: Allow all tiles around docks to be docking tiles (#9578) 
(cherry picked from commit 38a64eb2aa)
 2021-10-31 13:25:26 +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
e34cc229d1 Version: Committing version data for tag: jgrpp-0.43.2 2021-10-29 21:19:36 +01:00
Jonathan G Rennison
6bc3481931 Fix MinGW compilation issues 2021-10-29 21:18:19 +01:00
Jonathan G Rennison
5586d1a20a Remove use of deprecated allocator rebind in cpp-btree 2021-10-29 21:12:16 +01:00
Jonathan G Rennison
9540d42427 Fix cast warning in GUIHouseList 
See: #307
 2021-10-29 20:36:15 +01:00
Jonathan G Rennison
4a57625183 Avoid cast warnings in network packet handling 
See: #307
 2021-10-29 20:31:28 +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
1d89fe3820 Add casts around engine property checks in GetEngineProperty 2021-10-29 20:27:12 +01:00