dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,516 Commits 1 Branch 0 Tags
da1ac73c02ae46dc4f93421ac518ce42310c05a2
Commit Graph

8797 Commits

Author SHA1 Message Date
Jonathan G Rennison
da1ac73c02 Merge commit 'f1dfa661a1898cde06a38ab4cb230c95912b245b' into jgrpp-beta 
# Conflicts:
#	src/lang/estonian.txt
#	src/lang/hungarian.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/packet.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/string_func.h
 2021-09-18 22:10:04 +01:00
Jonathan G Rennison
2bd535e834 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/engine_base.h
#	src/gfxinit.cpp
#	src/graph_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/network/core/address.cpp
#	src/network/core/game_info.h
#	src/network/core/os_abstraction.h
#	src/network/core/udp.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/newgrf_engine.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/string_func.h
#	src/town_gui.cpp
#	src/video/video_driver.cpp
#	src/widget_type.h
 2021-09-18 01:28:57 +01:00
TELK
efec8cb02c Update: Korean translation up to 0748d54 2021-09-12 09:45:10 +09:00
TELK
b2245806ae Update: Korean translation up to ebab945 2021-09-12 09:45:10 +09:00
TELK
8686eaacb7 Update: Korean translation up to b8d5113c5a 2021-09-12 09:45:10 +09:00
TELK
b016811070 Update: Korean translation up to e76c5dfda7 2021-09-12 09:45:10 +09:00
Jonathan G Rennison
282f5f22e3 Partially revert "Update: Translations from eints" 
This partially reverts b721787c7f

Unremove string: STR_NETWORK_COMPANY_LIST_SPECTATE
 2021-09-11 00:28:34 +01:00
dP
40a6181a16 Change: Return 'New company/Spectate' option to company toolbar menu 
(cherry picked from commit dc2bbfd3f4c78ea14631c2005544bb6898faf1b0)

Include spectate option part
 2021-09-11 00:11:50 +01:00
Jonathan G Rennison
afd66c1631 Show linear scaling value in settings window for cargo scaling settings 2021-09-08 22:03:02 +01:00
Jonathan G Rennison
5d351a14d2 Add new signal type: no-entry signal 
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction

Add a setting for whether this is shown in the signal UI.
Off by default.
 2021-09-04 11:39:54 +01:00
Jonathan G Rennison
6af182c3ca Add sort by number of vehicles calling to station list window 2021-09-02 01:02:52 +01:00
Jonathan G Rennison
16f2ef227b Store tunnel/bridge signal spacing on tile, adjust spacing to fit length 2021-08-29 02:11:58 +01:00
Jonathan G Rennison
5afa1b93eb Show buy cost and running cost in template windows 
See: #312
 2021-08-22 15:01:26 +01:00
Jonathan G Rennison
d67f63a04e Remove unused template replacement value strings 2021-08-22 15:01:26 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Jonathan G Rennison
e76c5dfda7 Revert "Temporarily mark dual pane train purchase window as experimental" 
This reverts commit f9bb004b05.
 2021-08-04 17:49:23 +01:00
Jonathan G Rennison
6a009686c9 Fix #299: Add estimated max speed (full) to template windows 2021-07-17 23:21:12 +01:00
Jonathan G Rennison
f9bb004b05 Temporarily mark dual pane train purchase window as experimental 
See: #287, #296, #297
 2021-07-09 18:12:55 +01:00
TELK
9dcc6f770c Update: Korean translation up to 158608442c 2021-07-04 22:00:06 +09:00
TELK
34e30766a3 Update: Korean translation up to 0f73fe765f 2021-07-04 22:00:06 +09:00
TELK
25e2e79bcc Update: Korean translation up to 0773dde669 2021-07-04 22:00:06 +09:00
TELK
757f140286 Update: Korean translation for drag_drop_group_name 2021-07-04 22:00:06 +09:00
TELK
2892bdde2e Update: Korean translation for 9d4d72cd1e 2021-07-04 22:00:06 +09:00
Jonathan G Rennison
158608442c Merge pull request #281 from VacuumBreather/train_speed_adaptation 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
 2021-07-03 23:00:25 +01:00
Jonathan G Rennison
0f73fe765f Merge pull request #293 from VacuumBreather/station_cargo_history 
Add station cargo history
 2021-06-29 19:53:18 +01:00
Jonathan G Rennison
37c7cf9899 Remove number of days from hard-coded X axis label string 
To support later day number changes and/or translations
 2021-06-29 19:37:20 +01:00
Jonathan G Rennison
0773dde669 Merge pull request #287 from VacuumBreather/advanced_train_purchase_window 
Advanced train purchase window
 2021-06-29 00:43:26 +01:00
Jonathan G Rennison
5e418128da Add setting for whether to use dual pane train purchase window 2021-06-29 00:11:07 +01:00
Jonathan G Rennison
3bba9ef37a Fix setting name 2021-06-27 04:41:46 +01:00
Jonathan G Rennison
be9b18df59 Fix wrong string code in lang text in 6c07758c 2021-06-27 04:11:09 +01:00
Jonathan G Rennison
fdf9257649 Merge pull request #285 from VacuumBreather/drag_drop_group_name 2021-06-27 02:57:38 +01:00
Jonathan G Rennison
6c07758cc3 Do name generation at client, fix localisation 
Use existing group creation command
 2021-06-27 02:28:52 +01:00
Andreas Schmitt
9b1783809d Add station cargo history 2021-06-23 08:48:46 +02:00
Jonathan G Rennison
9d4d72cd1e Merge pull request #286 from VacuumBreather/vehicle_more_info 
Show more details on train max speed when loaded
 2021-06-22 23:37:23 +01:00
Andreas Schmitt
2370df82aa Fix string parameter 2021-06-21 07:56:58 +02:00
Andreas Schmitt
2c9619ba10 Fix string parameter 2021-06-21 07:52:26 +02:00
Andreas Schmitt
837e82f60c Add German translation 2021-06-21 01:22:50 +02:00
Andreas Schmitt
2b7a96b252 Add German translation 2021-06-21 01:18:38 +02:00
Andreas Schmitt
dee05f520f Add German translation 2021-06-21 01:15:20 +02:00
Andreas Schmitt
b210a825b1 Add German translations 2021-06-21 01:10:49 +02:00
Andreas Schmitt
8b66ebd4f0 Add auto named group generated when dropping a vehicle onto new group button 2021-06-20 20:43:25 +02:00
Andreas Schmitt
debc504e59 Add a setting for train speed adaptation 
Prior to this change, without realistic breaking, trains would continuously run into the train in front of them. This makes them adjust their speed based on trains in front of them
 2021-06-20 20:40:33 +02:00
Andreas Schmitt
4c795b44be Adjust text colors 2021-06-20 20:38:04 +02:00
Andreas Schmitt
d954c461b0 Add information about vehicle loads and speeds 2021-06-20 20:38:04 +02:00
Andreas Schmitt
92276518dd Adjust further to new API 2021-06-20 20:35:49 +02:00
Andreas Schmitt
7ffd65c3e6 Add initial implementation 2021-06-20 20:35:49 +02:00
Woelfi Von Wolfhausen
6005425c09 Fix typos 2021-06-20 15:33:00 +00:00
TELK
94d2438d3d Update: Korean translations till 428136f 2021-06-20 00:41:11 +09:00
TELK
cbdba03378 Update: Korean translation for PR#268, 271, 274, 275 2021-06-20 00:41:11 +09:00
TELK
fdc3818a71 Update: Korean translation for pbs_safe_wating 2021-06-20 00:41:11 +09:00