Commit Graph

121 Commits (38571cf0daea6f9e4ec56f489df0c9a282ef94f4)

Author SHA1 Message Date
Jonathan G Rennison 74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
3 years ago
Jonathan G Rennison 55620ff162 Add general function for checking size of contiguous tile area 3 years ago
Jonathan G Rennison b7ddd486cf Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
3 years ago
Charles Pigott 9b800a96ed
Codechange: Remove min/max functions in favour of STL variants (#8502) 3 years ago
Jonathan G Rennison 138a7c2d90 Fix wrong output from dump_map_stats console command 4 years ago
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 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
Jonathan G Rennison 09edd07003 Add utility function: TileAddSaturating 5 years ago
Jonathan G Rennison a7de6ec35b Add console command to show map stats 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison e261a71271 Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
6 years ago
Jonathan G Rennison 1b5da1f2aa Add m8 support to DumpTileInfo 6 years ago
Jonathan G Rennison 9490f33a6c Merge branch 'master' into crashlog_improvements
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
6 years ago
Jonathan G Rennison 5661763d6a Merge branch 'crashlog_improvements' into jgrpp 6 years ago
Jonathan G Rennison 7f027f8dca Add tile info dump function and assert variants 6 years ago
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
6 years ago
J0anJosep 79a551a83c Codechange: Use TileAddBy(Diag)Dir when possible. 6 years ago
Patric Stout aef69443e7 Remove: WinCE support 6 years ago
Jonathan G Rennison f27ca88596 Show error message instead of aborting when loading an invalid map size. 9 years ago
Jonathan G Rennison 5d222e4d5e Merge branch 'extra_large_maps' into extra_large_maps-sx
Conflicts:
	src/genworld_gui.cpp
	src/map_type.h
	src/newgrf_debug_gui.cpp
9 years ago
patch-import 7d2b4bd3ea Import extra large maps patch.
http://www.tt-forums.net/viewtopic.php?f=33&t=33137
9 years ago
rubidium b8f9579133 (svn r26503) -Fix: compilation error with full debug build 10 years ago
rubidium 2e493fa806 (svn r26503) -Fix: compilation error with full debug build 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
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
truebrain 8ff6c2da52 (svn r23701) -Codechange: give TileAddWrap() a 27% speed-up, by swapping entries in an if() statement, and reusing already calculated values (tnx to SmatZ for the ideas) 13 years ago
truebrain 6f6035ce0b (svn r23701) -Codechange: give TileAddWrap() a 27% speed-up, by swapping entries in an if() statement, and reusing already calculated values (tnx to SmatZ for the ideas) 13 years ago
rubidium 9fc2798baf (svn r22411) -Document: another bunch of bits 13 years ago
rubidium fb5ecb9499 (svn r22411) -Document: another bunch of bits 13 years ago
frosch 06ff23f61f (svn r21995) -Cleanup (r21994): Remove obsolete comment. 14 years ago
frosch 8b2f2c09e5 (svn r21995) -Cleanup (r21994): Remove obsolete comment. 14 years ago
frosch e6f28bf300 (svn r21994) -Fix: Make computations of closest-land/water-distances handle waterish tiles more correctly. 14 years ago
frosch a8859bbff9 (svn r21994) -Fix: Make computations of closest-land/water-distances handle waterish tiles more correctly. 14 years ago
rubidium ec4f688ca0 (svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m]. 14 years ago
rubidium 7efd7e19ed (svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m]. 14 years ago
rubidium 26718abaf4 (svn r21470) -Codechange: add method to get the distance from the edge in a given direction 14 years ago
rubidium 7cf40e5d25 (svn r21470) -Codechange: add method to get the distance from the edge in a given direction 14 years ago
alberth 88910224a4 (svn r21055) -Codechange [FS#4190]: Code style fix (chillcore) 14 years ago
alberth 606519c112 (svn r21055) -Codechange [FS#4190]: Code style fix (chillcore) 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
yexo 78ade1f944 (svn r18937) -Fix (r15190): TileAddWrap didn't return INVALID_TILE for void tiles at the north border 15 years ago
yexo 6be4560528 (svn r18937) -Fix (r15190): TileAddWrap didn't return INVALID_TILE for void tiles at the north border 15 years ago
yexo 14ed7330ba (svn r18755) -Fix [FS#3495] (r14847): CircularTileSearch skipped a few tiles close to the starting tile 15 years ago
yexo be3ca424f6 (svn r18755) -Fix [FS#3495] (r14847): CircularTileSearch skipped a few tiles close to the starting tile 15 years ago
rubidium 982b8ee5fc (svn r17693) -Cleanup: remove some unneeded includes 15 years ago