dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,265 Commits 1 Branch 0 Tags
09ca051ff86a46bb711a54550980676bc18bfdbe
Commit Graph

53 Commits

Author SHA1 Message Date
Jonathan G Rennison
c1a26459d8 Merge branch 'chunnel' into jgrpp 
# Conflicts:
#	src/ground_vehicle.hpp
 2017-03-12 20:36:04 +00:00
Jonathan G Rennison
4c9f7b73b3 Chunnel: Add a ground veh flag for (maybe) being in a chunnel 
Use this to avoid inclination change code in non-chunnel wormholes.
 2017-03-05 18:37:35 +00: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
68c280bef8 Ifdef out expensive assert in non-debug mode. 
The vehicle slope algorithm goes to pains to avoid GetSlopePixelZ,
but then calls it anyway in the assert...
 2017-03-05 16:58:28 +00:00
Jonathan G Rennison
580b2f7584 Merge branch 'template_train_replacement-sx' into jgrpp 
Remove a duplicated declaration.

# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/network/network_command.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/window_type.h
 2016-02-14 17:55:51 +00:00
Jonathan G Rennison
6be2efc084 Update from KeldorKatarn branch 
This approximately corresponds to 971ba4928a5c7c7916fea55d91a3b6dd5bba140c,
excluding the different virtual train build GUI, but including the basic
changes to the original train build GUI for multiplayer to work.

Fixup
 2016-02-14 03:32:42 +00: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
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
4e021f0059 (svn r26888) -Codechange: use ints for some z-levels of vehicles (ic111) 2014-09-21 12:44:38 +00: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
alberth
670c364323 (svn r24540) -Codechange: Remove the not-so-useful HALF_TILE_SIZE constant. 2012-09-21 20:31:06 +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
rubidium
0cfe86cead (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed 2012-01-03 20:26:05 +00:00
truebrain
d9f717dcfa (svn r23714) -Codechange: don't mix Viewport with non-viewport code 2012-01-02 13:44:37 +00:00
truebrain
aa1a0053b0 (svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC) 2011-12-20 17:57:56 +00:00
rubidium
3d605f6488 (svn r23595) -Codechange: add comma after last enum to get a more uniform coding style 2011-12-19 17:48:04 +00:00
rubidium
6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 2011-12-16 16:58:55 +00:00
rubidium
0e2d2b2317 (svn r23108) -Codechange: more uint -> int / byte -> int conversions for Z related variables 2011-11-04 11:52:19 +00:00
rubidium
de980ef0f9 (svn r23091) -Codechange: rename some Get*Z functions to Get*PixelZ functions if they return the Z in pixels (like TilePixelHeight) 2011-11-04 10:18:13 +00:00
planetmaker
7aa57e4acd (svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added 2011-05-18 12:19:58 +00:00
frosch
7de7488788 (svn r22328) -Add: a flag to GroundVehicles to disable insertion and removal of automatic orders until the next real order is reached. 2011-04-16 16:45:35 +00:00
rubidium
5629248736 (svn r22205) -Codechange: replace magic number with constant 2011-03-05 21:52:45 +00:00
frosch
0b816dd007 (svn r21989) -Fix (r21954): Vehicle status bar glitches on speed changes. 2011-02-05 21:13:54 +00:00
rubidium
12d3422539 (svn r21954) -Cleanup: remove setting to not show the vehicle speed in the vehicle view 2011-02-04 14:37:24 +00:00
terkhen
b974d69988 (svn r21922) -Codechange: Unify articulated vehicle checking functions. 2011-01-29 17:26:23 +00:00
terkhen
14e0343d21 (svn r21921) -Codechange: Move GroundVehicleSubtypeFlags as they will be needed by some Vehicle functions. 2011-01-29 17:21:39 +00:00
rubidium
cf81efc5a6 (svn r21916) -Fix [FS#4442]: the minimum speed needed for (realistic) acceleration to work properly can sometimes be more than the (temporary) maximum speed causing Clamp to "fail". Make sure that the minimum speed always overrules the maximum speed 2011-01-26 17:37:12 +00:00
rubidium
2a9fe0c0d8 (svn r21914) -Codechange: move the algorithmic part of Train::UpdateSpeed to a function in GroundVehicle 2011-01-26 17:34:07 +00:00
rubidium
0f411f9899 (svn r21911) -Codechange: move tcache.last_speed to gcache.last_speed and make SetLastSpeed a function of GroundVehicle 2011-01-26 17:31:07 +00:00
smatz
50dfa5986c (svn r21883) -Codechange: make UpdateZPosition() faster by not calling GetSlopeZ() when not needed 2011-01-21 17:35:17 +00:00
smatz
713d929883 (svn r21882) -Codechange: make use of the fact that vehicle's Z position can change only if it has GVF_GOINGUP_BIT or GVF_GOINGDOWN_BIT set 2011-01-21 16:51:56 +00:00
smatz
a3ae023fdb (svn r21879) -Codechange: reset vehicle's GOINGUP/DOWN bits when it crashes 2011-01-21 16:20:55 +00:00
smatz
9ae2016de8 (svn r21878) -Codechange: move parts of UpdateInclination() to separate functions 2011-01-21 16:13:54 +00:00
smatz
c591c49b00 (svn r21877) -Codechange: move definition of HALF_TILE_SIZE to tile_type.h 2011-01-21 15:48:52 +00:00
smatz
792659936e (svn r21876) -Codechange: typedef SpecializedVehicleBase and GroundVehicleBase to reduce typing 2011-01-21 14:43:38 +00:00
terkhen
8db501e115 (svn r21862) -Codechange: Unify subtype handling between road vehicles and trains. 2011-01-19 20:04:09 +00:00
terkhen
a89c92ef6e (svn r21859) -Codechange: Move train subtype flags to GroundVehicle. 2011-01-19 18:42:54 +00:00
smatz
b27ce8f02f (svn r21824) -Codechange: don't call GetSlopeZ() when the ground vehicle is on a flat tile 2011-01-16 18:18:45 +00:00
terkhen
f69d280f14 (svn r21521) -Codechange: Unify some cached values that were present in both road vehicles and trains. 2010-12-14 21:33:53 +00:00
terkhen
cfa00ad14b (svn r21520) -Document: Complete the comments of GroundVehicleCache. 2010-12-14 21:31:45 +00:00
terkhen
74c061c29a (svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache. 2010-12-14 21:28:45 +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
terkhen
ac4a3c9101 (svn r21092) -Codechange: Merge max speed functions. 2010-11-06 12:40:38 +00:00
terkhen
7f786ae7b8 (svn r20302) -Add: Method for getting the air drag of a ground vehicle. 2010-08-02 14:52:51 +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
frosch
6f26434909 (svn r19356) -Fix: Whitespace. 2010-03-06 16:15:50 +00:00
terkhen
53c6f12693 (svn r19342) -Codechange: Move inclination update functions to GroundVehicle. 2010-03-06 12:52:44 +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
a0cb027db1 (svn r19340) -Documentation: Add a list of required functions to GroundVehicle. 2010-03-06 12:45:47 +00:00