dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,238 Commits 1 Branch 0 Tags
77b3c5726baff8ccc544fdc391dc3b24d251d44b
Commit Graph

1018 Commits

Author SHA1 Message Date
Jonathan G Rennison
fd4d4d341d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/animated_tile.cpp
#	src/cargopacket.h
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/date.cpp
#	src/disaster_vehicle.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/error_gui.cpp
#	src/fontcache/spritefontcache.cpp
#	src/game/game_gui.cpp
#	src/game/game_text.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/highscore_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/italian.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/turkish.txt
#	src/lang/vietnamese.txt
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_generic.cpp
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/os/unix/unix.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spritecache.cpp
#	src/spritecache.h
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen_base.cpp
#	src/subsidy.cpp
#	src/table/settings/difficulty_settings.ini
#	src/texteff.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/townname.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
 2023-05-26 19:36:48 +01:00
Jonathan G Rennison
90abfff45c Fix adjacent level crossings left barred after removing middle of crossing 
See: #517
 2023-05-14 22:31:29 +01:00
Jonathan G Rennison
c14085f425 Be more permissive about vehicles when converting tunnel/bridge railtype 2023-05-07 19:07:48 +01:00
Jonathan G Rennison
31f476220d Allow converting track by individual track pieces instead of whole tiles 
Ctrl-click on convert button

See: #509
 2023-05-06 16:20:23 +01:00
Jonathan G Rennison
09e03fb6b2 Change TunnelBridgeIsFree across_only to a mode enum type 2023-05-06 16:19:52 +01:00
Jonathan G Rennison
f94e43c940 Update map mode viewports when converting rail track type 2023-05-06 14:27:19 +01:00
Jonathan G Rennison
9521e7ef2b Merge branch 'master' into jgrpp 
# Conflicts:
#	src/elrail.cpp
#	src/ground_vehicle.hpp
#	src/landscape.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnelbridge_cmd.cpp
 2023-04-12 19:34:11 +01:00
Rubidium
e8af8daa68 Codechange: pass "ground vehicle" to GetTileSlopeZ since for tunnel/bridges there are two states 
Previously it checked the position in non-driving direction to "guess" whether
a ground vehicle was using the function, so on tunnels/bridges it could either
return the Z of the (virtual) ground compared to the Z of the path the vehicle
would take.
 2023-04-09 19:00:26 +02:00
Jonathan G Rennison
1d05637d45 Add setting for rail depot maximum speed 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
e02585f68e Add railtype and signals variables for signal vertical clearance 2023-04-04 20:29:22 +01:00
Jonathan G Rennison
4ec6a99dd8 Add GetTileTrackStatus wrapper for when red signals part is not needed 2023-03-04 02:01:40 +00:00
Jonathan G Rennison
55146f459f Ensure that SortRailTypes sort is deterministic 
Use rail type ID as tie-breaker
 2023-02-12 22:18:23 +00:00
Jonathan G Rennison
483e3172af Merge branch 'master' into jgrpp 
# Conflicts:
#	src/core/strong_typedef_type.hpp
#	src/gfx.cpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/map_func.h
#	src/newgrf_debug_gui.cpp
#	src/order_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/rail_cmd.cpp
#	src/road_cmd.cpp
#	src/road_gui.cpp
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/tile_type.h
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
 2023-02-10 17:19:35 +00:00
rubidium42
6ba55e663e Codechange: do not hide variables with other variables 2023-01-29 07:21:34 +01:00
Jonathan G Rennison
7701d4e813 Ensure secondary track type is valid when switching to dual mode by removing piece 2023-01-27 19:03:35 +00:00
Rubidium
fe2bcd2a58 Codechange: migrate size related functions to Map structure 2023-01-21 17:11:40 +01:00
Rubidium
f667a831a5 Codechange: unify creation of diagonal/orthogonal iterator using smart pointers 2023-01-13 21:09:40 +01:00
Jonathan G Rennison
160dcc345a Add wrapper class for diagonal or orthogonal tile iteration 2022-12-30 18:09:55 +00:00
Jonathan G Rennison
df86c5cadb Fix Tunnel/bridge signal add/remove costs 
Costs now reflect number of signals, not tunnel/bridge length

See: #458
 2022-12-04 21:10:31 +00:00
