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 |
|
translators
|
a0831cec39
|
Update: Translations from eints
swedish: 1 change by joeax910
|
2021-10-24 18:46:47 +00: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 |
|
translators
|
279fe11b03
|
Update: Translations from eints
indonesian: 2 changes by hadyatmo
|
2021-10-23 18:47:57 +00:00 |
|
frosch
|
e8bff0ad03
|
Change: Suppress panning in intro game, while user is interacting with the GUI. (#9645)
|
2021-10-23 15:13:39 +02:00 |
|
frosch
|
111a47af0d
|
Codechange: rename 'info_view' to 'rotor_in_gui', because it is only used by helicopters.
|
2021-10-23 14:45:08 +02:00 |
|
frosch
|
bc984d9af5
|
Codechange: remove redundant 'info_view' parameter, it can be derived from 'image_type'.
|
2021-10-23 14:45:08 +02:00 |
|
translators
|
bf0210229c
|
Update: Translations from eints
english (us): 2 changes by 2TallTyler
vietnamese: 2 changes by KhoiCanDev
catalan: 2 changes by J0anJosep
portuguese (brazilian): 2 changes by Vimerum
|
2021-10-22 18:53:01 +00:00 |
|
Joan Josep
|
b2e83b4da6
|
Fix: Draw rotor in cursor when dragging helicopters. (#9612)
|
2021-10-22 19:39:47 +02:00 |
|
Loïc Guilloux
|
08c048e0a1
|
Fix #9643, 95386dc: Incorrect determination of screenshot format (#9644)
|
2021-10-22 16:34:48 +02:00 |
|
translators
|
ae340f415e
|
Update: Translations from eints
russian: 2 changes by Ln-Wolf
|
2021-10-21 18:47:48 +00:00 |
|
Loïc Guilloux
|
f2c03a77f0
|
Change: Don't store not to be activated newGRFs in savegames (#9627)
|
2021-10-20 22:14:23 +02:00 |
|
Loïc Guilloux
|
bc1b84cbbb
|
Fix #9630: intro game could zoom in/out more than allowed by settings (#9633)
Also fixes #9622
|
2021-10-20 22:08:08 +02:00 |
|
translators
|
b043d58b92
|
Update: Translations from eints
swedish: 4 changes by joeax910
spanish: 1 change by MontyMontana
|
2021-10-20 18:49:34 +00:00 |
|
Loïc Guilloux
|
eed49d7792
|
Fix #9626, ddafc0d: Incorrect loading of script saved data (#9629)
|
2021-10-20 12:23:16 +02:00 |
|
translators
|
e68a51eced
|
Update: Translations from eints
korean: 3 changes by telk5093
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
|
2021-10-19 18:47:37 +00:00 |
|
glx22
|
1c0700e0c0
|
Fix #9624: compilation with RANDOM_DEBUG
|
2021-10-19 09:05:00 +01:00 |
|
glx22
|
14429bbe8a
|
Change: [Actions] Also check desync debug
|
2021-10-19 09:05:00 +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 |
|
translators
|
6289b4dd81
|
Update: Translations from eints
greek: 2 changes by dionisis84
russian: 1 change by Ln-Wolf
finnish: 2 changes by hpiirai
tamil: 88 changes by Aswn
|
2021-10-18 18:48:12 +00: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 |
|
Charles Pigott
|
53e17d07d2
|
Fix #9595: Always use plural forms of cargo for subsidy strings (#9619)
|
2021-10-18 09:43:14 +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 |
|
Patric Stout
|
5bcdf16dc5
|
Fix 01603d9e: [Preview] publishing preview failed due to recent changes (#9621)
Since 01603d9e we run under root, not under github user. In result,
the location of "aws" binary changed.
|
2021-10-17 22:42:29 +02:00 |
|
Patric Stout
|
01603d9e47
|
Fix 3046a6ce: [Preview] building preview failed to patch LZMA (#9620)
The job was started under a non-priv user, which did not have
permission to patch the emscripten files required to make LZMA
work.
|
2021-10-17 21:59:50 +02:00 |
|
Charles Pigott
|
86c295bb3b
|
Change: Ignore refresh_rate setting when vsync is enabled
|
2021-10-17 19:25:03 +01:00 |
|
Charles Pigott
|
e09f251fc6
|
Fix #9614: Refresh rate dropdown was still active when vsync was enabled
|
2021-10-17 19:25:03 +01:00 |
|
Charles Pigott
|
0853c1979b
|
Feature: Button to toggle showing advanced signal types (#9617)
|
2021-10-17 19:24:50 +01:00 |
|
Charles Pigott
|
3b7daca832
|
Change: Don't use 'server address' string in server list when displaying an invite code (#9615)
|
2021-10-17 18:14:25 +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 |
|
Patric Stout
|
78eece71d9
|
Codechange: "set but not used" warning when disabling assert() (#9613)
DebugCheckSanity() is unused when asserts are disabled. While at it,
use WITH_ASSERT over NDEBUG, as that means we also run this code
during beta/RC.
|
2021-10-16 22:06:08 +02: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 |
|
translators
|
d66dea5d83
|
Update: Translations from eints
indonesian: 9 changes by bsuseno
|
2021-10-15 18:47:17 +00: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
|
4b96244b4d
|
Update: Translations from eints
romanian: 6 changes by kneekoo
|
2021-10-12 18:47:28 +00:00 |
|
glx22
|
cbe00ec651
|
Fix: Try all possible reverse directions when a ship reaches a dead end
|
2021-10-11 21:11:13 +02:00 |
|
glx22
|
207cf7bbdd
|
Change: Reverse ship when leaving docks if a better path exists
|
2021-10-11 21:11:13 +02:00 |
|
translators
|
d0092925c9
|
Update: Translations from eints
romanian: 9 changes by kneekoo
|
2021-10-11 18:48:06 +00:00 |
|
translators
|
7d831be3ab
|
Update: Translations from eints
indonesian: 6 changes by bsuseno
|
2021-10-10 18:46:33 +00:00 |
|