dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,967 Commits 1 Branch 0 Tags
f6b9395c6a9cc1395f1579e745442f9ecddd8bef
Commit Graph

771 Commits

Author SHA1 Message Date
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
ba34ec7ade Merge branch 'master' into jgrpp 
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
 2019-03-27 18:12:04 +00:00
Henry Wilson
ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 2019-03-26 20:15:57 +00:00
Henry Wilson
a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 2019-03-26 20:15:57 +00:00
Jonathan G Rennison
e15601e12f Cache whether a train may have a depot or bridge speed restriction 2019-01-19 21:22:32 +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
Niels Martin Hansen
b8b6954fb5 Fix 6a3d411: Silence truncation warning 2019-01-05 17:21:29 +01:00
Jonathan G Rennison
70020e1a5c Fix incorrect accounting of rail tunnel/bridge infrastructure counts 
Regression from dual rail types change
 2018-12-22 04:08:20 +00:00
Jonathan G Rennison
65b9a103ad Initial implementation of two rail types per tile 2018-12-21 03:27:58 +00:00
Jonathan G Rennison
df0aa2ed4b Add pillar and station height checks to bridge upgrade command 2018-11-19 20:35:57 +00:00
Jonathan G Rennison
8b37e5aac2 Implement custom bridge pillar flag support 
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars

Set values for default bridges and stations
 2018-11-17 19:49:05 +00:00
Jonathan G Rennison
6df12e77b6 Refactor/de-duplicate rail station bridge above check methods 2018-11-14 20:23:56 +00:00
Jonathan G Rennison
beaddc8a98 Set minimum bridge height clearances for default stations 2018-11-14 00:04:29 +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
1778b2d66e Codechange: Merge some duplicated functions 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
ef0a0b0f8e Implement rail station property 1B, bridge clearance information 2018-08-02 08:27:20 +01:00
Jonathan G Rennison
b9d7f8e0a7 Disallow building bridges over airports 2018-07-30 01:55:58 +01:00
Jonathan G Rennison
ae15c96c1a Merge branch 'master' into jgrpp 
# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_gui.cpp
#	src/bridge_map.h
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/rail_map.h
#	src/rail_type.h
#	src/road_map.h
#	src/saveload/afterload.cpp
#	src/saveload/map_sl.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_rail.cpp
#	src/station_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
 2018-07-26 20:54:13 +01:00
Peter Nelson
bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 2018-07-26 13:27:40 +01:00
Jonathan G Rennison
035f5622b9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
 2018-07-24 18:30:42 +01:00
Jonathan G Rennison
4bdbf3863d Add setting to allow placing stations under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
56bde8ce18 Add setting to allow placing all NewGRF objects under bridges 2018-07-24 03:22:33 +01:00
Jonathan G Rennison
6a3d411fa1 Fix: Use after free in CmdBuildTunnel (#6856) 
Use after free could occur when when excavating far end
removed multiple NewGRF objects
 2018-07-22 21:58:05 +02:00
Jonathan G Rennison
42505f3532 Merge branch 'custom_bridgeheads' into jgrpp 2018-07-13 08:28:06 +01:00
Jonathan G Rennison
176fd2180b Fix regression preventing road vehicles from leaving tunnels 2018-07-13 08:27:52 +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
79ca5c8b7d Merge branch 'custom_bridgeheads' into jgrpp 2018-06-26 18:34:17 +01:00
Jonathan G Rennison
25af12814b Fix double-adding of road tunnel/bridge infra counts when changing owner 2018-06-26 18:30:31 +01:00
Jonathan G Rennison
670ed0de5b Fix double-accounting of bidi signals on bridge/tunnel during owner change 2018-06-21 18:45:40 +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
d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 2018-06-17 04:01:31 +01:00
Jonathan G Rennison
b7ce21038a Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 2018-04-26 21:08:52 +01:00
Jonathan G Rennison
1911c0cb69 Fix handling of custom bridge head ramp-only pieces/types when upgrading 2018-04-26 21:07:58 +01:00
Jonathan G Rennison
c053549144 Merge branch 'signal_tunnels_bridges' into jgrpp 2018-04-25 22:33:10 +01:00
Jonathan G Rennison
c92a28a072 Preserve signal simulation/reservation data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 2018-04-25 22:32:50 +01:00
Jonathan G Rennison
714b9711e4 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/tunnelbridge_cmd.cpp
 2018-04-25 21:59:22 +01:00
Jonathan G Rennison
ff6a3ed234 Preserve custom bridge head road data when upgrading bridges. 
Based on commit 301925f948c9b36966c9c668e1476c2485425338
 2018-04-25 18:51:15 +01:00
Jonathan G Rennison
e138d3564b Fix tram reversing on custom bridge head tiles. 
(cherry picked from commit 0a345efc27)
 2018-04-24 22:08:03 +01:00
Jonathan G Rennison
102c55bc57 Fix assertion failure when trams do a short turnaround in a tunnel mouth 2017-12-13 20:44:12 +00:00
Jonathan G Rennison
0a345efc27 Fix tram reversing on custom bridge head tiles. 2017-06-21 23:40:19 +01:00
Jonathan G Rennison
95e8bc67cc Merge branch 'chunnel' into jgrpp 2017-06-07 21:00:00 +01:00
HackaLittleBit
60345d2e18 Fix cost of building tunnels. 2017-06-07 19:56:20 +01:00
Jonathan G Rennison
4d21d6f81c Merge branch 'chunnel' into jgrpp 2017-04-04 23:30:04 +01:00
HackaLittleBit
eddd635f00 Chunnel: Make error reporting consistent with tunnel length reporting at cursor. 
Error reporting should be in tune with occurrence of events.
 2017-03-31 01:54:41 +01:00
Jonathan G Rennison
612c825bb6 Chunnel: Minor whitespace/scope changes, rename function. 2017-03-24 22:51:29 +00:00
HackaLittleBit
2549def764 Chunnel: Use separate container function for chunnel related conditions. 2017-03-24 22:40:38 +00:00