Jonathan G Rennison
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
Peter Nelson
fa53abe864
Doc: Yearly increment.
5 years ago
Niels Martin Hansen
0bca363401
Add: Warn before overwriting an existing save file
5 years ago
Jonathan G Rennison
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
5 years ago
PeterN
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
5 years ago
Jonathan G Rennison
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
5 years ago
Peter Nelson
6e5b90f4f7
Change: For consistency, add company name to colour scheme window.
5 years ago
glx
a18b0eba5b
Add: more options for translators
5 years ago
Jonathan G Rennison
094160ede3
Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
5 years ago
Jonathan G Rennison
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
5 years ago
Niels Martin Hansen
f37304f9f5
Cleanup: Remove unused strings
5 years ago
Niels Martin Hansen
08ffa16d51
Fix 8859381: Display of requires/produces in Build Industry window
...
Change the window to use a dynamically generated string of cargoes,
instead of one of a few fixed-length lists. With up to 16 cargoes
on each list, having 16 with the only difference how many are listed
seems like a bad maintenance idea.
5 years ago
Jonathan G Rennison
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
Alberth289346
f4b8a67aed
Fix #6408 : Improve wording of the dragging signal distance tooltips (juanjo) ( #7055 )
6 years ago
Nikolas Nyby
0f9d1019e6
Add: Mexican Peso currency
...
OpenTTD doesn't have any pesos, so I've added Mexican pesos,
at its current exchange rate: 1GBP = 24.39MXN, rounded to 24.
6 years ago
Gabda87
a0293d313d
Add #4115 : default company colour setting ( #6998 )
...
Works only in single player.
6 years ago
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
6 years ago
Jonathan G Rennison
635c7ca2d5
Merge branch 'save_ext' into more_cond_orders-sx
...
# Conflicts:
# src/lang/english.txt
# src/order_type.h
6 years ago
Niels Martin Hansen
15a7f9da9d
Fix 13056ae: PR #7017 added new enum value in bad position, move it
6 years ago
Eddi-z
13056aedbc
Add: Conditional order for max. reliability (patch by Cirdan, #6360 ) ( #7017 )
6 years ago
Jonathan G Rennison
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
Jonathan G Rennison
5b0cca4b57
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
Jonathan G Rennison
7f87e3d61c
Add an action 5 type ID remapping mechanism
6 years ago
Jonathan G Rennison
b1190b32b0
Merge branch 'master' into jgrpp
6 years ago
Jonathan G Rennison
e3207a77fb
Add setting to control if and how land purchasing is permitted
6 years ago
damfr
5d8b9de482
Add: Message popup when trying to overwrite a different savegame
6 years ago
damfr
1b3ce25c07
Add: Warning in save description when showing a save whith a different id
6 years ago
damfr
868c6f924a
Add: Filter box to the save and load windows ( #6974 )
...
Save and heightmap names can be filtered.
6 years ago
Niels Martin Hansen
9e30fbab34
Fix #6864 : Normalise colour use in Frame rate window
6 years ago
Jonathan G Rennison
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
Jonathan G Rennison
8b37e5aac2
Implement custom bridge pillar flag support
...
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars
Set values for default bridges and stations
6 years ago
Jonathan G Rennison
06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
Jonathan G Rennison
9a6a66a054
Add general NewGRF Action 0 property mapping scheme to Action 14
6 years ago
Jonathan G Rennison
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
Jonathan G Rennison
83a063f51c
Add train is in slot conditional order
6 years ago
Niels Martin Hansen
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
Oskari Leppäaho
b3b89257f7
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
6 years ago
Jonathan G Rennison
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
Jonathan G Rennison
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
Jonathan G Rennison
92a5e59165
Zoning: Add modes to show 2x2 and 3x3 town road grids
6 years ago
Jonathan G Rennison
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
Max Maton
eed0da60a2
Fix #6622 : Fixes empty company name in news when gamescript constructs a town
6 years ago
Jonathan G Rennison
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
Jonathan G Rennison
3e50336079
Add trace restrict train status conditional
6 years ago
keldorkatarn
6228a336d4
Show the most relevant information in the vehicle list window, based on what the list is sorted on.
...
(cherry picked from commit da2d0e14fecec35dbf805395200b12998c8cc52a)
Minor changes
6 years ago
Jonathan G Rennison
d8b9e2953e
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
keldorkatarn
98da7019d6
Plans: Make it possible to give plans a name.
...
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
6 years ago
Jonathan G Rennison
5732e4f7ff
Show reversing and timetable waiting in vehicle status bar
6 years ago
Jonathan G Rennison
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
Jonathan G Rennison
9038ac5c00
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
6 years ago