Commit Graph

51920 Commits

Author SHA1 Message Date
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
Jonathan G Rennison
d2e757db9a Set field size for PropertyID enum 2021-10-29 20:11:01 +01:00
Jonathan G Rennison
86e1f58bc0 Avoid unused variable warning when not using threads
See: #307
2021-10-29 20:10:39 +01:00
Jonathan G Rennison
0842621653 Remove unused _network_udp_mutex
See: #307
2021-10-29 20:05:16 +01:00
Jonathan G Rennison
8a7cb10813 Fix incorrect cast/colour operation in screenshot GetIndustryValue
See: #307
2021-10-29 20:03:29 +01:00
Jonathan G Rennison
23497dea35 Github: Enable blank issues, remove contact links section 2021-10-29 19:51:27 +01:00
Jonathan G Rennison
36f90607ba
Merge pull request #326 from telk5093/jgrpp
Update: Korean translation
2021-10-29 19:47:03 +01:00
Jonathan G Rennison
24c6dfe872 Merge branch 'master' into jgrpp-beta 2021-10-29 17:56:32 +01:00
TELK
afe7824270 Update: Korean translation up to aff6dbec2d 2021-10-29 19:16:09 +09:00
TELK
ed1c0c70ea Update: Korean translation up to 9254be5 2021-10-29 19:16:09 +09:00
TELK
7b12d23e4f Update: Korean translation 2021-10-29 19:16:09 +09:00
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
2021-10-28 23:51:24 +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
aff6dbec2d Show timetabled 0 wait times for stations/depots in timetable window 2021-10-27 00:24:26 +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
944f090b46 Add settings for minimum contiguous landmass size for town/city placement 2021-10-25 00:30:25 +01:00
Jonathan G Rennison
55620ff162 Add general function for checking size of contiguous tile area 2021-10-25 00:29:51 +01:00
Jonathan G Rennison
8b5b96af77 Fix typos in PostProcessNetworks 2021-10-24 13:33:02 +01:00
Jonathan G Rennison
28fd549808 Decline company takeover offer on company's behalf if company has no client 2021-10-24 12:23:52 +01:00
Jonathan G Rennison
296987153b Add console command to offer a company for sale 2021-10-24 00:11:51 +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
Jonathan G Rennison
a9c2c7288a Fix compilation when ENABLE_NETWORK_SYNC_EVERY_FRAME is defined
This is set by RANDOM_DEBUG

See also: https://github.com/OpenTTD/OpenTTD/issues/9624
2021-10-19 00:50:05 +01:00
Jonathan G Rennison
b58ff65c5c Debug: Fix company money state checksum being logged with wrong company 2021-10-19 00:39:41 +01:00
Jonathan G Rennison
4a1e347f8e Fix desync when using "perfect" tree placement mode in arctic climate 2021-10-19 00:38:57 +01: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
406b81abb1 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.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-18 00:43:50 +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
Jonathan G Rennison
900b9fdf3b Fix crash with wrong-way running on signalled tunnel/bridge
When using the ignore signals buttons, and exiting the bridge/tunnel
in some cases
2021-10-16 19:59:43 +01:00
Jonathan G Rennison
9254be5b3c Debug: Show info of all aircraft parts in vehicle debug window 2021-10-12 20:35:07 +01:00
Jonathan G Rennison
c64f48f2bd Debug: Add direction and spritenum info to vehicle debug window 2021-10-12 20:26:13 +01:00
Jonathan G Rennison
71a5abd42b Fix aircraft shadows being drawn facing the wrong direction 2021-10-12 20:19:53 +01:00
translators
eaeab34e7a Update: Translations from eints
norwegian (bokmal): 10 changes by Anolitt
korean: 9 changes by telk5093
russian: 9 changes by Ln-Wolf
finnish: 10 changes by hpiirai
spanish: 8 changes by MontyMontana
french: 9 changes by glx22

(cherry picked from commit 8dd846bad4)
2021-10-08 18:19:31 +01:00
translators
33a55c5fd4 Update: Translations from eints
hindi: 67 changes by ritwikraghav14

(cherry picked from commit c562b4c527)
2021-10-08 18:19:25 +01:00
translators
9831644112 Update: Translations from eints
spanish (mexican): 2 changes by absay

(cherry picked from commit 37b285ad83)
2021-10-08 18:18:51 +01:00