Commit Graph

39367 Commits

Author SHA1 Message Date
Jonathan G Rennison
58d8418f83 Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/arabic_egypt.txt
2021-11-10 01:05:30 +00:00
Tyler Trahan
48c1c7f221 Cleanup: Fix typo in overflowsafe_type comment 2021-11-09 20:51:38 +01:00
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
2021-11-09 18:50:34 +00:00
Jonathan G Rennison
d35b9719a9 Fix redundant declaration of GetLinkGraphJobDesc 2021-11-09 02:13:43 +00:00
Jonathan G Rennison
a731da3956 Suppress Wdeprecated-copy warning in btree_iterator 2021-11-09 01:49:48 +00:00
Jonathan G Rennison
2b8018f5d6 MinGW: Avoid function cast warnings with GetProcAddress 2021-11-09 01:08:28 +00:00
translators
0ad40ee868 Update: Translations from eints
arabic (egypt): 35 changes by AviationGamerX
2021-11-08 18:50:01 +00:00
Jonathan G Rennison
f67407d777 Fix missing include in core/overflowsafe_type.hpp
See: #334
2021-11-08 18:35:09 +00:00
Tyler Trahan
e9cb9c1135
Fix #9579: Object and HQ construction is Construction cost, not Property Maintenance (#9673) 2021-11-08 08:12:15 +00:00
Jonathan G Rennison
8f6549aed6 Merge branch 'pr-332' into jgrpp 2021-11-08 01:42:04 +00:00
Yourself
3a1e427b0c fix infinite recursion in FindFirstBit64 2021-11-07 18:22:40 -07:00
Jonathan G Rennison
fb604ded6b Fix restricted signal bit with semaphores for GRF custom signals 2021-11-08 00:51:45 +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
Guillaume Renoult
c38af72978
Update: add setting to hide news about competitors vehicle crash (#9653) 2021-11-07 19:54:50 +01:00
Tyler Trahan
b4bd7b367e
Feature: Ctrl-click to remove fully autoreplaced vehicles from list (#9639) 2021-11-07 19:53:54 +01:00
Tyler Trahan
08cb5ba2cd
Fix: Don't show screenshot GUI in screenshots (#9674) 2021-11-07 17:41:24 +01:00
J0anJosep
d0655a48ba Fix: Do not redraw vehicle lists when skip order command is tested. 2021-11-07 13:23:29 +01:00
Michael Lutz
8c558d74a5 Fix 55a11710: Curly braces need to be double-escaped for (std::)fmt. 2021-11-06 20:21:07 +01:00
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
258b81ae7f Fix missing includes in mixer.cpp 2021-11-03 02:56:24 +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
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