Commit Graph

996 Commits (157beb05ed53e1e7048424febae53c8fd9528ebe)

Author SHA1 Message Date
Jonathan G Rennison 987e752cee Fix articulated trams decoupling when turning around
In the case where the front of the tram starts turning due to a
non-waitable dead-end, and before the next vehicle part can turn
the dead-end is removed.
7 years ago
Jonathan G Rennison 2533210fc9 Fix tunnels underground view merge issue with custom bridgeheads. 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison da177d063f Custom bridge heads: Initial implementation 8 years ago
Jonathan G Rennison dcbde21f18 Merge branch 'save_ext' into improved_breakdowns
# Conflicts:
#	src/train_cmd.cpp
8 years ago
Jonathan G Rennison 7f10d83a4a Merge branch 'template_train_replacement' into jgrpp
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
8 years ago
frosch c175067ed9 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
frosch f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
Jonathan G Rennison d733955d33 Add road vehicle state to UpdateViewport()->GetImage() var whitelist.
Minor refactoring of var check.
8 years ago
Jonathan G Rennison 3ac94e97c8 Cache the result of GetImage() in Vehicle::UpdateViewport() where possible.
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
8 years ago
Jonathan G Rennison 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
Jonathan G Rennison 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
Jonathan G Rennison efcdd6c36f Remove global automated timetable setting. 8 years ago
Jonathan G Rennison 31a5baf555 Merge branch 'improved_breakdowns-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/settings.cpp
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison e9dc82c801 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/saveload/extended_ver_sl.cpp
9 years ago
Jonathan G Rennison 42370dc28d Add company setting to auto-enable auto timetables for new vehicles.
Default: off.
9 years ago
Jonathan G Rennison 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
Jonathan G Rennison 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
patch-import 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
Jonathan G Rennison 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
Jonathan G Rennison 2f9ebebf02 Merge branch 'master' into wait_in_depot 9 years ago
patch-import d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
Jonathan G Rennison 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
patch-import 9f5164b403 Import Improved Breakdowns patch
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
Jonathan G Rennison 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
frosch 5b1632f4aa (svn r27190) -Fix [FS#6255] (r27106): Original road vehicle acceleration crashed for vehicles taking over. 9 years ago
frosch 59d41a89c4 (svn r27190) -Fix [FS#6255] (r27106): Original road vehicle acceleration crashed for vehicles taking over. 9 years ago
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
frosch a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
michi_cc 9983ddee32 (svn r27106) -Fix [FS#6176]: Use the actual max speed of the vehicle in front when determining if a RV can overtake. 10 years ago
michi_cc 8621ca4115 (svn r27106) -Fix [FS#6176]: Use the actual max speed of the vehicle in front when determining if a RV can overtake. 10 years ago
peter1138 f7f49c15a3 (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 10 years ago
peter1138 ce9fab58bc (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 10 years ago
rubidium 4e021f0059 (svn r26888) -Codechange: use ints for some z-levels of vehicles (ic111) 10 years ago
rubidium 14a599409e (svn r26888) -Codechange: use ints for some z-levels of vehicles (ic111) 10 years ago
rubidium ac269a3f08 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 10 years ago
rubidium 6c2abf0930 (svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class 10 years ago
fonsinchen d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
fonsinchen c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
rubidium 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
rubidium 0463dbdc9e (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
frosch 8ca01821be (svn r26180) -Fix: Visual effects did not work for articulated RV parts. 11 years ago
frosch 3bdb4982d7 (svn r26180) -Fix: Visual effects did not work for articulated RV parts. 11 years ago
frosch 7fcae50579 (svn r26169) -Fix-ish [FS#5831-ish]: Unify the time a RV needs to travel through a curve. 11 years ago
frosch b02179bd8e (svn r26169) -Fix-ish [FS#5831-ish]: Unify the time a RV needs to travel through a curve. 11 years ago
frosch cc5e8bf56d (svn r26152) -Revert/Fix (r26118) [FS#5822]: While the condition is non-sense, the 'true' case is required for articulated parts and the 'false' case is required for savegame compatibility. 11 years ago
frosch c69c2a243b (svn r26152) -Revert/Fix (r26118) [FS#5822]: While the condition is non-sense, the 'true' case is required for articulated parts and the 'false' case is required for savegame compatibility. 11 years ago
rubidium a498a56573 (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium d2ba772f6a (svn r26130) -Codechange: add some guards against using invalid image indices 11 years ago
rubidium 8388624284 (svn r26118) -Fix-ish?: comparing the old Direction to the possibly new state containing a TrackDir... well comparing apples and pears. Occasionally they would be the same and occasionally not; at least without any logic behind it.
Since the occasions that the false branch was taken never resulted in a bug report, I highly doubt that removing it completely affects anything... except the visual speed of cornering in a numer of corners (<50%) and visual speed in an old style road stop.
11 years ago
rubidium b12205697b (svn r26118) -Fix-ish?: comparing the old Direction to the possibly new state containing a TrackDir... well comparing apples and pears. Occasionally they would be the same and occasionally not; at least without any logic behind it.
Since the occasions that the false branch was taken never resulted in a bug report, I highly doubt that removing it completely affects anything... except the visual speed of cornering in a numer of corners (<50%) and visual speed in an old style road stop.
11 years ago
frosch 206616bf37 (svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading. 11 years ago
frosch 5bda07c10c (svn r25648) -Change [FS#5669]: [NewGRF] Invalidate vehicle recolour palette during (un)loading. 11 years ago
rubidium 46df11b74a (svn r25319) -Fix [FS#5570]: crash when train with reserved cargo vanishes 11 years ago
rubidium 254c3834d0 (svn r25319) -Fix [FS#5570]: crash when train with reserved cargo vanishes 11 years ago
rubidium 6b746167e4 (svn r25259) -Codechange: track capacities and usage of links 11 years ago
rubidium 3947453277 (svn r25259) -Codechange: track capacities and usage of links 11 years ago
frosch 3b6accc165 (svn r25222) -Change: Unify the behaviour of Vehicle::tick_counter between RV and trains by incrementing it also for articulated RV parts. 11 years ago
frosch 65855af084 (svn r25222) -Change: Unify the behaviour of Vehicle::tick_counter between RV and trains by incrementing it also for articulated RV parts. 11 years ago
frosch 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
frosch 5eddbb338b (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
frosch e2db0c5e26 (svn r25167) -Fix [FS#5523] (r24832): Original train and rv acceleration did no longer respect bridge speed limits. 11 years ago
frosch 1eb6e76d08 (svn r25167) -Fix [FS#5523] (r24832): Original train and rv acceleration did no longer respect bridge speed limits. 11 years ago
rubidium 58ec317c5a (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 12 years ago
rubidium ced17303c2 (svn r24998) -Fix [FS#5137]: Set vehicle's service interval is percent flag appropriately on creation (peter1138) 12 years ago
rubidium 2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 12 years ago
rubidium c77cd1f409 (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 12 years ago
rubidium 9f8cf49646 (svn r24966) -Fix [FS#5228]: trams would get stuck on water 12 years ago
rubidium 191cfd077f (svn r24966) -Fix [FS#5228]: trams would get stuck on water 12 years ago
frosch 336a93a9d8 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
frosch 3ce8d2ce70 (svn r24846) -Add: Advanced settings to disable certain sound effects. 12 years ago
michi_cc bac2b4c25d (svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi) 12 years ago
michi_cc 245e32a10e (svn r24839) -Feature [FS#5271]: [NewGRF] Support oversized purchase list sprites. (Based on patch by Eddi) 12 years ago
michi_cc 009d20e990 (svn r24832) -Fix [FS#5397]: [NewGRF] Take bridge speed limits into account for vehicle variable 4C. 12 years ago
michi_cc 8eb1cb4ebb (svn r24832) -Fix [FS#5397]: [NewGRF] Take bridge speed limits into account for vehicle variable 4C. 12 years ago
frosch 076e69a2d8 (svn r24713) -Fix [FS#5262]: [NewGRF] Tolerate old NewGRFs returning invalid values via CB 11. 12 years ago
frosch 0a4fe02a47 (svn r24713) -Fix [FS#5262]: [NewGRF] Tolerate old NewGRFs returning invalid values via CB 11. 12 years ago
frosch 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
frosch 08a8c3a773 (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
frosch ff95e3edaf (svn r24383) -Fix: a comment. 12 years ago
frosch 8d004f3c63 (svn r24383) -Fix: a comment. 12 years ago
frosch 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
frosch 22632d5e9a (svn r24382) -Fix: Call Vehicle::IsStoppedInDepot only for the first vehicle in a chain (i.e. primary vehicle or free wagon). 12 years ago
frosch e4f0539cae (svn r24381) -Revert (r24380): RoadVehicle::IsInDepot was supposed to behave different to Train::IsInDepot. 12 years ago
frosch e0cf1e3e94 (svn r24381) -Revert (r24380): RoadVehicle::IsInDepot was supposed to behave different to Train::IsInDepot. 12 years ago
frosch 00a84fc4ce (svn r24380) -Fix [FS#5188]: RoadVehicle::IsInDepot did not check all articulated parts. 12 years ago
frosch c1dd0107c7 (svn r24380) -Fix [FS#5188]: RoadVehicle::IsInDepot did not check all articulated parts. 12 years ago
frosch 542ef5ad47 (svn r24331) -Change [FS#5204]: [NewGRF] Make bounding boxes of road vehicles change according to the vehicle length to make alignment easier. 12 years ago
frosch 4c79a06567 (svn r24331) -Change [FS#5204]: [NewGRF] Make bounding boxes of road vehicles change according to the vehicle length to make alignment easier. 12 years ago
frosch dcd977f778 (svn r24328) -Codechange: Simplify some silly code. 12 years ago
frosch 2eb9795a98 (svn r24328) -Codechange: Simplify some silly code. 12 years ago
frosch 2aa43d6c8b (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 12 years ago
frosch a8c88f43b6 (svn r24284) -Codechange: Remove NewsSubtypes and directly use NewsTypes and NewsFlag instead. 12 years ago
michi_cc 64c5299b4d (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 13 years ago
michi_cc f2c694c8fb (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 13 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago