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 |
|
Jonathan G Rennison
|
e1e7b67270
|
Fix cargo mask truncation in CargoMaskValueFilter and LinkRefresher::RefreshLinks
|
3 years ago |
|
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
|
3 years ago |
|
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
|
3 years ago |
|
translators
|
00a6287f97
|
Update: Translations from eints
arabic (egypt): 2 changes by AviationGamerX
|
3 years ago |
|
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
|
3 years ago |
|
Jonathan G Rennison
|
c6f0559ad4
|
Fix const-correctness in script DoCommand string validation
See: 665e3c1f
|
3 years ago |
SamuXarick
|
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 |
Loïc Guilloux
|
a4a7240511
|
Change: Allow all tiles around docks to be docking tiles (#9578)
(cherry picked from commit 38a64eb2aa)
|
3 years ago |
|
Loïc Guilloux
|
a84feb3444
|
Fix 39e90ec: Integers for scripts are 64bit, but saved as 32bit (#9415)
(cherry picked from commit ddafc0de05)
|
3 years ago |
|
Jonathan G Rennison
|
fb8020916a
|
Add upstream savegame version fields
|
3 years ago |
|
Jonathan G Rennison
|
5ec1573ccd
|
Add separate max load savegame version, set savegame version values
|
3 years ago |
|
Jonathan G Rennison
|
61cc60099a
|
Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
|
3 years ago |
|
Jonathan G Rennison
|
e34cc229d1
|
Version: Committing version data for tag: jgrpp-0.43.2
|
3 years ago |
|
Jonathan G Rennison
|
6bc3481931
|
Fix MinGW compilation issues
|
3 years ago |
|
Jonathan G Rennison
|
5586d1a20a
|
Remove use of deprecated allocator rebind in cpp-btree
|
3 years ago |
|
Jonathan G Rennison
|
9540d42427
|
Fix cast warning in GUIHouseList
See: #307
|
3 years ago |
|
Jonathan G Rennison
|
4a57625183
|
Avoid cast warnings in network packet handling
See: #307
|
3 years ago |
|
Jonathan G Rennison
|
6ba53a9a68
|
Add ifdef around 32 bit length limit check in SlSetLength
|
3 years ago |
|
Jonathan G Rennison
|
1d89fe3820
|
Add casts around engine property checks in GetEngineProperty
|
3 years ago |
|
Jonathan G Rennison
|
d2e757db9a
|
Set field size for PropertyID enum
|
3 years ago |
|
Jonathan G Rennison
|
86e1f58bc0
|
Avoid unused variable warning when not using threads
See: #307
|
3 years ago |
|
Jonathan G Rennison
|
0842621653
|
Remove unused _network_udp_mutex
See: #307
|
3 years ago |
|
Jonathan G Rennison
|
8a7cb10813
|
Fix incorrect cast/colour operation in screenshot GetIndustryValue
See: #307
|
3 years ago |
|
Jonathan G Rennison
|
23497dea35
|
Github: Enable blank issues, remove contact links section
|
3 years ago |
|
translators
|
ccf70fc4b3
|
Update: Translations from eints
dutch: 2 changes by Afoklala
|
3 years ago |
|
Jonathan G Rennison
|
36f90607ba
|
Merge pull request #326 from telk5093/jgrpp
Update: Korean translation
|
3 years ago |
|
Jonathan G Rennison
|
24c6dfe872
|
Merge branch 'master' into jgrpp-beta
|
3 years ago |
TELK
|
afe7824270
|
Update: Korean translation up to aff6dbec2d
|
3 years ago |
|
TELK
|
ed1c0c70ea
|
Update: Korean translation up to 9254be5
|
3 years ago |
|
TELK
|
7b12d23e4f
|
Update: Korean translation
|
3 years ago |
|
Jonathan G Rennison
|
da282c3ecc
|
Merge branch 'master' into jgrpp-beta
# Conflicts:
# .github/workflows/ci-build.yml
# CMakeLists.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/korean.txt
# src/lang/norwegian_bokmal.txt
# src/lang/russian.txt
# src/lang/spanish.txt
# src/misc_gui.cpp
# src/newgrf.cpp
|
3 years ago |
|
translators
|
edf7b02ddb
|
Update: Translations from eints
german: 2 changes by Wuzzy2
|
3 years ago |
|
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
|
3 years ago |
|
translators
|
488cf26406
|
Update: Translations from eints
swedish: 44 changes by joeax910
japanese: 1 change by clzls
chinese (simplified): 2 changes by clzls
|
3 years ago |
|
Jonathan G Rennison
|
aff6dbec2d
|
Show timetabled 0 wait times for stations/depots in timetable window
|
3 years ago |
|
Jonathan G Rennison
|
53139c2405
|
Add current day/month to tracerestrict and conditional order conditionals
|
3 years ago |