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
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
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
5 years ago
4daaec1a94
Change: Invalidate ship path caches if pathfinder choice or forbid-90-degree turns are changed.
5 years ago
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# 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
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
097cf9b0b1
Add UI setting to control whether cargo filter drop down is shown
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
36a712a579
Add very and extremely slow options to town growth rate setting
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
2a3f59dc8a
Refresh screen when changing day length
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
7 years ago
258e591f71
Merge branch 'cpp-11' into save_ext
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
83091f55da
Merge branch 'vehicle_group_info' into jgrpp
7 years ago
f58fe00294
Merge branch 'master' into save_ext
7 years ago
48b9cbbb76
(svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path.
7 years ago
73ea8cdb21
(svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path.
7 years ago
1e5c788541
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/table/settings.ini
# src/tunnelbridge.h
7 years ago
d762835903
Signals on tunnel/bridges are now added to infrastructure stats.
7 years ago
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
8 years ago
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
375b069f82
Replace day length scaled tick macros with global variables.
...
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
25bd3ed6f4
Fix map borders when switching freeform edges
...
When disabling freeform edges after they were enabled, the tiles
at the northern borders of the map were turned from void to water
by simply setting their type to MP_WATER, which is wrong, because
they were left as owned by player 0, since their owner information
was not updated. Use MakeSea instead, which gets it right.
(cherry picked from commit 39408d6cc4080760f5a58d60cbed9f2ea584496f)
8 years ago
8e8d7e93d5
Tidy up legacy-compatibility code in PATX/PLYX handlers.
...
Use lambdas instead of manual emulation.
Move an inner struct back into its owner function.
8 years ago
f6d374ade4
Merge branch 'house_placing' into jgrpp
...
This reverts the house picking/placing patch back to v2.
This is to fix house placement/town growth desync issues introduced in v4.
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
95b65163e3
Revert back to v2 of house picking/placing patch.
8 years ago
41a06e698f
Merge branch 'house_placing' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/town_gui.cpp
8 years ago
0fd34a17a5
Update to v4 of house placing patch.
8 years ago
31a5baf555
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/settings.cpp
9 years ago
fe2277dfbc
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
9 years ago
5eed9865d6
Improved breakdowns: Various changes and fixes.
...
* Revert breakdown_chance to (mostly) its original behaviour.
* Create a new breakdown_chance_factor to hold breakdown_chance
from improved breakdowns logic.
* Revert airport crash probabilities back to original behaviour, with
modified behaviour only during emergency landings.
* Low power breakdowns now only reduce the power of the engine which
has broken down.
* Low power breakdowns no longer reduce speed directly.
* Add callback function to run whenever improved breakdowns setting
is changed. Reset breakdown_chance_factor where required.
* More whitespace/formatting...
9 years ago
30d8cb2d4c
Fix font height cache when changing GUI scaling.
9 years ago
60a677692e
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/settings_gui.cpp
src/table/company_settings.ini
9 years ago
e606a847c6
Add an un-ordered chunk for extra company settings: PLYX.
...
This is similar to the PATX chunk.
Minor refactoring to enable some code sharing between two chunks.
Fix MakeSettingsPatxList always regenerating cache.
Update documentation of PATX chunk structure.
9 years ago
d715b7eb07
Merge branch 'improved_breakdowns-sx' into jgrpp
9 years ago
cc79a4d0f8
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
9 years ago
eed722c777
Improved breakdowns: Remove non-deterministic changes to breakdown_chance.
...
These cause desyncs in multiplayer.
9 years ago
bbc131ce47
Merge branch 'jgrpp' into save_ext_spp
...
Conflicts:
src/saveload/order_sl.cpp
9 years ago
805986811a
Merge branch 'save_ext' into jgrpp
9 years ago
Jonathan G Rennison
PeterN
glx
Charles Pigott
frosch
innocenat
peter1138
cirdan
patch-import