Commit Graph

34865 Commits (98aa58a6b4d451c3ef73c3d2db20543ca4039c8f)

Author SHA1 Message Date
Jonathan G Rennison e3d167f9f0 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	config.lib
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/station_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/window.cpp
6 years ago
Jonathan G Rennison 4a162c5502 Merge branch 'cpp-11' into save_ext 6 years ago
Jonathan G Rennison 0bed63b77f Merge branch 'master' into cpp-11 6 years ago
Joan Josep 823c5bfa3b Fix #5978: Ensure group GUI stats and lists are invalidated properly (3298, Juanjo) (#7046) 6 years ago
translators ca7ee34502 Update: Translations from eints
croatian: 8 changes by VoyagerOne
6 years ago
PeterN 89f0017a67 Fix #7050: Missing guard around network chat message function for compiling with networking disabled. (#7058) 6 years ago
Alberth289346 f4b8a67aed Fix #6408: Improve wording of the dragging signal distance tooltips (juanjo) (#7055) 6 years ago
nikolas 4fc1b2baae Fix: Grammar in a bunch of comments (#7054) 6 years ago
PeterN 5ff0c24993 Fix #6780: Some windows didn't get updated from OnTick() (#7048) 6 years ago
Joan Josep 9aecbac2b4 Codechange: Define INVALID_TOWN as a TownID (#7044) 6 years ago
Joan Josep 96854b2b8b Codechange #5859: Simplify CheckTrainStayInDepot() (#7045) 6 years ago
Nikolas Nyby 0f9d1019e6 Add: Mexican Peso currency
OpenTTD doesn't have any pesos, so I've added Mexican pesos,
at its current exchange rate: 1GBP = 24.39MXN, rounded to 24.
6 years ago
nikolas 82e530b517 Fix: Remove duplicate town name "Huacho" (#7038)
Huacho appears twice in the Spanish town names list. This change removes
the second one, and replaces it with a new one: Medellin.
6 years ago
Johannes E. Krause 06cd561cea Add: when placing non-rectangular airport, consider airport tile table tiles only (patch by adf88, #6613) 6 years ago
Nikolas Nyby 65746a0275 Fix: Spelling fixes on some Latin American town names 6 years ago
translators c80608a83c Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
spanish (mexican): 3 changes by Absay
6 years ago
nikolas fa95af2da8 Codechange: Fix typo in variable name: pices -> pieces (#7033) 6 years ago
Peter Nelson c693463c29 Fix: Always draw dirty blocks, else fast-forward is super fast. 6 years ago
Peter Nelson 806e7d25dd Change: Use GUITimer class instead of bare int/uints. 6 years ago
Peter Nelson 59fe4f28c8 Change: Animate text effects by real time instead of game ticks. 6 years ago
Peter Nelson ead9c9eab5 Change: Switch various window timers to real time instead of game ticks. 6 years ago
Peter Nelson 15320a37b9 Change: OnGameTick() is only called when not paused. 6 years ago
Peter Nelson 2a8fa5fef9 Change: Split up Window::OnTick into OnGameTick and OnRealtimeTick. Adjust timers to work with milliseconds instead of ticks. 6 years ago
translators e34a6c58ea Update: Translations from eints
italian: 1 change by lorenzodv
french: 29 changes by glx
6 years ago
Gabda87 a0293d313d Add #4115: default company colour setting (#6998)
Works only in single player.
6 years ago
Andy ad5a9daed5 Change: Desert tiles are now half-desert if a neighboured tile is non-desert or sea/coast. (patch by frosch123) #4754 (#7015) 6 years ago
Andy e934f09f02 Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 (#7018) 6 years ago
Jonathan G Rennison 7e5455a07d Merge remote-tracking branch 'kiwitreekor/korean-translation' into jgrpp 6 years ago
translators 5e51d9ee82 Update: Translations from eints
hebrew: 22 changes by dnd_man
spanish (mexican): 1 change by Absay
6 years ago
Jonathan G Rennison 0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison 635c7ca2d5 Merge branch 'save_ext' into more_cond_orders-sx
# Conflicts:
#	src/lang/english.txt
#	src/order_type.h
6 years ago
Jonathan G Rennison 0dba091d79 Merge branch 'cpp-11' into save_ext
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
6 years ago
Jonathan G Rennison 962a9c5430 Merge branch 'master' into cpp-11
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/saveload/saveload.cpp
6 years ago
J0an Josep effb7da5b4 Doc: Fix spelling in comments. 6 years ago
J0an Josep c304aa50e9 Fix: [NPF] Don't look two-way for road vehicles when looking for a depot. Road vehicles shouldn't reverse all of a sudden. 6 years ago
Juanjo! 1db66a285e Codechange: [YAPF] Stop looking for an automatic servicing road depot when the cost of a path exceeds max. penalty. 6 years ago
Juanjo! edb7adf183 Codechange: [NPF] Stop looking for an automatic servicing (rail/road) depot when the cost of a path exceeds max. penalty. 6 years ago
J0an Josep 19a2f84943 Fix #7001: Pathfinders should see standard road stations as tiles where to reverse. 6 years ago
kiwitreekor d1b98855de
Fix typos 6 years ago
Niels Martin Hansen 15a7f9da9d Fix 13056ae: PR #7017 added new enum value in bad position, move it 6 years ago
kiwitreekor 030d6a3024
Update Korean Translation 6 years ago
Eddi-z 13056aedbc Add: Conditional order for max. reliability (patch by Cirdan, #6360) (#7017) 6 years ago
glx 92d3358db5 Fix: [Win32] don't mess with std[out|err|in] if we can't allocate a console 6 years ago
Niels Martin Hansen b8b6954fb5 Fix 6a3d411: Silence truncation warning 6 years ago
Niels Martin Hansen cb60a5e57f Change: Fluidsynth music driver plays through mixer instead of own audio driver 6 years ago
Niels Martin Hansen d6c06de5ad Add: Mixer feature for streaming sampled music 6 years ago
Niels Martin Hansen 12ba56c5a3 Fix 6accbf9: Silence warnings about unused fread() result 6 years ago
Juanjo 9e30054de9 Codechange: Use window class as expected. 6 years ago
J0an Josep 16a91130a7 Codechange: Use INVALID_TRACKDIR instead of 0xFF. 6 years ago
translators 49ab02c084 Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison 7f73c36686 Improve display of non-overlay horizontal dual track types 6 years ago
Jonathan G Rennison 4f1d54564e Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
6 years ago
translators 391bc45c41 Update: Translations from eints
spanish (mexican): 10 changes by Absay
6 years ago
Alberth 4a255e879a Fix #6966: Only allow switching to a valid company. 6 years ago
translators e8f9975409 Update: Translations from eints
finnish: 160 changes by ln
6 years ago
glx c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 6 years ago
Joan Josep 8890926b0d Fix #6974: Add save-load filter widget to api 6 years ago
glx 3be6ab555c Change: use vcpkg integration in Visual Studio
Removes the need for us to provide OpenTTD-useful package
6 years ago
translators cab39ff47f Update: Translations from eints
russian: 8 changes by Lone_Wolf
6 years ago
Jonathan G Rennison afae7ca810 Change custom bridge head second rail type infrastructure count factor 6 years ago
Jonathan G Rennison 70020e1a5c Fix incorrect accounting of rail tunnel/bridge infrastructure counts
Regression from dual rail types change
6 years ago
Jonathan G Rennison d78db1c004 Dump tile data in Vehicle::DumpVehicleFlags 6 years ago
Jonathan G Rennison 65b9a103ad Initial implementation of two rail types per tile 6 years ago
Jonathan G Rennison 8128d027c0 Fix wrong return value in scope_dumper::TileInfo 6 years ago
Jonathan G Rennison ccf13467db Prevent AIs from creating or adding to rail custom bridge heads 6 years ago
Jonathan G Rennison 7da1f8b592 Merge branch 'master' into jgrpp 6 years ago
Jonathan G Rennison 8b1991983f Make reverse behind signal tracerestrict action an advanced feature in GUI 6 years ago
translators 2ab4b5dd03 Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
6 years ago
translators 2978388153 Update: Translations from eints
spanish: 5 changes by SilverSurferZzZ
spanish (mexican): 23 changes by Absay
6 years ago
translators 777cfe5611 Update: Translations from eints
chinese (simplified): 2 changes by ww9980
korean: 23 changes by kevinhigh
6 years ago
translators 863b80e880 Update: Translations from eints
spanish: 6 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison 2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp
# Conflicts:
#	src/string.cpp
6 years ago
translators 68b5b11b7c Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison cd41683b9b Add tracerestrict feature reverse behind signal 6 years ago
Michael Lutz 32ce1ce347 Add: [OSX] Text layout using the native CoreText API.
By default, the native API will be used instead of ICU, but if ICU is
forced in using configure, it will take precedence.
6 years ago
Michael Lutz 4bf216993a Add: [OSX] Native text caret handling. 6 years ago
Michael Lutz 8d7cd6a526 Add: [OSX] Native natural sort implementation. 6 years ago
Michael Lutz 05a93c121c Fix: [OSX] Macro redefinition warning. 6 years ago
translators c63f0b3005 Update: Translations from eints
chinese (simplified): 28 changes by ww9980
spanish: 12 changes by SilverSurferZzZ
6 years ago
translators cd44e33f4e Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
portuguese: 2 changes by Samu
6 years ago
Jonathan G Rennison a315d39067 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
6 years ago
Jonathan G Rennison cae0b21534 Trace restrict: Bump size of item type field
Reserve value for TRIT_REVERSE
6 years ago
Jonathan G Rennison bd6f7b29fc Fix incorrect description of TraceRestrictPathfinderPenaltyAuxField enum 6 years ago
translators 587c2149b6 Update: Translations from eints
croatian: 23 changes by VoyagerOne
spanish: 8 changes by SilverSurferZzZ
6 years ago
Michael Lutz 3b8db31a49 Fix: [Win32] Align sprite glyphs to the font baseline when using Uniscribe text layout. 6 years ago
translators 88894166e8 Update: Translations from eints
italian: 23 changes by lorenzodv
spanish: 2 changes by SilverSurferZzZ
6 years ago
comicsads b93fad7481 Fix: Spelling in code comment (#6984) 6 years ago
Jonathan G Rennison a26db59349 Add Action 5 support for programmable signals graphics 6 years ago
Jonathan G Rennison 5b0cca4b57 Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
6 years ago
Jonathan G Rennison a6c5951b2f Fix flags field not being received in Reply_CLIENT_FIND_SERVER_extended 6 years ago
translators eab3aa16aa Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison 7f87e3d61c Add an action 5 type ID remapping mechanism 6 years ago
Jonathan G Rennison 26ec41ebd5 Refactor Action 14 property mapping to make it more generic 6 years ago
Jonathan G Rennison b1190b32b0 Merge branch 'master' into jgrpp 6 years ago
Jonathan G Rennison e3207a77fb Add setting to control if and how land purchasing is permitted 6 years ago
Jonathan G Rennison 2ab0a9611b Rename Action0RemapFallbackMode to GRFPropertyMapFallbackMode 6 years ago
damfr 5d8b9de482 Add: Message popup when trying to overwrite a different savegame 6 years ago
damfr 1b3ce25c07 Add: Warning in save description when showing a save whith a different id 6 years ago
damfr 5f6858c379 Add: Setting to save a unique id for each savegame 6 years ago
Jonathan G Rennison c9c3e6f574 Fix use of uint8 for file slot handles 6 years ago
damfr 868c6f924a Add: Filter box to the save and load windows (#6974)
Save and heightmap names can be filtered.
6 years ago
translators af4a21bd82 Update: Translations from eints
korean: 4 changes by telk5093
spanish: 3 changes by SilverSurferZzZ
russian: 8 changes by Lone_Wolf
6 years ago
Niels Martin Hansen 9e30fbab34 Fix #6864: Normalise colour use in Frame rate window 6 years ago
Niels Martin Hansen cb1fcc4765 Doc: More notes for developers adding new PerformanceElements 6 years ago
Niels Martin Hansen 1ee20fac9a Codechange: Wrong name for include guard 6 years ago
Niels Martin Hansen 810887af30 Fix #6498: Use int64 for all company rating calculations 6 years ago
Niels Martin Hansen c618a7c093 Fix 6298b96: Changing music set did not save new setting 6 years ago
Niels Martin Hansen c84b9913bd Fix #6676: Prevent helicopters from stopping in midair during some kinds of landing
This adds a new flag that gets stored in the savegame, but it should still be compatible both ways, hence no save version bump.
6 years ago
translators f35a59fd38 Update: Translations from eints
spanish (mexican): 2 changes by Absay
6 years ago
Jonathan G Rennison 10320747a9 Allow purchasing a region of tile at once, by dragging 6 years ago
Jonathan G Rennison 46b1ea81e4 Add company rate limit for land area purchasing 6 years ago
Jonathan G Rennison 9608912d29 Merge branch 'newgrf-property-mapping' into jgrpp 6 years ago
Jonathan G Rennison 2e539dfeca Fix typo in static assert message 6 years ago
Jonathan G Rennison f3c52f1b6c Merge branch 'master' into jgrpp 6 years ago
translators 16a36dffa0 Update: Translations from eints
spanish: 2 changes by SilverSurferZzZ
6 years ago
Jonathan G Rennison c1df63a2eb Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/viewport.cpp
6 years ago
Jonathan G Rennison df0aa2ed4b Add pillar and station height checks to bridge upgrade command 6 years ago
frosch 1a1204472e Revert: Sprite sorting optimisation sorted incorrectly.
This reverts commit 25ab9c1997.
6 years ago
Niels Martin Hansen 68e6b5531a Update: Developer credits 6 years ago
Jonathan G Rennison 8b37e5aac2 Implement custom bridge pillar flag support
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
6 years ago
Jonathan G Rennison 989577d40c Add support for adding a third error line to the error GUI
Add support for a second error string ID to CommandCost
6 years ago
Charles Pigott 6accbf9afc Fix #6969: Account for BOM when reading script files 6 years ago
Jonathan G Rennison 6df12e77b6 Refactor/de-duplicate rail station bridge above check methods 6 years ago
translators 278a705bbb Update: Translations from eints
indonesian: 41 changes by UseYourIllusion
6 years ago
Jonathan G Rennison beaddc8a98 Set minimum bridge height clearances for default stations 6 years ago
translators 71cda6ca1d Update: Translations from eints
spanish: 10 changes by SilverSurferZzZ
6 years ago
translators 6950ea0ba7 Update: Translations from eints
indonesian: 18 changes by UseYourIllusion
6 years ago
Jonathan G Rennison 2c88645bac Merge branch 'newgrf-property-mapping' into jgrpp 6 years ago
Jonathan G Rennison 04536952ee Fix Action 0 mapped property length handling
Fix case when Num-info != 1
6 years ago
Jonathan G Rennison 2bb6877f18 Fix syntax of static_assert 6 years ago
Jonathan G Rennison ceae4516ca Add remappable properties for station min bridge height and bridge menu icon 6 years ago
Jonathan G Rennison 06c458cb19 Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
6 years ago
Jonathan G Rennison 9a6a66a054 Add general NewGRF Action 0 property mapping scheme to Action 14 6 years ago
Jonathan G Rennison cb459132ac Merge branch 'master' into newgrf-feature-detection 6 years ago
Jonathan G Rennison c10f6f9abb Fix incorrect method documentation of ChangeGRFFeatureSetPlatformVarBit 6 years ago
translators 16cc482d57 Update: Translations from eints
croatian: 2 changes by VoyagerOne
6 years ago
Greg-21 4ba73dac95 Doc: Changed several files to unificate them... (#6964)
...with those from release 1.8 branch.
6 years ago
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Jonathan G Rennison 83a063f51c Add train is in slot conditional order 6 years ago
Jonathan G Rennison c632539bb7 Prevent adding train slot state conditional orders to non-train vehicles 6 years ago
translators ccd9d77b94 Update: Translations from eints
italian: 2 changes by lorenzodv
6 years ago
Niels Martin Hansen 9b560eaa51 Fix: Industry chain window layout no more unnecessarily large when the number of cargoes in/out isn't large either 6 years ago
Niels Martin Hansen e66cec8f86 Add: NewGRF support for 16-in-16-out industries 6 years ago
Niels Martin Hansen 8859381d30 Add: Industries can produce and accept up to 16 different cargoes 6 years ago
translators 32b9ee7063 Update: Translations from eints
latvian: 3 changes by krixis02
6 years ago
Jonathan G Rennison 91e08c6cea Merge branch 'cpp-btree' into jgrpp 6 years ago
Jonathan G Rennison 7690fe8572 cpp-btree: Update to match upstream
minor optimization: minimize calls to end()

Minor optimization: increase the chances that the compiler will inline calls to end().
Has been observed to make a difference with gcc 4.9.3.

Fix build and warnings on MSVC (2017)
Uses static_assert, a C++11 feature. Also adds some explicit uses of
static_cast in order to suppress warnings about lossy type conversion.
6 years ago
Charles Pigott 0c619b7c4b Add: Fluidsynth music driver support (jmak) 6 years ago
Samu 1e68b9b3e6 Add: AI/GS GetMonthlyMaintenanceCost (#6897)
API addition which allows AI/GS scripts to retrieve the monthly maintenance cost of an airport type.
6 years ago
SamuXarick 4703cd433d Fix #6460: [AI] Add start_date parameter for Random AIs on new game 6 years ago