d715b7eb07
Merge branch 'improved_breakdowns-sx' into jgrpp
9 years ago
eed722c777
Improved breakdowns: Remove non-deterministic changes to breakdown_chance.
...
These cause desyncs in multiplayer.
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
3dec3242cc
Merge branch 'tracerestrict-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
9 years ago
06a1d7c5c9
Add reserve through action to trace restrict programs.
...
This only changes the behaviour of PBS reservations which
would otherwise terminate at a PBS signal.
If the signal restriction sets the reserve through state,
the reservation continues through the signal, and the signal
is set to green.
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
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
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
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
2f9ebebf02
Merge branch 'master' into wait_in_depot
9 years ago
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
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
80d52eb20e
Improved breakdowns patch: fix various issues
...
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
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
09be8afd8d
Adjacent crossings: add setting (in PATX), add info to SLXI chunk.
9 years ago
4117808b9d
Import adjacent crossings patch (v3.1)
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
9 years ago
9f79c555da
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
22a5c6d459
Minor fixes in CmdRemoveSingleSignal
...
Whitespace fixes
9 years ago
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
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
bba85a6e01
(svn r27209) -Add: Draw path reservation on the whole bridge, not only on the bridge heads.
10 years ago
8767a11d60
(svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad().
10 years ago
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
f7f49c15a3
(svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists.
10 years ago
49dafc0848
(svn r26907) -Codechange: Scale engine purchase list to GUI zoom level for multihead engines.
10 years ago
ac269a3f08
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
10 years ago
d49dad9f9c
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
11 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
eb6974179d
(svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to.
11 years ago
a498a56573
(svn r26130) -Codechange: add some guards against using invalid image indices
11 years ago
f84b67ea73
(svn r26129) -Fix: remove dead code; it could be made to do what it did, but then it would be inconsistent with moving vehicles around
11 years ago
14f5d55f6c
(svn r26126) -Cleanup: remove unneeded check for NULL
11 years ago
f12d0c09ec
(svn r26026) -Fix (r25648) [FS#5775-ish]: Invalidate vehicle colour palette again when rearranging consist, reversing, ...
11 years ago
41d9da548d
(svn r25955) -Fix [FS#5723]: Train's "force proceed" status gets reset when the track on the other side of the tile has a signal (adf88)
11 years ago
6bceb8b7ab
(svn r25946) -Add: [NewGRF Debuggnig] Inspecting other vehicles in a chain.
11 years ago
4fe2a3d75d
(svn r25744) -Fix (r25648): [NewGRF] Also invalidate vehicle colour palette when rearranging consists.
11 years ago
34c9d8b77c
(svn r25698) -Fix [FS#5700]: Autoreplace/renew also refits free wagons.
11 years ago
206616bf37
(svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading.
11 years ago
46df11b74a
(svn r25319) -Fix [FS#5570]: crash when train with reserved cargo vanishes
11 years ago
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
12 years ago
ac13b8baa0
(svn r25200) -Fix (r24846): The level crossing sound is an ambient sound and not a new year sound.
12 years ago
c5d7445704
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
12 years ago
e2db0c5e26
(svn r25167) -Fix [FS#5523] (r24832): Original train and rv acceleration did no longer respect bridge speed limits.
12 years ago
Jonathan G Rennison
patch-import
frosch
rubidium
peter1138
fonsinchen
michi_cc