Commit Graph

52329 Commits (58d8418f8399ce6fdd6ebd6ed683cdc39010251d)
 

Author SHA1 Message Date
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
Jonathan G Rennison 49228a5ee4 Disable unused strings check on PRs for now
See: #333
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 10c46946ae Version: Committing version data for tag: jgrpp-0.44-rc1 3 years ago
Jonathan G Rennison 258b81ae7f Fix missing includes in mixer.cpp 3 years ago
Jonathan G Rennison ed92b2f59f Merge branch 'jgrpp-beta' into jgrpp 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 e5668cb9ad CI: Remove regression test from MSYS job 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