ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
91c5dee66c
Re-add removed group collapse/expand all buttons
5 years ago
98cfcebfcd
Merge pull request #91 into jgrpp
5 years ago
9efa181b58
ko-KR: for 0.31.1
5 years ago
8042150a35
Add error messages for vehicle build failure due to wrong depot owner and rail type
5 years ago
af64b5dc18
Add news/advice setting to warn if no depot order in vehicle schedule
5 years ago
635b35996b
ko-KR: Remove remnants
5 years ago
ddf5040f0d
ko-KR: Complete translation
5 years ago
1ee33c46ef
Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game
5 years ago
e7a916d2ce
Linkgraph: Add asymmetric: equal and nearest demand distribution modes
5 years ago
672c857e37
Cleanup: Update modified and removed strings in language files.
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
aa220b2375
Update: Translations from eints
...
indonesian: 2 changes by fanioz
dutch: 3 changes by JanWillem
korean: 3 changes by telk5093
5 years ago
6d3e9093c4
TBTR: Show warning on templates which include unavailable vehicles
5 years ago
ead5b55119
Update: Translations from eints
...
spanish (mexican): 3 changes by Absay
russian: 3 changes by Lone_Wolf
5 years ago
a6ea1ea408
Allow articulated road vehicles to overtake other vehicles
...
Add setting
5 years ago
f354b869c1
Update: Translations from eints
...
indonesian: 3 changes by fanioz
croatian: 3 changes by VoyagerOne
5 years ago
5b0ce8c214
Update: Translations from eints
...
finnish: 3 changes by hpiirai
italian: 3 changes by lorenzodv
5 years ago
b6733edd17
Feature: Add coverage area display for existing stations.
5 years ago
08284e005d
Fix: Automatic line breaking of the warning
5 years ago
dcb2571888
Add: Warn players that company passwords are not truly secure
5 years ago
bd2fdde759
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/sort_func.hpp
# src/rail_cmd.cpp
# src/timetable_cmd.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
5 years ago
f0b3267615
Update: Translations from eints
...
indonesian: 9 changes by fanioz
5 years ago
8ae15d9797
Update: Translations from eints
...
indonesian: 6 changes by fanioz
5 years ago
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
3964604148
Update: Translations from eints
...
luxembourgish: 1 change by Phreeze
5 years ago
1c7b454a57
Merge branch 'pr-7490' into jgrpp
...
# Conflicts:
# src/dock_gui.cpp
# src/water_cmd.cpp
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
87d588f22f
Update: Translations from eints
...
luxembourgish: 17 changes by Phreeze
spanish (mexican): 2 changes by njn
5 years ago
0a883afe19
Update: Translations from eints
...
luxembourgish: 20 changes by Phreeze
5 years ago
72b72dbec3
Add: Press ctrl to build diagonal rivers in scenario editor.
5 years ago
99055c22cb
Fix string format issue in Japanese translation
5 years ago
a404db80f6
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/town_cmd.cpp
5 years ago
24fc25164a
Update: Translations from eints
...
french: 3 changes by glx
croatian: 17 changes by VoyagerOne
5 years ago
92d5835495
Update: Translations from eints
...
dutch: 2 changes by JanWillem
french: 19 changes by glx
5 years ago
a4a3a6a630
Merge branch 'master' into jgrpp
5 years ago
cb449049ff
Update: Translations from eints
...
english (us): 3 changes by Supercheese
spanish (mexican): 18 changes by Absay
hungarian: 2 changes by Brumi
latin: 33 changes by Supercheese
5 years ago
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
5 years ago
3118f1430f
Update: Translations from eints
...
italian: 25 changes by lorenzodv
portuguese: 3 changes by JayCity
5 years ago
1d14e31be3
Update: Translations from eints
...
korean: 14 changes by telk5093
5 years ago
cd3767bec2
Update: Translations from eints
...
luxembourgish: 29 changes by Phreeze
russian: 2 changes by Lone_Wolf
latin: 4 changes by Supercheese
portuguese: 1 change by JayCity
5 years ago
e817951bfd
Update: Translations from eints
...
finnish: 2 changes by hpiirai
english (us): 17 changes by Supercheese
luxembourgish: 10 changes by Phreeze
dutch: 20 changes by JanWillem
norwegian (bokmal): 2 changes by Leifbk
latin: 16 changes by Supercheese
portuguese: 3 changes by JayCity
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
8890436af1
Add #6189 : Groups now count the total number of vehicles in subgroups (3298)
5 years ago
a393c94695
Change #5977 : Use specific error message when attempting to create a circular group hierarchy (3298)
5 years ago
7a32cf1401
Update: Translations from eints
...
greek: 51 changes by Jubilee
russian: 17 changes by Lone_Wolf
latin: 19 changes by Supercheese
portuguese: 53 changes by JayCity
5 years ago
10f0c1e3cd
Update: Translations from eints
...
finnish: 12 changes by hpiirai
greek: 40 changes by Jubilee
luxembourgish: 2 changes by Phreeze
dutch: 12 changes by JanWillem
french: 4 changes by romazoon
norwegian (bokmal): 12 changes by Leifbk
hungarian: 14 changes by Brumi
portuguese: 51 changes by JayCity, 11 changes by vesgo
5 years ago
37b9fdc0c1
Update: Translations from eints
...
finnish: 13 changes by hpiirai
korean: 1 change by telk5093
5 years ago
e6bb90543e
Change: Show additional cost and refitted capacity in build vehicle window.
5 years ago
Jonathan G Rennison
TELK
peter1138
translators
Niels Martin Hansen
Charles Pigott