translators
1412ea48ed
Update: Translations from eints
...
esperanto: 268 changes by legoscia
1 year ago
translators
9f0e406a51
Update: Translations from eints
...
esperanto: 18 changes by legoscia
1 year ago
Jonathan G Rennison
8bb23e07ba
Merge PR #520 into jgrpp
1 year ago
Jonathan G Rennison
e8748c310c
Merge PR #519 into jgrpp
1 year ago
translators
e9b376d484
Update: Translations from eints
...
catalan: 14 changes by J0anJosep
portuguese: 20 changes by azulcosta
portuguese (brazilian): 15 changes by ericandradex
(cherry picked from commit 27b40da06a
)
1 year ago
Jonathan G Rennison
37b8b59c85
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/date_type.h
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/saveload/saveload.h
# src/table/settings/linkgraph_settings.ini
1 year ago
translators
e2827d0e9c
Update: Translations from eints
...
galician: 41 changes by pvillaverde
esperanto: 95 changes by legoscia
portuguese (brazilian): 18 changes by ericandradex
1 year ago
Jonathan G Rennison
9a4512f789
Remove linkgraph duration not day length scaled setting
...
Now always enabled
1 year ago
Jonathan G Rennison
5dd99fb046
Add setting for milliseconds per game tick mode
1 year ago
Jonathan G Rennison
8ba1010fb4
Merge branch 'master' into jgrpp
1 year ago
TELK
6ec28479ea
Update: Korean translation for 0.53.3
1 year ago
pvillaverde
49da6b2070
🌐 Update Galician Translations up to 0.53.3
1 year ago
translators
9610705f46
Update: Translations from eints
...
esperanto: 52 changes by legoscia
1 year ago
Jonathan G Rennison
3cbd1a5a76
Add conditional order test for whether slot is empty/not empty
1 year ago
translators
98dffc3157
Update: Translations from eints
...
catalan: 12 changes by J0anJosep
esperanto: 678 changes by legoscia
1 year ago
translators
cdb184f53b
Update: Translations from eints
...
catalan: 14 changes by J0anJosep
dutch: 14 changes by Afoklala
1 year ago
translators
fd26658558
Update: Translations from eints
...
russian: 2 changes by Ln-Wolf
1 year ago
translators
418888ac23
Update: Translations from eints
...
romanian: 11 changes by bnegrut
turkish: 14 changes by densxd
1 year ago
Jonathan G Rennison
731f2fb46e
Tracerestrict: Add button to share program onto other signals
1 year ago
translators
a5cf362886
Update: Translations from eints
...
english (au): 14 changes by krysclarke
english (us): 14 changes by 2TallTyler
vietnamese: 14 changes by KhoiCanDev
korean: 19 changes by telk5093
italian: 14 changes by Rivarossi
russian: 14 changes by Ln-Wolf
finnish: 14 changes by hpiirai
danish: 22 changes by bscargo
portuguese: 14 changes by azulcosta
polish: 14 changes by pAter-exe
1 year ago
translators
389b66bd16
Update: Translations from eints
1 year ago
Patric Stout
7634553d22
Feature: opt-in survey when exiting a game
...
On first start-up, the game will ask if you want to participate
in our automated survey. You have to opt-in, and can easily opt-out
(via the Options) at any time.
When opt-in, whenever you exit a game, a JSON blob will be send
to the survey server hosted by OpenTTD. This JSON blob contains
information that gives a global picture of the game just played:
- What settings were used
- How many humans vs AIs
- How long the game has been played
- Basic information about the OS / CPU
All this information is kept very generic, so there is no
chance we send private information to our survey server.
Nothing in the JSON blob could identify you as a person; it
mostly tells about the game played. At any time you can see
what the JSON blob includes, by pressing the "Preview Survey
Results" button in-game.
1 year ago
translators
a8daf91eea
Update: Translations from eints
...
vietnamese: 4 changes by KhoiCanDev
hungarian: 74 changes by PstasDev
turkish: 4 changes by densxd
1 year ago
Jonathan G Rennison
4ed0c23644
Add text to warning dialog when overwriting a non-extended version save
1 year ago
translators
e1b653137f
Update: Translations from eints
...
finnish: 4 changes by hpiirai
1 year ago
translators
a934a584a5
Update: Translations from eints
...
italian: 4 changes by Rivarossi
catalan: 4 changes by J0anJosep
dutch: 9 changes by Afoklala
1 year ago
translators
ca31976da0
Update: Translations from eints
...
english (au): 4 changes by krysclarke
english (us): 4 changes by 2TallTyler
russian: 4 changes by Ln-Wolf
portuguese: 4 changes by azulcosta
polish: 8 changes by pAter-exe
1 year ago
translators
7e1123c731
Update: Translations from eints
...
portuguese (brazilian): 30 changes by ericandradex
1 year ago
Jonathan G Rennison
4c18a193e7
Simplify timetable long duration hours and minutes suffix string
1 year ago
Jonathan G Rennison
7941eb5187
Simplify timetable leftover ticks string
1 year ago
Jonathan G Rennison
e7f7cd06bd
Simplify timetable time/duration string management
1 year ago
Patric Stout
922d7aa773
Update: help out translators and do the COMMA -> DECIMAL for them ( #10802 )
1 year ago
Peter Nelson
f5158c8b79
Feature: Add search filter and name text to build waypoint window.
1 year ago
Peter Nelson
0513a6ccb0
Change: Use separate names for default stations/roadstops.
1 year ago
Peter Nelson
e2f583a34f
Change: Standardise unit conversions and allow decimal places.
...
Previously the decimal_places member was mostly ignored except for
specific conversions. {DECIMAL} with 0 is the same as {COMMA} so there
is no downside to allowing any conversion to have decimals.
1 year ago
Jonathan G Rennison
8e2319ad68
Scheduled dispatch: Add button to adjust departure slots
1 year ago
translators
90529ea48b
Update: Translations from eints
...
catalan: 30 changes by J0anJosep
french: 25 changes by glx22
polish: 5 changes by pAter-exe
1 year ago
Jonathan G Rennison
8f92668e22
Scheduled dispatch: Add menu item to append schedules from another vehicle
1 year ago
translators
923d1b0846
Update: Translations from eints
...
vietnamese: 5 changes by KhoiCanDev
1 year ago
Jonathan G Rennison
62ecad1b63
Scheduled dispatch: Add menu item to duplicate current schedule
1 year ago
Jonathan G Rennison
6d483cc5cc
Add toggle to show vehicle route overlay even when window is not focused
1 year ago
translators
97b77f0251
Update: Translations from eints
...
english (au): 5 changes by krysclarke
english (us): 5 changes by 2TallTyler
korean: 5 changes by telk5093
italian: 5 changes by Rivarossi
russian: 5 changes by Ln-Wolf
finnish: 5 changes by hpiirai
turkish: 5 changes by densxd
portuguese: 5 changes by azulcosta
1 year ago
Jonathan G Rennison
31f476220d
Allow converting track by individual track pieces instead of whole tiles
...
Ctrl-click on convert button
See: #509
1 year ago
Jonathan G Rennison
65cc6623dd
Tracerestrict: Add button to duplicate instruction/block
1 year ago
translators
5dd54e2708
Update: Translations from eints
...
japanese: 10 changes by fmang
vietnamese: 14 changes by KhoiCanDev
dutch: 14 changes by Afoklala
polish: 1 change by pAter-exe
1 year ago
Jonathan G Rennison
b089b561a5
Add departure board via order subtype to remove via for prior terminus
1 year ago
glx22
045a99dd23
Codechange: Remove STR_TINY_RIGHT_ARROW
1 year ago
glx22
222e37d319
Codechange: Remove TINY_BLACK_STATION
1 year ago
glx22
b2a36ff3cc
Codechange: Remove STR_TINY_GROUP and STR_TINY_BLACK_VEHICLE
1 year ago
glx22
999057a4d8
Codechange: Remove STR_SHORT_DATE
1 year ago
glx22
49eb638563
Codechange: Remove STR_ORANGE_STRING1_WHITE and STR_ORANGE_STRING1_LTBLUE.
1 year ago
Peter Nelson
61407840c6
Codechange: Remove STR_BLACK_RAW_STRING.
1 year ago
Peter Nelson
0880616851
Codechange: Remove various STRING strings.
1 year ago
Peter Nelson
4767641c8c
Codechange: Remove various INT strings.
1 year ago
Peter Nelson
d5fb9e7dc6
Codechange: Remove various DATE_LONG strings.
1 year ago
Peter Nelson
a2d7642195
Codechange: Remove STR_COMPANY_MONEY.
1 year ago
Peter Nelson
f1d0a26324
Codechange: Remove STR_TINY_BLACK_DECIMAL.
1 year ago
Peter Nelson
e18f688db5
Codechange: Remove various COMMA strings.
1 year ago
translators
ca497ce356
Update: Translations from eints
...
japanese: 29 changes by fmang
danish: 25 changes by bscargo
polish: 29 changes by pAter-exe
1 year ago
translators
7669aac865
Update: Translations from eints
...
english (us): 14 changes by 2TallTyler
1 year ago
translators
47a8d12f0e
Update: Translations from eints
...
english (au): 14 changes by krysclarke
korean: 14 changes by telk5093
italian: 14 changes by Rivarossi
russian: 15 changes by Ln-Wolf
finnish: 14 changes by hpiirai
turkish: 14 changes by densxd
portuguese: 16 changes by azulcosta
1 year ago
translators
4cceaae8dc
Update: Translations from eints
1 year ago
PeterN
cc44aa7438
Change: Split Game options into General, Graphics and Sound tabs. ( #10674 )
1 year ago
translators
cf3cb8d2a5
Update: Translations from eints
...
english (au): 4 changes by krysclarke
vietnamese: 4 changes by KhoiCanDev
korean: 4 changes by telk5093
russian: 1 change by Ln-Wolf
1 year ago
Peter Nelson
a816dd1d48
Change: Remove {TINY_FONT} from cargo abbreviation strings for other translations.
1 year ago
Peter Nelson
310b3a67ad
Change: Remove {TINY_FONT} from cargo abbreviation strings for English.
1 year ago
TELK
baaa5713a9
Update: Korean translation up to e26bea6
1 year ago
translators
de08e29cd9
Update: Translations from eints
...
english (us): 4 changes by 2TallTyler
1 year ago
Jonathan G Rennison
e26bea6ce4
Add setting to select cargo payment algorithm
...
See: #506
1 year ago
Jonathan G Rennison
211c1ba61d
Allow naming scheduled dispatch schedules
1 year ago
Patric Stout
36a0818bc5
Remove: buying/selling/owning company shares ( #10709 )
1 year ago
translators
3ed8c35dfe
Update: Translations from eints
...
italian: 4 changes by Rivarossi
russian: 4 changes by Ln-Wolf
finnish: 4 changes by hpiirai
turkish: 4 changes by densxd
dutch: 6 changes by Afoklala
portuguese: 4 changes by azulcosta
1 year ago
translators
d33993cca3
Update: Translations from eints
1 year ago
Patric Stout
f5fad88723
Change: base autosaves intervals on real time (instead of game time) ( #10655 )
...
There are two fundamental issues with autosave:
- When fast-forwarding, it saves way too often
- When paused, it never saves
Both makes no sense. Autosaves are meant to prevent you from
accidentally losing your work. The emphasis on "your" work.
To solve both issues, the autosave now works on real time. You
can select every 10 / 30 / 60 / 120 minutes, which are similar to
what the setting was in game-months.
When you pause, autosaving will stop. Unless you make any change
to the game; then it will continue to make autosaves, even so
the game is paused. Unpausing / pausing resets this mechanism.
1 year ago
translators
5794590b36
Update: Translations from eints
...
vietnamese: 1 change by KhoiCanDev
polish: 7 changes by pAter-exe
1 year ago
translators
27e9a79988
Update: Translations from eints
...
finnish: 2 changes by hpiirai
portuguese: 1 change by azulcosta
1 year ago
Patric Stout
1c76e0904d
Codechange: revive STR_TINY_BLACK_COMMA from its coma ( #10714 )
1 year ago
translators
e9f6bbada2
Update: Translations from eints
...
english (au): 1 change by krysclarke
english (us): 1 change by 2TallTyler
galician: 36 changes by pvillaverde
korean: 14 changes by telk5093
italian: 1 change by Rivarossi
russian: 1 change by Ln-Wolf
turkish: 2 changes by densxd
1 year ago
Jonathan G Rennison
94b5b956c7
Merge PR #510 into jgrpp
1 year ago
pvillaverde
bb3520d68f
Update Galician Translations
1 year ago
translators
e437b8edae
Update: Translations from eints
...
english (au): 1 change by krysclarke
english (us): 1 change by 2TallTyler
vietnamese: 4 changes by KhoiCanDev
italian: 1 change by Rivarossi
russian: 1 change by Ln-Wolf
turkish: 1 change by EndChapter
portuguese: 1 change by azulcosta
1 year ago
Tyler Trahan
f45509848a
Fix #10289 : Don't silently fail when setting timetable start dates ( #10690 )
1 year ago
translators
6b077ce25c
Update: Translations from eints
...
english (us): 5 changes by 2TallTyler
vietnamese: 1 change by KhoiCanDev
russian: 1 change by Ln-Wolf
turkish: 33 changes by densxd
dutch: 5 changes by Afoklala
1 year ago
Tyler Trahan
ef60a93816
Fix #8302 : Improve "Maintenance intervals are in percents" helptext ( #10686 )
1 year ago
translators
b56be83937
Update: Translations from eints
...
italian: 20 changes by Rivarossi
french: 5 changes by ZarTek-Creole
1 year ago
Jonathan G Rennison
7da25820ea
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
1 year ago
translators
1fd17148e1
Update: Translations from eints
...
english (au): 1 change by krysclarke
german: 1 change by SecretIdetity
russian: 1 change by Ln-Wolf
finnish: 5 changes by hpiirai
slovak: 15 changes by legitalk
portuguese: 1 change by azulcosta
1 year ago
Rubidium
4491e45f3c
Update: change {STRING} to {ZEROFILL_NUM} for STR_FORMAT_DATE_TINY/ISO
1 year ago
Rubidium
29b09523d1
Codechange: Use {ZEROFILL_NUM} instead of custom seprintf + {RAW_STRING}
1 year ago
translators
32c8e7feb8
Update: Translations from eints
...
english (au): 4 changes by krysclarke
vietnamese: 31 changes by KhoiCanDev
russian: 4 changes by Ln-Wolf
portuguese: 4 changes by azulcosta
1 year ago
Patric Stout
ed83c4b0da
Change: replace per-AI "start_date" with a global "competitors_interval" ( #10653 )
...
The per-AI "start_date" is a lot of custom code, and was rarely
used in the way it was meant.
While at it, also ported this part over to the new timer system.
1 year ago
translators
27b40da06a
Update: Translations from eints
...
catalan: 14 changes by J0anJosep
portuguese: 20 changes by azulcosta
portuguese (brazilian): 15 changes by ericandradex
1 year ago
Tyler Trahan
646a7e625b
Change: Use seconds for Linkgraph update settings ( #10610 )
1 year ago
translators
0e915c830c
Update: Translations from eints
...
dutch: 15 changes by Afoklala
1 year ago
translators
d04aae8428
Update: Translations from eints
...
danish: 18 changes by bscargo
1 year ago
TELK
a47f92d309
Update: Korean translation up to 9bf6a1d
1 year ago
Jonathan G Rennison
c89079a210
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/cargopacket_sl.cpp
# src/saveload/saveload.h
# src/strings.cpp
# src/vehicle.cpp
1 year ago
translators
a0d8545f6c
Update: Translations from eints
...
french: 15 changes by glx22
1 year ago
Jonathan G Rennison
55f11129c8
Tracerestrict: Add status test for if train is stopping at order destination
...
Station/waypoint of current order
1 year ago
translators
d7f0c5d6d8
Update: Translations from eints
...
russian: 3 changes by Ln-Wolf
finnish: 7 changes by hpiirai
polish: 17 changes by pAter-exe
1 year ago
Jonathan G Rennison
87fabe99df
Allow exchanging a station's name with another station in the same town
1 year ago
Jonathan G Rennison
19a42a879f
Fix e8c1920e: Incorrect string codes in translation
...
STR_DEPARTURES_TERMINUS_VIA* in Korean
1 year ago
Jonathan G Rennison
e8c1920e7f
Departure board: Add support for dual via
1 year ago
Jonathan G Rennison
9c830aadcc
Departure board: Refactor string handling
1 year ago
translators
9e69556e2f
Update: Translations from eints
...
english (au): 13 changes by krysclarke
english (us): 15 changes by 2TallTyler
russian: 12 changes by Ln-Wolf
1 year ago
Jonathan G Rennison
82803b98e0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/game/game_gui.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/newgrf.cpp
# src/order_gui.cpp
# src/saveload/engine_sl.cpp
# src/saveload/saveload.h
# src/script/api/script_text.cpp
# src/script/script_gui.cpp
# src/settings_table.cpp
# src/strings.cpp
# src/table/settings/economy_settings.ini
# src/table/settings/locale_settings.ini
# src/timetable_gui.cpp
1 year ago
translators
58e629ca84
Update: Translations from eints
...
korean: 8 changes by telk5093
russian: 7 changes by Ln-Wolf
finnish: 8 changes by hpiirai
1 year ago
Jonathan G Rennison
17e289015e
Adjust string names for label orders
1 year ago
Alberth289346
1321e48465
Fix: Update top toolbar tooltips for added features. ( #10616 )
1 year ago
Jonathan G Rennison
06e0f39aff
Add text label and departure board via orders
1 year ago
translators
39c6b3def1
Update: Translations from eints
...
english (au): 2 changes by krysclarke
russian: 2 changes by Ln-Wolf
1 year ago
Tyler Trahan
1691640603
Fix: Specify units for value of share trading age setting ( #10612 )
1 year ago
PeterN
f1144de509
Feature: Separate rail/road and sea/air velocity units, and add knots. ( #10594 )
...
This is achieved by packing vehicle type along with the velocity so that
the string system can decode and pick the appropriate unit.
1 year ago
translators
9246789fd3
Update: Translations from eints
...
spanish (mexican): 2 changes by GNosii
vietnamese: 2 changes by KhoiCanDev
czech: 1 change by jachymozo
romanian: 10 changes by bnegrut
danish: 3 changes by bscargo
1 year ago
Loïc Guilloux
e4c511d403
Fix #10578 : Allow to select any version of AI/GS from GUI ( #10604 )
1 year ago
Jonathan G Rennison
c9c0436e58
Add company setting for remain at station if next order for same station
...
Set value on load for whether the save version had this enabled for trains
1 year ago
Jonathan G Rennison
1d05637d45
Add setting for rail depot maximum speed
1 year ago
Jonathan G Rennison
3d1b0af8f6
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/newgrf_debug_gui.cpp
# src/object_cmd.cpp
# src/object_gui.cpp
1 year ago
translators
c905824248
Update: Translations from eints
...
chinese (traditional): 14 changes by inAndyPao
danish: 1 change by bscargo
1 year ago
Jonathan G Rennison
ce5c758f2b
Clarify how the "town growth speed depends on transported cargo" setting works
1 year ago
translators
a15e584e40
Update: Translations from eints
...
japanese: 27 changes by fmang
chinese (simplified): 12 changes by XiaoJi-Game
1 year ago
Jonathan G Rennison
9f9cc99fc1
Merge branch 'master' into jgrpp
1 year ago
translators
24e9af83aa
Update: Translations from eints
...
japanese: 22 changes by fmang
1 year ago
Jonathan G Rennison
9a1278bcd6
TBTR: Fix tooltips for start/stop replacement buttons
1 year ago
translators
83eb73a9b2
Update: Translations from eints
...
japanese: 12 changes by fmang
1 year ago
translators
1d915214a1
Update: Translations from eints
...
japanese: 31 changes by fmang
1 year ago
Jonathan G Rennison
664c486fea
Add "very reduced" mode to the vehicle breakdowns setting
1 year ago
translators
d15a14bd9e
Update: Translations from eints
...
japanese: 32 changes by fmang
danish: 7 changes by bscargo
1 year ago
Jonathan G Rennison
2716217775
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.h
1 year ago
translators
1424b7b49e
Update: Translations from eints
...
french: 14 changes by ZarTek-Creole
1 year ago
translators
3254d65b3e
Update: Translations from eints
...
swedish: 17 changes by joeax910
czech: 13 changes by jachymozo
danish: 3 changes by bscargo
1 year ago
Jonathan G Rennison
062d57eadb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/openttd.cpp
# src/video/dedicated_v.cpp
1 year ago
translators
0bf6d80cd7
Update: Translations from eints
...
danish: 161 changes by bscargo
1 year ago
Jonathan G Rennison
87e4258fe3
Allow selecting individual ship parts in refit window
...
Add callback to name ship parts in refit window
1 year ago
translators
be69aa6257
Update: Translations from eints
...
vietnamese: 1 change by KhoiCanDev
korean: 3 changes by telk5093
german: 30 changes by Wuzzy2
slovak: 14 changes by legitalk
dutch: 12 changes by Afoklala
1 year ago
Jonathan G Rennison
205cb2d3ea
Fix autosave setting dropdown strings
...
See: #496
1 year ago
TELK
2bc46cc9b7
Update: Korean translation according to splitting extra
1 year ago
TELK
bf86e66186
Fix: Korean translation for "Freight" filter
1 year ago
Jonathan G Rennison
25ed7c2b53
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/music.cpp
# src/script/api/script_company.cpp
# src/script/api/script_event_types.cpp
# src/script/api/script_group.cpp
# src/script/api/script_object.cpp
# src/script/api/script_road.cpp
1 year ago
translators
4af7f3e645
Update: Translations from eints
...
catalan: 13 changes by J0anJosep
1 year ago
translators
df2b66ad5d
Update: Translations from eints
...
english (au): 14 changes by krysclarke
romanian: 3 changes by bnegrut
finnish: 10 changes by hpiirai
1 year ago
Jonathan G Rennison
d94e8d7b5c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/script/api/script_object.cpp
# src/script/api/script_roadtypelist.cpp
1 year ago
translators
665a73b3c7
Update: Translations from eints
...
english (us): 12 changes by 2TallTyler
korean: 14 changes by telk5093
portuguese: 12 changes by azulcosta
polish: 16 changes by pAter-exe
1 year ago
Jonathan G Rennison
faa77e2605
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/script/api/script_company.cpp
# src/script/api/script_date.cpp
# src/script/api/script_date.hpp
# src/script/api/script_gamesettings.cpp
# src/script/api/script_order.hpp
# src/script/api/script_town.cpp
# src/script/api/script_window.cpp
1 year ago
translators
e60632bce6
Update: Translations from eints
...
italian: 12 changes by Rivarossi
russian: 14 changes by Ln-Wolf
finnish: 2 changes by hpiirai
portuguese (brazilian): 14 changes by ericandradex
1 year ago
Jonathan G Rennison
2b288c8056
Merge PR #491 : Galician language strings
1 year ago
Jonathan G Rennison
cbd71b3d58
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/order_cmd.cpp
1 year ago
translators
16a7bc54b3
Update: Translations from eints
...
finnish: 2 changes by hpiirai
catalan: 2 changes by J0anJosep
1 year ago
Jonathan G Rennison
2ea1766677
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/league_sl.cpp
# src/saveload/saveload.h
# src/script/api/script_object.hpp
# src/script/squirrel_helper.hpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/table/settings.h.preamble
# src/tree_cmd.cpp
# src/tree_map.h
# src/vehicle.cpp
# src/waypoint_cmd.cpp
1 year ago
Jonathan G Rennison
ae7c86c49d
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# src/industry_cmd.cpp
# src/industry_cmd.h
# src/network/core/http_curl.cpp
# src/network/core/tcp_http.cpp
# src/network/core/tcp_http.h
# src/network/network_content.h
# src/script/api/script_goal.cpp
# src/script/api/script_industry.cpp
# src/script/api/script_league.cpp
# src/script/api/script_story_page.cpp
# src/script/api/script_town.cpp
# src/train.h
# src/train_cmd.cpp
1 year ago