dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,513 Commits 1 Branch 0 Tags
63fda2f16ed50822016368ac35c0e0da2aa2b51a
Commit Graph

303 Commits

Author SHA1 Message Date
Charles Pigott
9f3928658b Codechange: Remove Track{dir,}{Bits,}Byte types 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
fedfedc492 Silence false-positive misalignment UBSan warning in YAPF road, ship 2019-04-24 19:06:25 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Henry Wilson
7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 2019-04-10 23:22:20 +02:00
Jonathan G Rennison
5e6d283463 Merge branch 'master' into jgrpp 
Remove the viewport sign cache as this is now superseded by the kd tree
implementation

# Conflicts:
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/misc.cpp
#	src/pathfinder/follow_track.hpp
#	src/pbs.cpp
#	src/rail_cmd.cpp
#	src/saveload/vehicle_sl.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/station.cpp
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/thread/thread_morphos.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
#	src/waypoint.cpp
 2019-03-13 03:38:26 +00:00
PeterN
6c6971fb43 Add: Road vehicle path cache. (#7261) 2019-03-08 23:52:45 +00:00
Peter Nelson
7ca1793ec4 Change: Automatically use Trackdir node key as needed if ship curve penalties differ. 2019-03-08 16:52:08 +01:00
Peter Nelson
b8a0107ad1 Change: Add configurable curve penalty for ships. 2019-03-08 16:52:08 +01:00
Jonathan G Rennison
7ff252c58d Merge branch 'master' into jgrpp 
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/aircraft_cmd.cpp
#	src/lang/dutch.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/order_cmd.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/water_map.h
 2019-03-04 01:18:25 +00:00
Peter Nelson
3f327116db Change: Don't apply forbid 90 deg turn settings to ships. 2019-03-03 20:59:44 +01:00
Jonathan G Rennison
281d346fe2 Merge branch 'master' into jgrpp 
# Conflicts:
#	bin/baseset/no_sound.obs
#	bin/baseset/orig_dos.obg
#	bin/baseset/orig_dos.obs
#	bin/baseset/orig_dos_de.obg
#	bin/baseset/orig_win.obg
#	bin/baseset/orig_win.obm
#	bin/baseset/orig_win.obs
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.cpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/common.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/saveload/saveload.cpp
#	src/town_cmd.cpp
#	src/viewport.cpp
#	src/viewport_func.h
 2019-01-29 02:28:14 +00:00
J0an Josep
a5836874ef Codechange: Use track functions. 2019-01-26 22:55:12 +00:00
Jonathan G Rennison
191afd93c1 Merge branch 'save_ext' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp
 2019-01-21 19:28:29 +00:00
Peter Nelson
81330b8d6e Change: Add path cache for ships. 2019-01-19 23:11:17 +00:00
Jonathan G Rennison
0e7519f33e Merge branch 'more_cond_orders-sx' into jgrpp 
# Conflicts:
#	config.lib
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 2019-01-06 22:35:57 +00:00
Juanjo!
1db66a285e Codechange: [YAPF] Stop looking for an automatic servicing road depot when the cost of a path exceeds max. penalty. 2019-01-06 16:47:45 +01:00
Jonathan G Rennison
65b9a103ad Initial implementation of two rail types per tile 2018-12-21 03:27:58 +00:00
Jonathan G Rennison
cd41683b9b Add tracerestrict feature reverse behind signal 2018-12-09 01:13:27 +00:00
Jonathan G Rennison
e735c1a51a Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
 2018-11-05 12:53:36 +00:00
Charles Pigott
b5028efc1f Fix: Protect against a few out of bounds or uninitialised usage errors 2018-10-31 12:41:49 +01:00
Charles Pigott
f5b1115039 Doc: Lots and lots of doxymentation fixes 2018-10-31 12:35:54 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Jonathan G Rennison
6740a9a470 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
3330e4cef8 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
 2018-07-02 21:04:06 +01:00
J0anJosep
d01c09fb73 Codechange: Use HasTrack(dir) to improve code readability. 2018-06-27 23:14:30 +02:00
J0anJosep
31ac11bddb Codechange: Increase readability of track functions and pathfinders. 2018-06-27 23:14:30 +02:00
Jonathan G Rennison
2586096ef6 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-06-17 23:24:22 +01:00
Jonathan G Rennison
e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 2018-06-17 21:13:53 +01:00
Jonathan G Rennison
e82ccad052 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/table/settings.ini
#	src/train_cmd.cpp
#	src/tunnelbridge.h
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
 2018-05-03 23:54:51 +01:00
J0anJosep
79a551a83c Codechange: Use TileAddBy(Diag)Dir when possible. 2018-04-30 18:55:04 +02:00
Jonathan G Rennison
1fe0bb76b9 Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp 2018-04-27 02:42:20 +01:00
Patric Stout
17bd580630 Remove: NO_DEBUG_MESSAGES was only read and setting it broke compilation (#6703) 
Given any speed issue cannot be attributed to checking for _debug_NNN_level, removing this is a safe action

This fixes #6652.
 2018-04-11 22:07:21 +02:00
Jonathan G Rennison
955126efac Improve pathfinder support for multiple docks 
The pathfinder can now find docks other than the Manhattan closest one.

Based on Cirdan commits:
afc7969c13d7ca59afe4dae4bf88122ba8d27df2
4067190dedcd3e5f668ea4f49b1dd8dfed10b2a7
d9be6b712d2ae4fb1b5ae844dde4919dd24c4fb2
 2018-02-05 18:21:05 +00:00
Jonathan G Rennison
ba33754993 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:28:30 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
82ec6d93dc Merge branch 'master' into jgrpp 2017-06-25 11:55:27 +01:00
frosch
35d8c37102 (svn r27885) -Cleanup (r27844): ESR_MAX_COST_EXCEEDED and ESR_PATH_TOO_LONG meant the same thing, but only one was used. Keep PATH_TOO_LONG since it has the better documentation. 2017-06-22 16:57:06 +00:00
frosch
dd3d824894 (svn r27885) -Cleanup (r27844): ESR_MAX_COST_EXCEEDED and ESR_PATH_TOO_LONG meant the same thing, but only one was used. Keep PATH_TOO_LONG since it has the better documentation. 2017-06-22 16:57:06 +00:00
Jonathan G Rennison
80d56307c7 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/group_gui.cpp
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/vehicle_sl.cpp
#	src/window.cpp
 2017-04-04 19:22:56 +01:00
peter1138
2e52de3406 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 2017-04-04 00:00:43 +00:00
peter1138
bf4499c643 (svn r27846) -Fix [FS#5926]: Infinite loop in pathfinder when checking safe waiting position from a waypoint. 2017-04-04 00:00:43 +00:00
peter1138
df5923d798 (svn r27845) -Change: (Yapf) Use FindDepotData struct to simplify depot finding code and remove need to return fake path distance. (juanjo) 2017-04-03 22:02:28 +00:00
peter1138
1eef97674c (svn r27845) -Change: (Yapf) Use FindDepotData struct to simplify depot finding code and remove need to return fake path distance. (juanjo) 2017-04-03 22:02:28 +00:00
peter1138
95acc016ba (svn r27844) -Change: (Yapf) Treat max cost exceeded separately from path too long condition, as destination should not be considered in the former case. 2017-04-03 21:53:51 +00:00
peter1138
9bc27c9a72 (svn r27844) -Change: (Yapf) Treat max cost exceeded separately from path too long condition, as destination should not be considered in the former case. 2017-04-03 21:53:51 +00:00