Commit Graph

58 Commits (37ee095f4a81dfc4b092acb8029621c4745699ed)

Author SHA1 Message Date
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison edfd378e93 Merge branch 'master' into jgrpp
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
5 years ago
JMcKiern 04f659e768 Fix: Some typos found using codespell 5 years ago
Jonathan G Rennison ba8ed880c1 Merge branch 'master' into jgrpp-nrt
Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
5 years ago
peter1138 c02ef3e456 Feature: Add NotRoadTypes (NRT) 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 6 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 6 years ago
Jonathan G Rennison 3b55f5d765 Cache whether ground vehicles currently have 0 slope resistance 6 years ago
Jonathan G Rennison e5b61e0b6c Refactor CallVehicleTicks vehicle loop 6 years ago
Jonathan G Rennison 3a640af71d Merge branch 'master' into jgrpp
# Conflicts:
#	src/ground_vehicle.cpp
#	src/viewport.cpp
6 years ago
Johannes E. Krause 662dcc3c31 Fix #6920: Make 9.8m/s^2 a common constant for TE-calculation 6 years ago
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
6 years ago
PeterN cad47bbefe
Fix: Tractive effort was slightly too high as per NewGRF spec. (#6785) 6 years ago
Jonathan G Rennison f030318bb4 Merge branch 'improved_breakdowns' into jgrpp 7 years ago
Jonathan G Rennison fcb6697899 Fix typo of one one instead of L L in Hp to Watts conversion constant 7 years ago
Jonathan G Rennison ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 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 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 9742300a1e Fix some more whitespace/formatting issues. 9 years ago
Jonathan G Rennison 80d52eb20e Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
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
rubidium df2b116867 (svn r26702) -Fix [FS#6067]: integer overflows in acceleration code causing either too low acceleration or too large acceleration 10 years ago
rubidium f3d085e33c (svn r26702) -Fix [FS#6067]: integer overflows in acceleration code causing either too low acceleration or too large acceleration 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 11 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 11 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
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
rubidium 6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 13 years ago
rubidium 4de1f3be88 (svn r23540) -Codechange: unify and document vehicle widgets 13 years ago
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 14 years ago
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 14 years ago
michi_cc c1091569d0 (svn r21712) -Change: Tune 'realistic' acceleration even more to make more trains reach their top speed. 14 years ago
michi_cc 868d035b45 (svn r21712) -Change: Tune 'realistic' acceleration even more to make more trains reach their top speed. 14 years ago
terkhen 74c061c29a (svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache. 14 years ago
terkhen 12c86a1391 (svn r21518) -Codechange: Rename AccelerationCache to GroundVehicleCache. 14 years ago
michi_cc be4dfdd709 (svn r21107) -Fix: Don't use the maximum track speed where the maximum vehicle speed is meant. 14 years ago
michi_cc b26b8b5b2a (svn r21107) -Fix: Don't use the maximum track speed where the maximum vehicle speed is meant. 14 years ago
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. 14 years ago
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. 14 years ago
terkhen ac4a3c9101 (svn r21092) -Codechange: Merge max speed functions. 14 years ago
terkhen 766bf140db (svn r21092) -Codechange: Merge max speed functions. 14 years ago
rubidium 360d6daf34 (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
rubidium 30f2afac9b (svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers 14 years ago
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. 14 years ago
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. 14 years ago
terkhen f33a0370ae (svn r20299) -Add: Make trains and road vehicles use a different area value to calculate air drag. 14 years ago
terkhen 1fd66d7cc4 (svn r20299) -Add: Make trains and road vehicles use a different area value to calculate air drag. 14 years ago