dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,403 Commits 1 Branch 0 Tags
6f38769b735ab48cf3bf3ac00a9b402e7025d0ed
Commit Graph

9035 Commits

Author SHA1 Message Date
Jonathan G Rennison
6f38769b73 Rename incorrectly named set time/date window strings 2021-11-27 23:52:44 +00:00
Jonathan G Rennison
10f3641d9f Adjust road vehicle quantum tunneling setting text 
See: #338
 2021-11-27 20:42:19 +00:00
Jonathan G Rennison
70fdb9091b Merge PR #338 into jgrpp 2021-11-27 20:28:13 +00:00
Jonathan G Rennison
0794825187 Reduce unnecessary diffs with upstream in lang/english.txt 2021-11-27 13:11:06 +00:00
Jonathan G Rennison
8bc15c10cd Fix station/waypoint vehicle tooltip showing incorrect ctrl-click text 
Split ctrl-click text from original tooltip strings

See: #36
 2021-11-27 12:59:46 +00:00
Jonathan G Rennison
e6fbf797ff Split timetable clear/set speed/wait time tooltip strings 
This is to separate the original strings from added suffixes
 2021-11-27 12:46:48 +00:00
Jonathan G Rennison
b02b154218 Also show hours and minutes for schdispatch duration in minutes mode 2021-11-24 02:12:19 +00:00
Jonathan G Rennison
dd5d4c795b Fix entering schdispatch delay/duration when not in minutes mode 2021-11-24 02:10:22 +00:00
Jonathan G Rennison
2308345803 Improve labels of non-text scheduled dispatch date/time entry window 2021-11-23 23:40:13 +00:00
reldred
f461f0de08 Introduces a new setting (defaulted off) to allow preventing road vehicles from performing so-called quantum tunelling through other vehicles blocking their path. 2021-11-22 15:45:55 +10:30
Jonathan G Rennison
0691b25e17 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
 2021-11-20 13:15:32 +00:00
Jonathan G Rennison
5959e1c0f9 Merge PR #336 into jgrpp 2021-11-19 23:20:05 +00:00
reldred
5a53b4d846 Additional tweaks to allow rivers to spawn in deserts (causing aditional tropic biome to spawn around them). This piggybacks off of the 'allow lakes in deserts' setting, renaming it to cover both. The actual setting name itself internally hasn't changed. 2021-11-19 12:29:20 +10:30
translators
f6886754ff Update: Translations from eints 
greek: 2 changes by dionisis84
german: 2 changes by danidoedel
 2021-11-18 18:47:13 +00:00
reldred
904ff346c2 Initial commit to allow configuring running costs as a fraction (1/1 default thru 1/4) independently for both vehicles stopped in depots (doesn't work for planes, I'm not smart enuff), or vehicles that are stationary. 2021-11-18 12:47:23 +10:30
Jonathan G Rennison
b259d04339 Add tunnel/bridge entrance/exit values to entry direction conditional 2021-11-13 22:52:27 +00:00
translators
f8efab4653 Update: Translations from eints 
japanese: 1 change by akaregi
dutch: 3 changes by Afoklala
 2021-11-12 18:46:13 +00:00
Jonathan G Rennison
dca7e7bc58 Merge branch 'master' into jgrpp 2021-11-12 18:07:11 +00:00
translators
62795a2e6d Update: Translations from eints 
russian: 2 changes by Ln-Wolf
 2021-11-11 18:48:27 +00:00
translators
4bcbcbc58f Update: Translations from eints 
tamil: 2 changes by Aswn
 2021-11-10 18:52:03 +00:00
Jonathan G Rennison
58d8418f83 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/lang/arabic_egypt.txt
 2021-11-10 01:05:30 +00:00
translators
236f71640c Update: Translations from eints 
english (us): 2 changes by 2TallTyler
arabic (egypt): 49 changes by AviationGamerX
korean: 17 changes by telk5093
catalan: 2 changes by J0anJosep
danish: 4 changes by nielsmh
french: 2 changes by glx22
portuguese: 2 changes by azulcosta
 2021-11-09 18:50:34 +00:00
translators
0ad40ee868 Update: Translations from eints 
arabic (egypt): 35 changes by AviationGamerX
 2021-11-08 18:50:01 +00:00
Jonathan G Rennison
3d4261a33a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
 2021-11-08 00:44:18 +00:00
Guillaume Renoult
c38af72978 Update: add setting to hide news about competitors vehicle crash (#9653) 2021-11-07 19:54:50 +01:00
translators
73001ae1a9 Update: Translations from eints 
english (au): 3 changes by LordAro
 2021-11-06 18:47:14 +00:00
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
 2021-11-03 00:45:12 +00:00
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
 2021-11-02 21:11:11 +00:00
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
 2021-11-02 19:23:24 +00:00
translators
9edb75ec0b Update: Translations from eints 
arabic (egypt): 7 changes by AviationGamerX
 2021-11-02 18:49:30 +00:00
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
 2021-11-02 18:02:37 +00:00
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
 2021-11-02 17:51:38 +00:00
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
 2021-11-02 00:51:54 +00:00
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
 2021-11-01 21:18:24 +00:00
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
 2021-11-01 18:54:43 +00:00
translators
00a6287f97 Update: Translations from eints 
arabic (egypt): 2 changes by AviationGamerX
 2021-11-01 18:49:20 +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
translators
ccf70fc4b3 Update: Translations from eints 
dutch: 2 changes by Afoklala
 2021-10-29 18:49:23 +00: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
translators
edf7b02ddb Update: Translations from eints 
german: 2 changes by Wuzzy2
 2021-10-28 18:48:40 +00: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
translators
488cf26406 Update: Translations from eints 
swedish: 44 changes by joeax910
japanese: 1 change by clzls
chinese (simplified): 2 changes by clzls
 2021-10-27 18:50:25 +00:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
translators
4487ad1a5e Update: Translations from eints 
korean: 1 change by telk5093
polish: 2 changes by pAter-exe
 2021-10-25 18:49:13 +00: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
translators
a0831cec39 Update: Translations from eints 
swedish: 1 change by joeax910
 2021-10-24 18:46:47 +00:00