e07e4fdb8e
Merge branch 'master' into signal_tunnels_bridges
9 years ago
8d19727c93
Merge branch 'save_ext' into jgrpp
...
Conflicts:
src/pathfinder/follow_track.hpp
9 years ago
3b60379a42
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
9 years ago
5d774e5844
Merge branch 'signal_tunnels_bridges' into signal_tunnels_bridges-sx
9 years ago
4759019cf5
Fix vehicles emitting smoke when stopped at a bridge signal.
9 years ago
51787a3465
(svn r27419) -Fix [FS#6369]: CmdSellRailWagon did not revert all actions properly when no orderlist could be allocated. (Juanjo)
9 years ago
d1192bb3f9
Fix incorrect merge-conflict resolution of previous commit.
9 years ago
2e6b4cc961
Merge branch 'reverse_at_waypoint' into jgrpp
...
Conflicts:
src/order_gui.cpp
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
src/train_cmd.cpp
9 years ago
79da755c45
Fix excessive amounts of vehicle smoke when reversing at waypoints.
9 years ago
7bcd090a0f
Add reverse at waypoint orders.
...
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
9 years ago
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.
9 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
10 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
10 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
11 years ago
ac13b8baa0
(svn r25200) -Fix (r24846): The level crossing sound is an ambient sound and not a new year sound.
11 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)
11 years ago
e2db0c5e26
(svn r25167) -Fix [FS#5523] (r24832): Original train and rv acceleration did no longer respect bridge speed limits.
11 years ago
58ec317c5a
(svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138)
12 years ago
2c67dc3d9f
(svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138)
12 years ago
1e10e91fde
(svn r24905) -Feature(ish): Implement station randomisation triggers.
12 years ago
f00d9976f9
(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)
12 years ago
336a93a9d8
(svn r24846) -Add: Advanced settings to disable certain sound effects.
12 years ago
bac2b4c25d
(svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi)
12 years ago
68b078761d
(svn r24834) -Fix [FS#5396]: The autorefit dropdown in the order GUI wasn't always updated when modifying vehicle consists.
12 years ago
37da99ab90
(svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum.
12 years ago
009d20e990
(svn r24832) -Fix [FS#5397]: [NewGRF] Take bridge speed limits into account for vehicle variable 4C.
12 years ago
36ccbe5188
(svn r24831) -Fix [FS#5398]: [NewGRF] Incorrect values are better than a crash when a NewGRF queries vehicle variable 4C before vehicle initialisation is completed.
12 years ago
076e69a2d8
(svn r24713) -Fix [FS#5262]: [NewGRF] Tolerate old NewGRFs returning invalid values via CB 11.
12 years ago
358a2bd6ed
(svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked.
12 years ago
df9a6d24a0
(svn r24382) -Fix: Call Vehicle::IsStoppedInDepot only for the first vehicle in a chain (i.e. primary vehicle or free wagon).
12 years ago
2aa43d6c8b
(svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead.
12 years ago
ae4681ab4c
(svn r24282) -Codechange: Add AddVehicleAdviceNewsItem function to preemptively deduplicate code.
12 years ago
d561bfe4db
(svn r24246) -Add [FS#5052-ish]: [NewGRF] Variable with the current max speed for vehicles.
12 years ago
72f1a84a6c
(svn r24078) -Fix [FS#5093,FS#5130] (r24071): A fix that breaks all other cases isn't really a fix. Redo it to make sure that reservations of trains entering or exiting depots are properly made and freed.
12 years ago
d65352ed6f
(svn r24071) -Fix [FS#5093]: Reversing trains while they were entering or leaving a depot could lead to stuck trains.
12 years ago
64c5299b4d
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
13 years ago
4bcbf326d1
(svn r23855) -Fix [FS#5007]: out of bounds read for slowdown parameter caused desync when railtype >= 4, vehicles were fast, and the original acceleration model was used
13 years ago
cb21f37091
(svn r23781) -Fix [FS#4964]: under certain circumstances, e.g. a single invalid order, trying to determine the next order state could end up in an infinite loop
13 years ago
617993e904
(svn r23773) -Change: [NewGRF] Update all cached train properties if a train vehicle enters a new railtype.
13 years ago
0c237c337c
(svn r23744) -Fix (r23142) [FS#4923]: Check the version of the right GRF.
13 years ago
d5eeab43b7
(svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files
13 years ago
d9f717dcfa
(svn r23714) -Codechange: don't mix Viewport with non-viewport code
13 years ago
92c60447dc
(svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible
13 years ago
06597e684c
(svn r23704) -Doc: Doxygen comment fixes and additions.
13 years ago
bc65c37327
(svn r23688) -Codechange: No need to check if a train needs servicing if we only extend a train's path without actually calling the pathfinder. The path extension will stop when hitting a junction tile, so it is impossible to miss a depot this way.
13 years ago
304156a297
(svn r23683) -Fix [FS#4912]-ish: when fitting another engine the cargo capacity of wagons could become lower, causing them to contain more than they should. This caused the cargo transfer from the replaced parts to put even more stuff in the already full wagon. Prevent this from happening by reducing the amount of cargo in the vehicle to the capacity when moving vehicles/wagons around, or when autoreplacing
13 years ago
09c8676891
(svn r23681) -Fix [FS#4914]: vehicle numbers got misaccounted when autoreplacing failed due to length checks
13 years ago
bc78328918
(svn r23622) -Add: a set of events to trigger in a GameScript
13 years ago
6b404d35b8
(svn r23540) -Codechange: unify and document vehicle widgets
13 years ago
9aab2dc861
(svn r23474) -Codechange: move the declaration error related functions to error.h
13 years ago
001b76c50b
(svn r23454) -Change: Mark company window dirty when moving a rail engine creates or deletes a train.
13 years ago
af1b3cc070
(svn r23355) -Codechange: rename all AI* to Script* (Rubidium)
13 years ago
b84174fd4d
(svn r23316) -Feature: Add ability to zoom in to 2x and 4x level.
13 years ago
3b45b41e68
(svn r23290) -Fix [FS#2379,FS#3569]: Change the centre of train vehicles to depend on the vehicle length instead of being fixed at 4/8th of the original vehicle length to make sure shortened vehicles don't block tiles they shouldn't block.
13 years ago
3178814a00
(svn r23173) -Codechange: Rename GetVehicleCapacity() to Engine::DetermineCapacity().
13 years ago
cb2981422a
(svn r23171) -Fix (r23142): Fix comment.
13 years ago
93f12ad71e
(svn r23150) -Change: [NewGRF v8] Deprecate callback 11, and use callback 36 instead.
13 years ago
a608cbab5d
(svn r23148) -Change: [NewGRF] Check the results of various callbacks for validness.
13 years ago
6365d92776
(svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts.
13 years ago
1497efbd5d
(svn r23112) -Codechange: Check if vehicle chain lengths stays constant when auto-refitting.
13 years ago
0e2d2b2317
(svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables
13 years ago
de980ef0f9
(svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight)
13 years ago
6e61fee028
(svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs.
13 years ago
ad38f27242
(svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code.
13 years ago
e57ba5d0ae
(svn r23074) -Codechange: Add Vehicle::GetEngine() to simplify code.
13 years ago
f9f257ce4a
(svn r22984) -Feature: Display profit icons for groups in the group GUI.
13 years ago
3665b85c24
(svn r22978) -Codechange: Replace IncreaseGroupNumVehicle() and DecreaseGroupNumVehicle() with GroupStatistics::CountVehicle().
13 years ago
bdc2765a4a
(svn r22879) -Fix: Miscalculation of train curve speed limits. (monoid)
13 years ago
e801aebbfc
(svn r22816) -Feature(ette): [NewGRF] Also age wagons and articulated parts.
13 years ago
d25840978c
(svn r22713) -Feature: [NewGRF] Per vehicle custom cargo ageing period.
13 years ago
9219281a2b
(svn r22589) -Fix [FS#4641]: PBS order forecasting modified the current order index in case of a goto-nearest-depot order and no depot could be found.
13 years ago
7aa57e4acd
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
13 years ago
7de7488788
(svn r22328) -Add: a flag to GroundVehicles to disable insertion and removal of automatic orders until the next real order is reached.
13 years ago
afd2e51936
(svn r22244) -Codechange: Make vehicle windows handle command-/GUI-scope invalidations themself (from autoreplace and refitting).
14 years ago
ea44bb3283
(svn r22206) -Revert-ish (r14526) / Unfix-ish [FS#3569] / Fix [FS#4545]: the "center" (for movement) of vehicles is (currently still) always at 4/8th original vehicle length from the front, so trains should stop at the same location regardless of the length of the front engine
14 years ago
5629248736
(svn r22205) -Codechange: replace magic number with constant
14 years ago
9222a30173
(svn r22145) -Codechange: Do explicit test for non-bool values.
14 years ago
04f56cf6ed
(svn r22140) -Fix (r22135): I like the letter 'l' nevertheless. (Alberth)
14 years ago
074548f8f3
(svn r22135) -Fix [FS#4523]: When commands need to invalidate windows, process these events asynchronously before the next redraw. Calling window code directly from command scope uses wrong _current_company and might issue nested DoCommands() which interfer with the running command.
14 years ago
e982577b5c
(svn r22044) -Fix [FS#4493]: update the consist cache when a part of a train is flipped in the depot
14 years ago
766d67f512
(svn r22043) -Fix: invalidate the right windows when a part of a train is flipped in the depot
14 years ago
17b2021297
(svn r22024) -Fix [FS#4468]: verify we can allocate an OrderList before we actually try to do so (Rubidium)
14 years ago
701bd8848a
(svn r22017) -Codechange: move MarkTileDirtyByTile to viewport_func.h
14 years ago
fe71cbfc8b
(svn r21976) -Doc: Document several crash handling functions.
14 years ago
3c9bcf0e9a
(svn r21966) -Change [FS#4462]: [NewGRF] Disable the flipping of train engines/wagons in the depot by default for NewGRFs
14 years ago
088223e058
(svn r21962) -Feature-ish: GUI setting to disable reversing at signals
14 years ago
fd7633def5
(svn r21960) -Change: show the length of vehicles in tiles, instead of half tiles in the depot
...
-Fix [FS#4461]: don't count the number of vehicles but the length of vehicles to (configurably) limit train length
14 years ago
7c04ea586d
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
...
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
14 years ago
2a9fe0c0d8
(svn r21914) -Codechange: move the algorithmic part of Train::UpdateSpeed to a function in GroundVehicle
14 years ago
0f411f9899
(svn r21911) -Codechange: move tcache.last_speed to gcache.last_speed and make SetLastSpeed a function of GroundVehicle
14 years ago
9175046d26
(svn r21903) -Codechange: warn only once for a train that has invalid length, not for each its wagon with invalid length
14 years ago
e8274ab6b1
(svn r21880) -Fix: when a train after reversing ended at the last bit of a bridge ramp and directed outside the bridge, it could still have track set to TRACK_BIT_WORMHOLE
14 years ago
a3ae023fdb
(svn r21879) -Codechange: reset vehicle's GOINGUP/DOWN bits when it crashes
14 years ago
f2006f36a1
(svn r21875) -Codechange: indentation of some comments was wrong
14 years ago
c7ebf1d450
(svn r21874) -Fix: when a single-vehicle train was reversed while on a slope, its GOINGUP/DOWN weren't swapped
14 years ago
6ed2aa9d74
(svn r21847) -Fix [FS#4423]: slowing down of trains was done by reducing the speed by 10%, but also when you're just 1% too fast, so limit the slowdown till the new maximum speed
14 years ago
9fb08b4c4f
(svn r21836) -Fix: when a train was reversed while inside a tunnel/bridge, it wouldn't have (re)set the GOINGUP/DOWN bits after leaving the tunnel/bridge
14 years ago
5332c12440
(svn r21835) -Codechange: use UpdateStatusAfterSwap() instead of copying the same code three times
14 years ago
c4b5a322e7
(svn r21800) -Fix [FS#3569]: under certain circumstances one could crash a competitor's train; take the lazy non-future proof version of the fix from the 1.0 branch as fixing the real bug is significantly more complex and might even break some backwards compatability if not done perfectly
14 years ago
2191425e08
(svn r21529) -Doc: update comment after function name change (Krille)
14 years ago
f69d280f14
(svn r21521) -Codechange: Unify some cached values that were present in both road vehicles and trains.
14 years ago
74c061c29a
(svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache.
14 years ago
3390b98958
(svn r21509) -Codechange: rename the rail pathfinders "path_not_found" parameter to "path_found" and remove the ! where the variables are set / read
14 years ago
a4289a4e23
(svn r21508) -Codechange: move the code to handle the pathfinder's "path found" status to a separate function
14 years ago
b362f3aee9
(svn r21506) -Codechange: rename the train/vehicle lost warning strings to be more generic
14 years ago
2d661c3e84
(svn r21505) -Change: generalise the lost_train_warning setting to lost_vehicle_warning
14 years ago
45344d48bb
(svn r21504) -Codechange: move the "lost" bit from the train's flags to vehicle flags
14 years ago
Jonathan G Rennison
frosch
patch-import
rubidium
peter1138
fonsinchen
michi_cc
planetmaker
truebrain
alberth
terkhen
smatz