12b6fe47c7
Fix: Set MU flag on some default engines.
5 years ago
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
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
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
8334a57332
Fix: unicode characters in Romanian town names ( #7141 )
...
Many of these town names were using the 'a with ~ above it' character,
which should actually by 'a with u above it'. There were other missing
accents as well which I've added.
5 years ago
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
6 years ago
4158c077cd
Fix: Remove duplicate French and Slovak town names
...
I've replaced some of the duplicate real town names with new real town
names in the French and Slovak sets.
Also, some Slovak town names were missing accents, so I've fixed those.
6 years ago
094160ede3
Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
6 years ago
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
6 years ago
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
48b334cf97
Add: Houses can accept up to 16 different cargo types via NewGRF.
...
New Action0 property 23 for feature 07, variable length, format B n*(B B). Initial byte is number of structures following. First byte in structure is cargo id, second is acceptance level in 1/8 units.
6 years ago
4daaec1a94
Change: Invalidate ship path caches if pathfinder choice or forbid-90-degree turns are changed.
6 years ago
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
4a162c5502
Merge branch 'cpp-11' into save_ext
6 years ago
0bed63b77f
Merge branch 'master' into cpp-11
6 years ago
82e530b517
Fix: Remove duplicate town name "Huacho" ( #7038 )
...
Huacho appears twice in the Spanish town names list. This change removes
the second one, and replaces it with a new one: Medellin.
6 years ago
65746a0275
Fix: Spelling fixes on some Latin American town names
6 years ago
a0293d313d
Add #4115 : default company colour setting ( #6998 )
...
Works only in single player.
6 years ago
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
6 years ago
962a9c5430
Merge branch 'master' into cpp-11
...
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/saveload/saveload.cpp
6 years ago
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
c540d72445
Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
6 years ago
e3207a77fb
Add setting to control if and how land purchasing is permitted
6 years ago
5f6858c379
Add: Setting to save a unique id for each savegame
6 years ago
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
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
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
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
3a640af71d
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ground_vehicle.cpp
# src/viewport.cpp
6 years ago
eff09c43cd
Fix #4109 : Add more water checks to the Oil Rig layout
...
Prevents Oil Rig docking tile from becoming unreachable by ships when spawning next to each other.
6 years ago
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
fb3cb9c3d2
Enable NewGRF debug window for non-GRF vehicles
6 years ago
f41a125d8e
Raise the maximum number of bridge types to 16
...
Raise the maximum number of possible bridge types to 16. The new
bridge types have default properties that make them unavailable at
any year and bridge length, so they cannot be used unless a NewGRF
overrides them.
(cherry picked from commit da399d7bf278ba32fb9f14af65cfcefe5d276e71)
6 years ago
76a7b70cad
Implement NewGRF Station var 0x42 (rail type) for unbuilt stations
6 years ago
a84fbcb219
Change bridges over stations/objects settings from expert to advanced
6 years ago
4bdbf3863d
Add setting to allow placing stations under bridges
6 years ago
56bde8ce18
Add setting to allow placing all NewGRF objects under bridges
6 years ago
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
6 years ago
77362b829a
Initial support for rail custom bridge heads
6 years ago
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
373ff3dd4e
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/table/settings.h.preamble
6 years ago
2aacddd412
Codechange: lengthof is not defined for runtime-length strings, use sizeof instead
6 years ago
4fb76db42f
Feature #986 : Automatic save when losing connection to a network game
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
e82ccad052
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/signal.cpp
# src/table/settings.ini
# src/train_cmd.cpp
# src/tunnelbridge.h
6 years ago
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
55083a0f65
Merge branch 'save_ext' into jgrpp
6 years ago
3caf92c514
Fix default for orderproc not being set in table/win32_settings.ini
6 years ago
a8cfc9fe90
Debug: Add vehicle index and flag dump to NewGRF debug window
6 years ago
d2d8a86814
Add setting: station rating waiting time tolerance depends on cargo class
6 years ago
f2072319cb
Add autosave_on_network_disconnect setting to GUI
6 years ago
7559db2bbb
Merge remote-tracking branch 'nielsmh/bug986' into jgrpp
6 years ago
db5abdd78a
Feature #986 : Automatic save when losing connection to a network game
6 years ago
fa304cdb75
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
ad1c402ad8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/settings_type.h
# src/town_cmd.cpp
# src/window.cpp
6 years ago
cfe6a8ea4f
Add: Replace independment map scrolling GUI settings with single option, and add choice to not lock cursor position when scrolling. ( #6756 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
4bcd05a620
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# findversion.sh
6 years ago
b90c5b9618
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
6 years ago
3b32075e8a
Add: {PUSH_COLOUR} and {POP_COLOUR} control codes to handle switching colours. ( #6737 )
...
This replaces the internal SCC_PREVIOUS_COLOUR swap.
6 years ago
9175c349da
Fix #6465 : Add {NORMAL_FONT} and {MONO_FONT} control codes to GS strings ( #6726 )
6 years ago
9ab2b8fa3e
FIX: {PREVIOUS_COLOUR} string control code was not activated for some reason. The logic for it is in place.
...
(cherry picked from commit 9d7c265fdca7884db26b3c2d0f856cc18a751c54)
Fixes : #41
6 years ago
6ec78ff4b0
Add UI setting to disable mass action buttons for top-level vehicle lists
6 years ago
7aab49e282
Add setting to enable through loading in UI
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 years ago
16c67ea484
Merge branch 'master' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/saveload/saveload.cpp
# src/stdafx.h
# src/vehicle.cpp
6 years ago
59dd7be686
(svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu)
6 years ago
91bcc210cf
(svn r27978) -Fix [FS#6673] (r18541): Store the map variety setting in the samegame like the other mapgen settings, so restarting maps considers it. (Samu)
6 years ago
86829c54c4
(svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots.
6 years ago
b85190128a
(svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots.
6 years ago
9a1a5a9d68
Increase maximum value of ticks per minute setting
6 years ago
097cf9b0b1
Add UI setting to control whether cargo filter drop down is shown
7 years ago
39701cf5df
Merge branch 'master' into cpp-11
7 years ago
aa138baec9
Add UI setting for whether programmable signals shown in UI (default off)
...
Add setting subcategory for advanced signal features
7 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
19e62d089f
Merge branch 'master' into save_ext
7 years ago
13106675de
(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant
7 years ago
6dec889306
(svn r27908) -Codechange: Mark airport tile tables and FTAs "const" to be sure that they are really constant
7 years ago
c3a9eca1a9
Add town growth setting, rate depends on proportion of transported cargo
7 years ago
36a712a579
Add very and extremely slow options to town growth rate setting
7 years ago
0d2be99827
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
7 years ago
a3d1585826
Add settings callback field to re-order setting options in GUI
7 years ago
46050820c5
Fix missing template definition in company_settings.
...
(cherry picked from commit 6e505ceab1
7 years ago
6fcb156989
Add generic mechanism to cross-ref settings at load time.
...
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
(cherry picked from commit b5c453b21e
7 years ago
ac016eae5e
Add client setting to enable shared order group window for single vehicles
7 years ago
f3a0aace0c
Merge branch 'master' into cpp-11
...
# Conflicts:
# src/stdafx.h
7 years ago
9ed0541e77
Import town bridges over rails patch
...
Add setting (default off)
From: https://www.tt-forums.net/viewtopic.php?f=33t=76052
7 years ago
4db69283c1
Add setting to disable removing sea/rivers
7 years ago
9077d6f4d2
Add support for loading SpringPP v2.3, v2.4 savegames
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
5a2fe49457
Add setting for transfer payment mode from source, minus transfers.
...
This is to reduce large negative payments for the final leg.
7 years ago
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
7 years ago
8317eac918
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/traditional_chinese.txt
# src/window.cpp
7 years ago
7dbf99fa33
Add UI setting to hide adv tracerestrict features from GUI
...
Hide wait at PBS and slot features.
7 years ago
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
688ee9ac11
Add string control code to consume an argument.
7 years ago
7194e19380
Merge branch 'save_ext' into tracerestrict-sx
7 years ago
Peter Nelson
Jonathan G Rennison
PeterN
nikolas
Niels Martin Hansen
Gabda87
glx
damfr
Samu
cirdan
Charles Pigott
Pavel Stupnikov
keldorkatarn
frosch
adf88