Commit Graph

35138 Commits

Author SHA1 Message Date
Jonathan G Rennison
7e5455a07d Merge remote-tracking branch 'kiwitreekor/korean-translation' into jgrpp 2019-01-07 18:47:02 +00:00
translators
5e51d9ee82 Update: Translations from eints
hebrew: 22 changes by dnd_man
spanish (mexican): 1 change by Absay
2019-01-07 19:45:46 +01:00
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
2019-01-06 22:35:57 +00:00
Jonathan G Rennison
635c7ca2d5 Merge branch 'save_ext' into more_cond_orders-sx
# Conflicts:
#	src/lang/english.txt
#	src/order_type.h
2019-01-06 22:19:41 +00:00
Jonathan G Rennison
0dba091d79 Merge branch 'cpp-11' into save_ext
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
2019-01-06 22:10:04 +00:00
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
2019-01-06 22:07:28 +00:00
J0an Josep
effb7da5b4 Doc: Fix spelling in comments. 2019-01-06 16:47:45 +01:00
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. 2019-01-06 16:47:45 +01:00
Juanjo!
1db66a285e Codechange: [YAPF] Stop looking for an automatic servicing road depot when the cost of a path exceeds max. penalty. 2019-01-06 16:47:45 +01:00
Juanjo!
edb7adf183 Codechange: [NPF] Stop looking for an automatic servicing (rail/road) depot when the cost of a path exceeds max. penalty. 2019-01-06 16:47:45 +01:00
J0an Josep
19a2f84943 Fix #7001: Pathfinders should see standard road stations as tiles where to reverse. 2019-01-06 16:47:45 +01:00
kiwitreekor
d1b98855de Fix typos 2019-01-06 22:43:13 +09:00
Niels Martin Hansen
15a7f9da9d Fix 13056ae: PR #7017 added new enum value in bad position, move it 2019-01-06 11:45:21 +01:00
kiwitreekor
030d6a3024 Update Korean Translation 2019-01-06 18:55:17 +09:00
Eddi-z
13056aedbc Add: Conditional order for max. reliability (patch by Cirdan, #6360) (#7017) 2019-01-05 22:10:37 +01:00
glx
92d3358db5 Fix: [Win32] don't mess with std[out|err|in] if we can't allocate a console 2019-01-05 18:10:14 +01:00
Niels Martin Hansen
b8b6954fb5 Fix 6a3d411: Silence truncation warning 2019-01-05 17:21:29 +01:00
Niels Martin Hansen
cb60a5e57f Change: Fluidsynth music driver plays through mixer instead of own audio driver 2019-01-05 17:17:10 +01:00
Niels Martin Hansen
d6c06de5ad Add: Mixer feature for streaming sampled music 2019-01-05 17:17:10 +01:00
Niels Martin Hansen
12ba56c5a3 Fix 6accbf9: Silence warnings about unused fread() result 2019-01-05 17:16:53 +01:00
Juanjo
9e30054de9 Codechange: Use window class as expected. 2019-01-04 23:55:07 +01:00
J0an Josep
16a91130a7 Codechange: Use INVALID_TRACKDIR instead of 0xFF. 2019-01-04 23:55:07 +01:00
translators
49ab02c084 Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
2019-01-04 19:45:45 +01:00
Jonathan G Rennison
7f73c36686 Improve display of non-overlay horizontal dual track types 2019-01-04 11:51:16 +00:00
Jonathan G Rennison
4f1d54564e Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
2019-01-02 16:09:44 +00:00
translators
391bc45c41 Update: Translations from eints
spanish (mexican): 10 changes by Absay
2018-12-31 19:45:43 +01:00
Alberth
4a255e879a Fix #6966: Only allow switching to a valid company. 2018-12-29 16:15:44 +01:00
translators
e8f9975409 Update: Translations from eints
finnish: 160 changes by ln
2018-12-27 19:45:44 +01:00
glx
c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 2018-12-27 18:09:16 +01:00
Joan Josep
8890926b0d Fix #6974: Add save-load filter widget to api 2018-12-27 09:53:55 +01:00
glx
3be6ab555c Change: use vcpkg integration in Visual Studio
Removes the need for us to provide OpenTTD-useful package
2018-12-26 17:29:11 +01:00
translators
cab39ff47f Update: Translations from eints
russian: 8 changes by Lone_Wolf
2018-12-24 19:45:43 +01:00
Jonathan G Rennison
afae7ca810 Change custom bridge head second rail type infrastructure count factor 2018-12-22 18:44:16 +00:00
Jonathan G Rennison
70020e1a5c Fix incorrect accounting of rail tunnel/bridge infrastructure counts
Regression from dual rail types change
2018-12-22 04:08:20 +00:00
Jonathan G Rennison
d78db1c004 Dump tile data in Vehicle::DumpVehicleFlags 2018-12-21 03:28:17 +00:00
Jonathan G Rennison
65b9a103ad Initial implementation of two rail types per tile 2018-12-21 03:27:58 +00:00
Jonathan G Rennison
8128d027c0 Fix wrong return value in scope_dumper::TileInfo 2018-12-20 12:53:59 +00:00
Jonathan G Rennison
ccf13467db Prevent AIs from creating or adding to rail custom bridge heads 2018-12-19 18:51:15 +00:00
Jonathan G Rennison
7da1f8b592 Merge branch 'master' into jgrpp 2018-12-19 00:18:49 +00:00
Jonathan G Rennison
8b1991983f Make reverse behind signal tracerestrict action an advanced feature in GUI 2018-12-19 00:18:15 +00:00
translators
2ab4b5dd03 Update: Translations from eints
spanish: 3 changes by SilverSurferZzZ
2018-12-14 19:45:43 +01:00
translators
2978388153 Update: Translations from eints
spanish: 5 changes by SilverSurferZzZ
spanish (mexican): 23 changes by Absay
2018-12-13 19:45:44 +01:00
translators
777cfe5611 Update: Translations from eints
chinese (simplified): 2 changes by ww9980
korean: 23 changes by kevinhigh
2018-12-12 19:45:44 +01:00
translators
863b80e880 Update: Translations from eints
spanish: 6 changes by SilverSurferZzZ
2018-12-10 19:45:44 +01:00
Jonathan G Rennison
2003a86932 Merge remote-tracking branch 'origin/master' into jgrpp
# Conflicts:
#	src/string.cpp
2018-12-10 18:40:05 +00:00
translators
68b5b11b7c Update: Translations from eints
spanish: 4 changes by SilverSurferZzZ
2018-12-09 19:45:44 +01:00
Jonathan G Rennison
cd41683b9b Add tracerestrict feature reverse behind signal 2018-12-09 01:13:27 +00:00
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.
2018-12-08 20:13:27 +01:00
Michael Lutz
4bf216993a Add: [OSX] Native text caret handling. 2018-12-08 20:13:27 +01:00
Michael Lutz
8d7cd6a526 Add: [OSX] Native natural sort implementation. 2018-12-08 20:13:27 +01:00