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
f58fe00294
Merge branch 'master' into save_ext
7 years ago
0e68f9db70
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
7 years ago
d934ef9b00
(svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire)
7 years ago
58d8a791e4
Merge branch 'save_ext' into tracerestrict-sx
7 years ago
fae4ac1a5d
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
7 years ago
212f6ce6ef
Chunnel: Add setting to enable construction, default off.
7 years ago
7b88f7a290
Add minimum town distance patch, with minor modifications
...
Move implicitly added value of 20 to setting default.
Adjust setting texts.
From: https://www.tt-forums.net/viewtopic.php?p=1095146#p1095146
7 years ago
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
7 years ago
60f7168c22
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
7 years ago
1b9139efe8
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
7 years ago
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
1f727e9029
Custom bridge heads: Add savegame version and setting.
8 years ago
1e5c788541
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/table/settings.ini
# src/tunnelbridge.h
8 years ago
d762835903
Signals on tunnel/bridges are now added to infrastructure stats.
8 years ago
b3f49672ec
Change default for cargo recalc interval not scaled by day length, to true.
8 years ago
82152d8605
Merge branch 'tracerestrict' into tracerestrict-sx
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
f5e4d8e73a
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
8 years ago
1ff60c44bf
Increase max vehicle-type unit setting limits.
8 years ago
074555e41d
Merge branch 'save_ext' into signal_tunnels_bridges
8 years ago
5c7f36ef4b
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
Further fixes for viewport lines/marker for multiplayer clients.
# Conflicts:
# src/lang/russian.txt
8 years ago
0d1e08ed75
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/clear_cmd.cpp
8 years ago
56f173e15e
Merge branch 'master' into save_ext
8 years ago
9145e5d2b5
(svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type.
8 years ago
b25afb239a
(svn r27706) -Feature: [NewGRF] String command 9A 1E to print the name of a cargo type.
8 years ago
124f386fd1
(svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries.
8 years ago
2c8b84f21d
(svn r27705) -Doc: Add the hex codes to the SCC_NEWGRF_ enum entries.
8 years ago
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
8 years ago
f5212b27e4
Add a DECIMAL1 string code, which is DECIMAL with a fixed param of 1.
8 years ago
37a58fd11d
Add setting to increase station catchment radius.
...
Update acceptance and refresh screen when catchment settings change.
8 years ago
10ae23d3b9
Merge branch 'departure-boards' into jgrpp
...
VehicleListIdentifier API changes.
# Conflicts:
# src/departures.cpp
# src/vehicle_gui.cpp
8 years ago
31b2a39d02
Merge branch 'save_ext' into departure-boards
...
Adjust calls to GenerateVehicleSortList due to API change.
8 years ago
dbd99707b6
Merge branch 'master' into save_ext
8 years ago
616c02c42e
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
8 years ago
d9bfe88261
(svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary.
8 years ago
f0bcec77fb
Import patch for random town road reconstruction.
...
From https://www.tt-forums.net/viewtopic.php?f=33&t=36438
Change scale from 0-100 to 0-1000
Adjust strings, settings GUI placement, etc.
8 years ago
161f70eb4a
Merge branch 'save_ext' into signal_tunnels_bridges
8 years ago
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
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
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
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
162e495cc9
Merge branch 'save_ext' into tracerestrict-sx
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/extended_ver_sl.cpp
8 years ago
a6e0b1ac7d
Merge branch 'cpp-11' into save_ext
8 years ago
f7af8b8bdc
Silence -Wunused-variable warnings in src/table/townname.h
8 years ago
533cb7c156
(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)
8 years ago
ac6793dace
(svn r27654) -Change: Enable C++11 for clang 3.3 (LordAro)
8 years ago
9ae057b8bf
Fix loading of SpringPP savegames.
...
Was broken in jgrpp-0.13.1
8 years ago
f0fee802a9
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/settings_gui.cpp
# src/settings_type.h
# src/table/settings.ini
# src/vehicle_gui.cpp
8 years ago
ed33a62bcd
Merge branch 'tracerestrict' into tracerestrict-sx
8 years ago
0ab2abbc23
Add client setting to show train weight ratios in details header.
...
Off by default.
8 years ago
8ec1b2200e
Change tracerestrict weight ratio properties to use decimals, and the weight unit.
...
Add {POWER_WEIGHT_RATIO} and {FORCE_WEIGHT_RATIO} string codes.
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
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
8 years ago
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
8 years ago
efcdd6c36f
Remove global automated timetable setting.
8 years ago
ff5ee52b94
Add a company setting to control auto-fill timetable rounding.
8 years ago
04b188bd7d
Add client setting to show leftover ticks in timetable.
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
7bc407e2f8
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_type.h
# src/table/settings.ini
8 years ago
1818a83e63
Add setting to control whether trains can crash with other companies'.
8 years ago
1f5535c0b1
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
9 years ago
a27bdbb3e2
Add company settings to enable competitors' to buy/renew in own depots.
9 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
248ac0e263
Merge branch 'save_ext' into infrastructure_sharing-sx
9 years ago
e5894b3948
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
9 years ago
6992312702
Merge branch 'master' into infrastructure_sharing
9 years ago
78cf5ca682
Add setting for linkgraph times to be in non daylength scaled days.
...
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
9 years ago
c5f9d8b6de
Import reduced tree patch
...
http://www.tt-forums.net/viewtopic.php?p=890778#p890778
Update to recent trunk, use extended savegame framework.
Add setting help text, tweak setting name.
Pre-calculate tree growth probabilities.
9 years ago
a671f40fc8
Merge branch 'save_ext' into tracerestrict-sx
9 years ago
27bdf2a8b6
Merge branch 'ship_collision_avoidance-sx' into jgrpp
...
Conflicts:
src/settings_type.h
src/table/settings.ini
9 years ago
b00b1125be
Add a dedicated setting to enable ship collision avoidance.
9 years ago
a8ce1f05bf
Increase max value of difficulty.max_loan setting.
9 years ago
69f3844d2e
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/settings_gui.cpp
src/settings_type.h
src/table/settings.ini
9 years ago
07aba3eb84
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
a93714a720
Add setting to show restricted electric signals using the default sprites.
...
This is to improve visual distinctiveness of restricted signals when
using signal GRFs.
This defaults to off.
9 years ago
6075dd22e2
Show small square if vehicle owner does not match list owner.
...
No longer check the infrastructure sharing setting.
Add a separate setting to control company colour squares (default on).
9 years ago
ea3198cc25
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
9 years ago
4608ed79bb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
16c5a0a812
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
5a0510e488
Fix dark/lighten colour mappings going to/from yellow flash cycle.
...
This is problematic for the green company in viewport map owner mode,
where it becomes flashing yellow for slopes and tunnels (if enabled).
9 years ago
7dc91d0858
Merge branch 'departure-boards' into departure-boards-sx
9 years ago
44d545d220
Merge branch 'master' into departure-boards
9 years ago
d65ddc8985
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
61aad7ce2a
Change the default auto timetable separation rate to 40%.
...
This is to improve jam-resistance by default.
9 years ago
b48a01f233
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/settings_gui.cpp
src/settings_type.h
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
26d32269a3
Make auto TT separation rate a company setting.
...
Move auto TT by default setting to PLYX chunk.
9 years ago
a380573c32
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
6d263226d8
Move order occupancy smoothness to company settings.
9 years ago
8001d86350
Merge branch 'save_ext' into order_occupancy-sx
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
e9dc82c801
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
42370dc28d
Add company setting to auto-enable auto timetables for new vehicles.
...
Default: off.
9 years ago
ce15bdc08f
Merge branch 'save_ext_spp' into jgrpp
9 years ago
6e505ceab1
Fix missing template definition in company_settings.
9 years ago
5d7ad2ba7b
Merge branch 'vehicle_details_gui_additions' into jgrpp
...
Conflicts:
src/table/settings.ini
9 years ago
5a07315405
Add train length and group name to vehicle details window.
...
Add settings to control each, default on.
Re-init window whenever presence of group name line changes.
9 years ago
bbc131ce47
Merge branch 'jgrpp' into save_ext_spp
...
Conflicts:
src/saveload/order_sl.cpp
9 years ago
591d2ee8b9
Merge branch 'ingame_rivers' into jgrpp
...
Conflicts:
src/settings_gui.cpp
src/settings_type.h
9 years ago
9c75a3c477
Enable building rivers in-game.
...
Controlled by setting, default off.
9 years ago
58780fb109
Merge branch 'everest_treeline-sx' into jgrpp
9 years ago
64a6f5c0d4
Merge branch 'jgrpp' into save_ext_spp
9 years ago
efb1ba3337
Add GUI settings and setting/help texts.
...
Move tree-related functions into their own GUI sub-category.
9 years ago
381d11096f
Bin no_trees_on_this_level, use exp. decay away from snow line.
...
Probability of placing an arctic tree is now an exponential decay
function of height distance from the snow line, instead of the previous
50% blocks.
This results in a more gradual thinning out of arctic trees in
each direction.
The algorithm is: p = exp(-3 * distance / range_setting),
using a rather crude approximation of the exponential function.
The no_trees_on_this_level setting is not really useful, and its
dual behaviour to disallow discrete height levels and turn on the
snow line behaviour is unintuitive.
Replace it with a simple on/off setting.
9 years ago
3b120c6cbd
Merge branch 'save_ext' into everest_treeline-sx
9 years ago
efe85200f0
Import Everest treeline patch
9 years ago
f2d0c3a441
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/gfxinit.cpp
src/rail_cmd.cpp
src/table/sprites.h
9 years ago
6643d0a661
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
8faead7e7a
Graphically indicate restricted signals by recolouring the signal post.
...
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
9 years ago
ba8d8d99b8
Add support for loading SpringPP savegame versions 221 and 222.
...
These correspond to versions from v2.1.108 and v2.1.147.
The oil rig airport type bug is fixed as of version 221.
The oil rig type has been moved, but this is not a problem as
the afterload code already remaps it to the correct value.
The cost scaling issue also seems to have been mostly fixed
as of version 221.
9 years ago
b5c453b21e
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.
Use this to load SpringPP settings which have a corresponding setting.
9 years ago
74e5d97fcb
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
034279c0e8
Merge branch 'save_ext' into jgrpp
9 years ago
a8cc81d054
Initialiser list fixes for legacy compilers.
9 years ago
ef5ecdb2c7
Merge branch 'git_findversion_fix' into save_ext
9 years ago
1ead315e42
Merge branch 'improved_breakdowns' into improved_breakdowns-sx
9 years ago
6d695a1426
Merge branch 'master' into improved_breakdowns
9 years ago
9716026809
Merge branch 'jgrpp' into save_ext_spp
9 years ago
6088c7fc24
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
671151474b
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/settings_gui.cpp
9 years ago
19764bb4fb
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
9 years ago
88c150abf7
Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx
9 years ago
388dab7390
Merge branch 'master' into enhanced_viewport_overlay
...
Conflicts:
src/road_gui.cpp
src/widgets/dropdown.cpp
9 years ago
25bc8eb1e2
Save/load changes for timetable_separation_rate setting.
9 years ago
adb3156951
Merge branch 'auto_timetables' into auto_timetables-sx
9 years ago
40ad3dea02
Auto separation: Add setting to scale vehicle lateness adjustments.
...
No longer set vehicle lateness to 0 if separation fails, instead
leave it as it was.
The setting defaults to 100% (full abruptness, old behaviour).
Reduce the setting if auto separation is too disruptive, e.g. causes
excessive waiting in stations.
Note that this is not savegame compatible.
9 years ago
44918010df
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
2b8bb12d62
(svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists.
9 years ago
438d7a26cc
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
9 years ago
d818e1779c
(svn r27378) -Codechange: Fix indentation of the table values, allow Doxygen to link to the TextColour enum.
9 years ago
f0fecda985
Merge branch 'order_occupancy-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
9 years ago
fdce64ddae
Save/load changes for order occupancy
9 years ago
52c07d1f51
Merge branch 'save_ext' into order_occupancy-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
117599ec7f
Order occupancy: Add column to orders GUI to show occupancy running average.
...
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
9 years ago
39608841f2
Initial support for loading savegames from SpringPP v2.0.102/103
...
Savegame version 220
Bin all extra settings added in SpringPP.
Bin extra features: trip histories, more conditional orders/jump counter,
prev order time, snow-line chunk, town auto adv. campaign, etc.
Fix vehicle flags.
Fix bridges wrt height changes.
Handle 60-bit RIFF chunk sizes.
Doesn't deal with huge airports, loading games with these may
lead to undefined ehaviour.
PAX signals and traffic lights are ignored.
9 years ago
15c2327fd4
Merge branch 'master' into auto_timetables
9 years ago
9565e5b9b1
Merge branch 'day_length-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/timetable_cmd.cpp
9 years ago
41062cf78e
Save/load changes for variable day length patch.
9 years ago
454b3c61b0
Merge branch 'save_ext' into day_length-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
d70dbda351
Merge branch 'master' into day_length
9 years ago
d86a56cbef
Import day length patch
...
Minor whitespace fixes.
http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227
9 years ago
135d159fc1
Merge branch 'infrastructure_sharing-sx' into jgrpp
9 years ago
e1defe24c7
Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx
...
Conflicts:
src/table/settings.ini
9 years ago
65b1586f98
Infra sharing: Fix sharing fee settings not being shown as currency.
...
Settings were shown as (invalid string).
Fix water/dock sharing fee setting using wrong string.
9 years ago
4c6dc11c16
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/signal.cpp
src/table/settings.ini
src/vehicle.cpp
9 years ago
b3ebb1f729
Infrastructure sharing patch: save/load changes.
9 years ago
037cce3b38
Merge branch 'save_ext' into infrastructure_sharing-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
a4ad4130a6
Merge branch 'master' into infrastructure_sharing
...
Conflicts:
src/aircraft_cmd.cpp
src/economy.cpp
src/lang/english.txt
src/order_gui.cpp
src/roadveh_cmd.cpp
src/saveload/saveload.cpp
src/settings.cpp
src/settings_gui.cpp
src/train_cmd.cpp
9 years ago
ee791055f9
Import infrastructure sharing patch
...
Strip trailing whitespace
Remove a leftover line form settings.ini
http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
7ed93f9211
Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
...
town_gui.cpp updated due to struct CommandContainer change.
Conflicts:
src/command.cpp
src/command_type.h
src/gfxinit.cpp
src/openttd.cpp
src/pbs.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/saveload/saveload.cpp
src/stdafx.h
src/train_cmd.cpp
src/viewport_type.h
src/window_type.h
9 years ago
174779e371
Merge branch 'save_ext' into enhanced_viewport_overlay-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
e24839ed65
Merge branch 'master' into enhanced_viewport_overlay
...
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw
Conflicts:
src/clear_cmd.cpp
src/pbs.cpp
src/rail_cmd.cpp
src/toolbar_gui.cpp
src/train_cmd.cpp
src/vehicle.cpp
src/viewport.cpp
src/viewport_func.h
9 years ago
536a95dfd0
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
...
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
20e2f363f1
Merge branch 'vehicle_repair_costs-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
9 years ago
6bb8d5087d
Vehicle repair costs patch: implement save/load changes.
9 years ago
0a7441e56c
Merge branch 'save_ext' into vehicle_repair_costs-sx
...
Conflicts:
src/saveload/saveload.cpp
src/settings_gui.cpp
9 years ago
7537ae2a7e
Import vehicle repair costs patch
...
Strip trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268
9 years ago
ba4e5dd62f
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/lang/english.txt
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_gui.cpp
src/vehicle.cpp
9 years ago
2e45dac18a
Auto timetables patch: save/load changes, document rationale for
...
moving addition to VehicleFlags
9 years ago
33854a138f
Merge branch 'save_ext' into auto_timetables-sx
9 years ago
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
a8c2c394a5
Merge branch 'improved_breakdowns-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
9 years ago
e91d0e49dc
Improved breakdowns: Update save/load code
9 years ago
d023d0863f
Merge branch 'save_ext' into improved_breakdowns-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
9f5164b403
Import Improved Breakdowns patch
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
27c70542da
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/settings_type.h
src/signal.cpp
9 years ago
8271acadb7
Merge branch 'show_veh_tunnel' into jgrpp
9 years ago
9b4b170b2d
Merge branch 'town_cargo_adj-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
6452b0fe02
Merge branch 'departure-boards-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/window_type.h
9 years ago
6596ba216c
Merge branch 'zoning' into jgrpp
...
Conflicts:
src/table/sprites.h
9 years ago
0afc054bff
Merge branch 'adjacent_crossings-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
09be8afd8d
Adjacent crossings: add setting (in PATX), add info to SLXI chunk.
9 years ago
03373c7ef4
Zoning: Remove unimplemented modes, fix some whitespace and style issues,
...
add missing licence headers, move/rename some declarations, fix sprite
ID allocation, update to build on trunk.
9 years ago
6de087786c
Import and rebase zoning patch
...
Fix some of the whitespace issues
http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago
08dc95fea1
Add town cargo patch SLXI/PATX code.
...
Update setting string.
9 years ago
9905e478d4
Merge branch 'save_ext' into town_cargo_adj-sx
9 years ago
60377f2262
Merge branch 'master' into town_cargo_adj
...
Conflicts:
src/settings_gui.cpp
9 years ago
1c9801e6b6
Import town cargo generation factor patch
...
Adjust whitespace
http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221
9 years ago
09aa29de8b
Add signals on bridges/tunnels SLXI info, move setting to PATX.
9 years ago
00f9f75d34
Merge branch 'save_ext' into departure-boards-sx
9 years ago
526cb42608
Merge branch 'master' into depature-boards
...
Conflicts:
src/table/strgen_tables.h
9 years ago
9f79c555da
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
79138de1b9
Import departure boards patch
9 years ago
de14c210db
Add progsigs info to SLXI chunk, move setting to PATX chunk.
9 years ago
b1d8bcfe35
Merge branch 'save_ext' into progsig-sx
...
Conflicts:
source.list
src/saveload/saveload.cpp
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
c57ffc64bc
Settings update: add PATX chunk to store additional settings
...
in an unordered format which is tolerant of extra, missing or reordered
settings.
9 years ago
17e8693e62
Initial stubs for extending the save/load version checking/upgrade code,
...
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
9 years ago
5e7638a6d0
Port of old vehicles visible in tunnels patch
...
from http://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diffhttp://dev.openttdcoop.org/projects/clientpatches/repository/changes/VehicelsInTunnels.diff
9 years ago
67ae231f1b
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
9 years ago
4830497f0b
(svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif)
9 years ago
14052de6b2
(svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes.
9 years ago
50a3f44539
(svn r27295) -Add: [strgen] Default plural subparameter positions for CARGO_xxx string control codes.
9 years ago
9b946e3bf2
(svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore)
9 years ago
a91f74dbb3
(svn r27231) -Codechange: Replace magic numbers for the smoothness setting (chillcore)
9 years ago
7ae2a1764d
(svn r27183) -Fix: GCC5 compilation
9 years ago
13e3ef53e3
(svn r27183) -Fix: GCC5 compilation
9 years ago
6cb930168f
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
9 years ago
c639fb0d8e
(svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88)
9 years ago
Niels Martin Hansen
Jonathan G Rennison
PeterN
Pavel Stupnikov
keldorkatarn
frosch
peter1138
adf88
patch-import
michi_cc
alberth
rubidium