Commit Graph

46 Commits

Author SHA1 Message Date
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
cad47bbefe
Fix: Tractive effort was slightly too high as per NewGRF spec. (#6785) 2018-05-19 22:05:51 +01:00
Jonathan G Rennison
f030318bb4 Merge branch 'improved_breakdowns' into jgrpp 2017-07-06 21:44:28 +01:00
Jonathan G Rennison
fcb6697899 Fix typo of one one instead of L L in Hp to Watts conversion constant 2017-07-06 21:44:17 +01:00
Jonathan G Rennison
ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 2017-03-05 18:05:04 +00:00
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.
2016-07-08 19:07:25 +01:00
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...
2016-01-31 22:55:25 +00:00
Jonathan G Rennison
9742300a1e Fix some more whitespace/formatting issues. 2016-01-31 15:22:46 +00:00
Jonathan G Rennison
80d52eb20e Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
2015-08-02 23:00:39 +01:00
patch-import
9f5164b403 Import Improved Breakdowns patch
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
2015-08-02 22:58:52 +01:00
rubidium
df2b116867 (svn r26702) -Fix [FS#6067]: integer overflows in acceleration code causing either too low acceleration or too large acceleration 2014-07-22 19:46:10 +00:00
rubidium
f3d085e33c (svn r26702) -Fix [FS#6067]: integer overflows in acceleration code causing either too low acceleration or too large acceleration 2014-07-22 19:46:10 +00:00
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 2014-04-23 20:13:33 +00:00
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 2014-04-23 20:13:33 +00:00
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. 2012-07-07 15:39:46 +00:00
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. 2012-07-07 15:39:46 +00:00
rubidium
d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
rubidium
6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 2012-01-03 21:32:51 +00:00
rubidium
6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 2011-12-16 16:58:55 +00:00
rubidium
4de1f3be88 (svn r23540) -Codechange: unify and document vehicle widgets 2011-12-16 16:58:55 +00:00
rubidium
3b380088f4 (svn r21997) -Fix [FS#4473]: when the difference between force and resistance is smaller than the mass(*4) there would be no acceleration anymore, even when at higher (or lower) speed the force and resistance balance out better 2011-02-06 16:45:27 +00:00
rubidium
fd86b0608d (svn r21997) -Fix [FS#4473]: when the difference between force and resistance is smaller than the mass(*4) there would be no acceleration anymore, even when at higher (or lower) speed the force and resistance balance out better 2011-02-06 16:45:27 +00:00
michi_cc
c1091569d0 (svn r21712) -Change: Tune 'realistic' acceleration even more to make more trains reach their top speed. 2011-01-04 18:12:28 +00:00
michi_cc
868d035b45 (svn r21712) -Change: Tune 'realistic' acceleration even more to make more trains reach their top speed. 2011-01-04 18:12:28 +00:00
terkhen
74c061c29a (svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache. 2010-12-14 21:28:45 +00:00
terkhen
12c86a1391 (svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache. 2010-12-14 21:28:45 +00:00
michi_cc
be4dfdd709 (svn r21107) -Fix: Don't use the maximum track speed where the maximum vehicle speed is meant. 2010-11-07 13:35:12 +00:00
michi_cc
b26b8b5b2a (svn r21107) -Fix: Don't use the maximum track speed where the maximum vehicle speed is meant. 2010-11-07 13:35:12 +00:00
michi_cc
06fd794dc7 (svn r21106) -Change: Tuned realistic acceleration to be a bit more realistic in order to make acceleration "slower", which highlights the differences between vehicle types more. 2010-11-07 13:35:07 +00:00
michi_cc
2d801c64a1 (svn r21106) -Change: Tuned realistic acceleration to be a bit more realistic in order to make acceleration "slower", which highlights the differences between vehicle types more. 2010-11-07 13:35:07 +00:00
terkhen
ac4a3c9101 (svn r21092) -Codechange: Merge max speed functions. 2010-11-06 12:40:38 +00:00
terkhen
766bf140db (svn r21092) -Codechange: Merge max speed functions. 2010-11-06 12:40:38 +00:00
rubidium
360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
rubidium
30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 2010-08-26 22:01:16 +00:00
terkhen
bd254b06d3 (svn r20303) -Feature: [NewGRF] Air drag property support for trains and road vehicles. Air drag for vehicles with air drag not set or set to zero will use a default value depending on their max speed. 2010-08-02 14:54:47 +00:00
terkhen
cded122da5 (svn r20303) -Feature: [NewGRF] Air drag property support for trains and road vehicles. Air drag for vehicles with air drag not set or set to zero will use a default value depending on their max speed. 2010-08-02 14:54:47 +00:00
terkhen
f33a0370ae (svn r20299) -Add: Make trains and road vehicles use a different area value to calculate air drag. 2010-08-02 14:49:23 +00:00
terkhen
1fd66d7cc4 (svn r20299) -Add: Make trains and road vehicles use a different area value to calculate air drag. 2010-08-02 14:49:23 +00:00
terkhen
a3fdb26bee (svn r19599) -Fix [FS#3751]: Vehicles with a weight of zero crashed the game when using realistic acceleration. 2010-04-10 19:30:38 +00:00
terkhen
c233dc08c1 (svn r19599) -Fix [FS#3751]: Vehicles with a weight of zero crashed the game when using realistic acceleration. 2010-04-10 19:30:38 +00:00
terkhen
2e18705d4e (svn r19343) -Codechange: Make RoadVehicle a child class of GroundVehicle.
-Add: Required acceleration functions at RoadVehicle.
2010-03-06 12:54:42 +00:00
terkhen
06a3faa651 (svn r19343) -Codechange: Make RoadVehicle a child class of GroundVehicle.
-Add: Required acceleration functions at RoadVehicle.
2010-03-06 12:54:42 +00:00
terkhen
963f304f67 (svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
-Codechange: Move GetSlopeResistance to GroundVehicle.
2010-03-06 12:50:55 +00:00
terkhen
4e6cac84d6 (svn r19341) -Codechange: Move GOINGUP/GOINGDOWN flags to GroundVehicle.
-Codechange: Move GetSlopeResistance to GroundVehicle.
2010-03-06 12:50:55 +00:00
terkhen
78dd849452 (svn r19339) -Codechange: Move acceleration functions to GroundVehicle. 2010-03-06 12:44:30 +00:00
terkhen
07c373d60a (svn r19339) -Codechange: Move acceleration functions to GroundVehicle. 2010-03-06 12:44:30 +00:00