Tyler Trahan
c19abebf8d Feature: Multi-track level crossings (#9931) 2022-11-01 16:51:23 -04:00
Michael Lutz
8e6ed8d5e9 Fix db98cedb: Swap the tile parameter validation around as only the first TileIndex is automatically validated. 2022-10-17 07:54:58 +01:00
Michael Lutz
10daaca5ea Fix db98cedb: Swap parameters for CmdRemoveRailroadTrack, too. 2022-10-17 07:54:58 +01:00
SamuXarick
c7505539af Fix #9869: remove docking tile when doing a clear square 
Terraforming through objects placed on water didn't properly remove docking tiles as expected.

By moving some logic regarding removal of docking tiles into DoClearSquare, the issue is solved, while also simplifying code, avoiding repetition elsewhere.
 2022-10-16 18:29:03 +02:00
Tyler Trahan
db98cedb7e Fix #9883: Show cost/income float over end tile of rail or road construction 2022-10-16 14:15:31 +02:00
Jonathan G Rennison
23e057cfac Don't apply show signals using default graphics settings for custom styles 2022-07-05 18:14:52 +01:00
Jonathan G Rennison
bd28d5a239 Use order state at reservation time for signal mode tracerestrict eval 2022-07-01 00:33:59 +01:00
Jonathan G Rennison
c19bd4473f Add signal style flag to require realistic braking 2022-06-30 21:20:43 +01:00
Jonathan G Rennison
78ae295dfe Add combined normal and shunt aspect signal style flag 2022-06-27 18:51:26 +01:00
Jonathan G Rennison
21606df9d3 Fix adding second set of signals to tile not setting signal style 2022-06-25 16:43:17 +01:00
Jonathan G Rennison
8249f3d535 Fix land info window not having strings for no-entry signals 2022-06-25 16:37:04 +01:00
Jonathan G Rennison
2f7664fc93 Move signal style mask variables into a single struct 2022-06-25 10:18:48 +01:00
Jonathan G Rennison
fcae909839 Add signal style flag for drawing on the opposite side 2022-06-22 23:45:44 +01:00
Jonathan G Rennison
92723d4f5c Remove tunnel/bridge spacing setting, use usual signal drag spacing 2022-06-19 18:32:47 +01:00
Jonathan G Rennison
191f710c40 Add custom signal style properties to set electric/semaphore enabled types 2022-06-19 17:43:46 +01:00
Jonathan G Rennison
bdd73a19a1 Add signal style flag for unconditional reserve through 
Add map bits for unconditional reserve through
Adjust signal aspect/state handling
 2022-06-19 04:15:27 +01:00
Jonathan G Rennison
7ae06124ae Add signal style flag for no aspect increase behaviour (banner repeater) 2022-06-19 02:08:38 +01:00
Jonathan G Rennison
6e4c4b35e7 Initial implementation of NewGRF custom signal styles 2022-06-19 02:08:38 +01:00
Jonathan G Rennison
41117a52d2 Signals: Add variable for signal context (track, tunnel, bridge, etc) 2022-06-15 19:03:13 +01:00
Jonathan G Rennison
ba52fbeb91 Signals: Add variable for restriction info, add bit for reserve through 2022-06-12 09:00:31 +01:00
Jonathan G Rennison
9d0e3e22b7 Fix being able to add/remove/modify tunnel/bridge signals when occupied 2022-05-31 21:18:30 +01:00
J0anJosep
d9a37c915f Cleanup #9725: Replace cmd_helper related functions and remove cmd_helper.h. 2022-02-02 21:30:15 +01:00
Jonathan G Rennison
30817c3915 Fix VRF_BEYOND_PLATFORM_END not being cleared when switching order 2022-01-03 12:47:44 +00:00
Jonathan G Rennison
ee7fbfc410 Merge pull request #350 into jgrpp 2022-01-01 02:05:09 +00:00
Jonathan G Rennison
f658d9f1fc Fix rail drag remove removing track even with an unremovable signal 
This occurred when a removing a signal was blocked due to realistic
braking moving train restrictions.
This resulted in incorrect signal infrastructure totals and MP desyncs.
 2022-01-01 02:04:27 +00:00
Yourself
3f391a74af fix: error when removing tunnelbridge signal w/ tracerestruct 2021-12-31 18:28:44 -07:00
Jonathan G Rennison
f65a166308 Add client setting to show all signals using the default sprites 2021-12-27 18:31:27 +00:00
Joan Josep
e890e7db76 Cleanup #9725: Clean up Doxygen docs and fix typo. (#9753) 2021-12-19 16:51:45 +01:00
Michael Lutz
c6d7b98808 Codechange: Un-bitstuff landscape commands. 2021-12-16 22:28:32 +01:00
Michael Lutz
55170ae703 Codechange: Un-bitstuff rail commands. 2021-12-16 22:28:32 +01:00
Michael Lutz
6fe445e6c0 Codechange: Un-bitstuff station/depot/waypoint commands. 2021-12-16 22:28:32 +01:00