5721790c5d
Fix assert failure in DoStartupNewCompany when called from AfterLoadGame
4 years ago
f39a00d676
Feature: Set exclusive access to industry from GS ( #8115 )
...
(cherry picked from commit 9a45a0f535
4 years ago
860c270c73
Codechange: Replace assert_compile macro with static_assert
4 years ago
d8605ad18d
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
4 years ago
78b06ddc40
TBTR: Fix palette recolouring of templates
...
Fix group overrides affecting template image when cloning vehicle
Update template when changing company colours
Update template images on demand instead of at load
4 years ago
9a45a0f535
Feature: Set exclusive access to industry from GS ( #8115 )
4 years ago
79240eab1e
Codechange: Make use of the improved C++17 emplace_back function.
4 years ago
3e1ab88323
Fix NRT road/tram type conversion on savegame load from JokerPP v1.27
4 years ago
2ad446369d
Cache animated tile speed, use btree map for animated tiles
4 years ago
1f54c8a018
Send vehicle caches to network clients to prevent desyncs due to bad GRFs
4 years ago
9efeb3551a
Tunnel/bridge signal simulation spacing is now a company setting
4 years ago
ffe3c769a3
Add road tile cached one way state, one way road section detection
4 years ago
3a75f13874
Allow drive-through road stops to be one-way
4 years ago
4763f441f6
On load, use previous local company or first usable company
...
Instead of always using the first company slot
4 years ago
2ea3a7d6f4
Add setting for default road/tram types, to match default rail type setting
4 years ago
2d350d26db
Add rate limit for object construction
4 years ago
beaeda2990
TBTR: Show empty and full train weights in GUI, and weight ratios if enabled
4 years ago
b7118b60fe
Add setting to enable multiple churches/stadiums in scenario editor
...
See: #177
4 years ago
53f9fa139d
Remove redundant year/month date globals
4 years ago
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
7045186594
Change #8159 : Remove now unused town cargo caches without bumping the savegame version
4 years ago
ca2604c4e2
Revert #8157 : Redundant change
4 years ago
7a09413a1a
Fix: Incorrect save/load array size of Town::cargo_accepted
...
In 11ab3c4e
4 years ago
27b92c3526
Fix #159 : Incorrect display date on load for savegame versions < 31
4 years ago
f5e9805b10
Store time display settings both in savegame and client, add setting
4 years ago
f8d6e781ba
Merge branch 'master' into jgrpp
...
# Conflicts:
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj.filters
# src/base_consist.h
# src/company_base.h
# src/newgrf_config.cpp
# src/newgrf_config.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/station_sl.cpp
# src/settings.cpp
# src/signs_base.h
# src/string.cpp
# src/string_func.h
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/town_cmd.cpp
# src/vehicle.cpp
# src/vehicle_cmd.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/null_v.cpp
4 years ago
63ccb36ef3
Codechange: Use std::string for most of the user-settable custom names.
4 years ago
ea06a0670d
Add rail ground type support for rail custom bridge heads
...
See: #146
4 years ago
77673b731c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/industry_cmd.cpp
# src/openttd.cpp
# src/station_cmd.cpp
# src/station_func.h
4 years ago
cca613e3b8
Fix #8142 , 5aa6351: Buoy owner and tile owner can be different ( #8143 )
4 years ago
763a2826b6
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/gamelog.cpp
4 years ago
5aa6351042
Fix #8132 : Corrupted savegame crashing OpenTTD on load
4 years ago
07c9621fcf
Merge branch 'master' into jgrpp
4 years ago
bc8333723c
Fix #8021 : limit savegame range for docking tiles fixing
4 years ago
64278fd598
Fix: reset roadtype/streetcartype info for non-road bridges
4 years ago
19dc31e0b3
Fix #8108 : always update tile_hash after updating v->tile
4 years ago
8edbb42fe8
Fix c01a2e2: crash on loading old savegames with invalid animated tile information
4 years ago
c01803cd42
Fix #8108 : possible crash on loading TTD savegames with phantom oil rigs
4 years ago
d210bc4d14
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/korean.txt
# src/saveload/afterload.cpp
Recalculate docking tile cache due to 57553cd8
4 years ago
57553cd809
Fix #8020 : Add missing docking tiles around industry neutral stations
4 years ago
8956b1ab02
Improve performance of tunnel rendering in viewport map mode
4 years ago
76f68c48f5
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
4 years ago
bb363695fc
YAPF: Prevent user for configuring signal penalties to negative values
...
Warn if signal penalty polynomial goes negative, and clamp to non-negative
5 years ago
c3223903ed
Codechange: Cache resolved town, station and industry name strings
5 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
5 years ago
d1cead7f25
Fix: When loading old timetabled saves, also reset cached timetable duration
5 years ago
6f75d9119d
ChillPP: Add support for loading compatible linkgraph settings
5 years ago
c681a9d5de
Fix vehicle timetable automate flag from ChillPP v8 savegames
5 years ago
b8b84a9a0b
Fix leftover PBS reservation on signalled tunnel/bridge entrances in ChillPP savegames
5 years ago
4936b3ba51
Add support for loading ChillPP v8 savegames
5 years ago
5dc1027c6b
Add initial support for loading ChillPP v14.7 savegames
5 years ago
796a878b90
Fix town growth rates when loading JokerPP v1.27 savegames
...
See #123
5 years ago
f0754b007e
Fix road/tram type handling when loading JokerPP v1.27 savegames
...
See #123
5 years ago
d56d4ea51f
Add initial support for loading JokerPP savegames
...
See #123
5 years ago
2fd871e2af
Feature: Configurable game ending year
...
Functionally reverts 683b65ee1
5 years ago
ee7a8eebca
Codechange: Replace FOR_ALL_TOWNS with range-based for loops
5 years ago
0b489f9924
Codechange: Replace FOR_ALL_SUBSIDIES with range-based for loops
5 years ago
869581eb23
Codechange: Replace FOR_ALL_SIGNS with range-based for loops
5 years ago
514565fad6
Codechange: Replace FOR_ALL_OBJECTS with range-based for loops
5 years ago
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
9892d90b26
Codechange: Replace order related FOR_ALL with range-based for loops
5 years ago
00c2a98cf3
Codechange: Replace FOR_ALL_INDUSTRIES with range-based for loops
5 years ago
1f6b3a37f9
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
5 years ago
1c92ba8ebe
Codechange: Replace FOR_ALL_CARGO_PAYMENTS with range-based for loops
5 years ago
fa9769f81a
Codechange: Replace FOR_ALL_DEPOTS with range-based for loops
5 years ago
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
3a14cea068
Codechange: Replace FOR_ALL_COMPANIES with range-based for loops
5 years ago
aa8aae9a62
Initial implementation of tracerestrict speed restriction feature
5 years ago
bbd487a2a7
Revert "Avoid unnecessary calls to SettingsDisableElrail in AfterLoadGame"
...
This reverts commit 5008a09fe9
5 years ago
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
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
91ca46c774
Fix -Wdeprecated-copy and -Wclass-memaccess warnings on GCC 9
5 years ago
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
04f659e768
Fix: Some typos found using codespell
5 years ago
5008a09fe9
Avoid unnecessary calls to SettingsDisableElrail in AfterLoadGame
5 years ago
1365600bed
Merge branch 'jgrpp' into jgrpp-nrt
5 years ago
d3e0c3787f
Merge branch 'master' into jgrpp-nrt
...
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
5 years ago
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
eab5db9769
Fix corruption of conditional order targets when loading SpringPP savegames
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
1d5ba98932
Show time and in game date of game load in desync/crash logs
5 years ago
e21c80ae45
Refresh town cargo acceptance/production on load on NewGRFs mismatch
...
Also when reloading NewGRFs
5 years ago
c2470a21af
Fix town production and acceptance cache saveload/update handling
5 years ago
ec1e848a7f
Add log of game events since last load and overall
...
Add console command
Add to crashlog
5 years ago
b91ee6fb4b
Improve performance of name sorting in industry list window
5 years ago
f6b9395c6a
Improve performance of name sorting in town and station list windows
5 years ago
10c8104e70
Fix 5db883f: Railtype bits were moved too late, leading to rails under bridges losing their type
...
(cherry picked from commit 63a7df027d
5 years ago
e334f7db30
Fix #6507 : Don't try to load invalid depots from older savegames
...
(cherry picked from commit d9f9a64389
5 years ago
44911ec254
Fix: Crash when attempting to load old save game with GRFs set
...
GroupStatistics pool was not initialised before trying to delete vehicles (specifically, trams with no tram track)
(cherry picked from commit 9da1c5bb0b
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
63a7df027d
Fix 5db883f: Railtype bits were moved too late, leading to rails under bridges losing their type
5 years ago
d9f9a64389
Fix #6507 : Don't try to load invalid depots from older savegames
5 years ago
9da1c5bb0b
Fix: Crash when attempting to load old save game with GRFs set
...
GroupStatistics pool was not initialised before trying to delete vehicles (specifically, trams with no tram track)
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
f20b75d712
Codechange: Remove TownLayoutByte type
5 years ago
96a4787710
Codechange: Set ZoomLevel's base type to byte instead of using ZoomLevelByte
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
53ff27370d
Do not update viewport sign kd tree in network dedicated mode, or during savegame conversion
5 years ago
c7d96d037b
Fix RebuildViewportKdtree being called too early in AfterLoadGame
5 years ago
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
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
f6264e5212
Change: Bump savegame version for tree tile water class conversion.
5 years ago
76e77aefad
Fix #7400 : Water class for tree tiles was not converted for old saves preventing industry creation.
...
As the information is always available from the tree ground type, unconditionally
update the map array for tree tiles.
5 years ago
fe448a2616
Remove: OPF
5 years ago
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
5 years ago
e8d397e4ee
Codechange: Make a merged k-d tree index of all viewport signs
5 years ago
d84b67e54d
Codechange: Make a k-d tree index of stations
5 years ago
7b56be0f3a
Codechange: Make a k-d tree index of towns
5 years ago
8b1b3fd0f9
Feature: Non-rectangular sparse station catchment area.
5 years ago
dd20ccee88
Feature: Industries with neutral stations (e.g. Oil Rig) only supply/accept cargo to/from their neutral station. ( #7234 )
...
This change is a controlled by a game setting, located under Environment ->
Industries which allows toggling the behaviour. It defaults to enabled.
"Company stations can serve industries with attached neutral stations"
When enabled, industries with attached neutral station (such as Oil Rigs) may
also be served by company-owned stations built nearby. This is the traditional
behaviour.
When disabled, these industries may only be served by their neutral station.
Any nearby company-owned stations won't be able to serve them, nor will the
neutral station serve anything else other than the industry.
5 years ago
52572cafa6
Add: Option for population-linear town cargo generation
...
Introduce a new default algorithm for town cargo generation (passengers and mail), and a game setting to choose between the new and original algorithm.
The original town cargo generation algorithm has the property of the generated amount relating to the square of each building's population, meaning large towns easily produce more cargo than can realistically be transported. The problem is excessive cargo is amplified if playing with cargodist.
The new algorithm introduced instead has a linear relation to the population. The result is that smaller towns will produce slightly more cargo, while the largest towns will produce about a fourth of what they would with the original algorithm.
Existing savegames will use the original algorithm, while new games will default to the new algorithm.
5 years ago
718554d255
Set tree water class for old savegames for chunnel support
5 years ago
b3a7a04cf2
Linkgraph: Pause game on load if a link graph join is immediately due
5 years ago
b5e76494d8
Do railtype replacement before company infra totals in ReloadNewGRFData
5 years ago
459cd8ac1a
Save/restore secondary rail type in ReloadNewGRFData
5 years ago
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
5 years ago
37bb2c9308
Codechange: Make the style of MakeVoid calls uniform ( #7192 )
5 years ago
c59ecb01ad
Fix loading of bridges from Spring 2013 Patchpack v2.1.147 and later
5 years ago
0b10678050
Change: Make ships stop in locks to move up/down instead of following the slope.
5 years ago
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
e21ade375e
Codechange: Change from numeric to descriptive SLV enum labels for last entries.
5 years ago
9de12521ec
Codechange: Convert saveload numbers to enum values.
...
(This was mostly achieved with a few in-place regexes)
5 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
094160ede3
Merge remote-tracking branch 'damfr/save-unique-id' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
6 years ago
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
6 years ago
d87ac8ec7e
Improve performance of train breakdown detection
6 years ago
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
6 years ago
635c7ca2d5
Merge branch 'save_ext' into more_cond_orders-sx
...
# Conflicts:
# src/lang/english.txt
# src/order_type.h
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
5f6858c379
Add: Setting to save a unique id for each savegame
6 years ago
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
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
6 years ago
e66cec8f86
Add: NewGRF support for 16-in-16-out industries
6 years ago
8859381d30
Add: Industries can produce and accept up to 16 different cargoes
6 years ago
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
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
5db883fbe9
Change: Move rail type bits from m3 to m8.
6 years ago
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
6 years ago
77362b829a
Initial support for rail custom bridge heads
6 years ago
2419974f19
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
bce0ce85b3
Fix comment on setting update for 0.1 increment town cargo scale factor
6 years ago
5770f1407a
Signals on bridges: Shrink M2 simulated signal states field
6 years ago
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
6 years ago
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
6 years ago
4007338280
Clear VF_CARGO_UNLOADING flag from vehicles with no cargo_payment
...
Bump train_through_load savegame version
6 years ago
777151c34d
Station rating: Track last visited vehicle type separately per-cargo
6 years ago
6342099c4d
Allow 256 NewGRFs in multiplayer
...
Add extended network format for server info
Add general UDP packet fragmentation system
Fix map dimensions >= 64k
Increase length of server revision string
Maintain backwards compatibility with trunk for advertisement/server listing
6 years ago
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
fef8b831a9
Change: Switch town growth rate and counter to actual game ticks ( #6763 )
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
7dd6027194
Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic.
6 years ago
09ca051ff8
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train.h
6 years ago
def3a3933b
Move dual-use of load_unload_ticks for bridge/tun signals to new field
6 years ago
80c0655c06
Relax validation for conditional order travel time in old savegame load
6 years ago
218085c535
Timetable: Implement autofill/automate for taken conditional orders.
...
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
7 years ago
a9ca7c1ead
Fix crash when loading old savegames with buoys
7 years ago
be37aad470
Update multiple docks to use savegame framework, fix merge conflicts
7 years ago
06abeb4570
Move dock creation code in afterload further up so it runs before the catchment area is created, since that code checks for the presence of the new docks.
...
(cherry picked from commit 80cf10dc0788644ed844b313e5c73dc634f7b43a)
# Conflicts:
# src/saveload/afterload.cpp
7 years ago
1d3cf59d8a
Allow building multiple docks per station.
...
(cherry picked from commit 0110c4a35d383e0be2cbb53cbe9cbe6784abb3e9)
# Conflicts:
# src/station_cmd.cpp
7 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
0690dbb8bf
Merge branch 'jgrpp' into chunnel
7 years ago
fa044852d5
Merge branch 'day_length' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
7 years ago
1f148322fb
Reset day length factor to 1 when loading pre day length savegame
7 years ago
89a0a9c182
Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format.
7 years ago
ad15b47f72
Chunnel: Fix setting of tunnel ID in load conversion, add method to set ID.
7 years ago
02b33e7f64
Chunnel: Add error text for too many tunnels.
7 years ago
75410ddae4
Chunnel: Save/load changes
7 years ago
aac5b2d4ad
Chunnel: Adjust struct Tunnel constructor
7 years ago
ee0d6e2fe6
Chunnel: Remove debug prints from afterload code.
7 years ago
04244e7215
Chunnel: Fix typo in name of GetOtherTunnelBridgeEndOld
7 years ago
f173b74e81
Chunnel patch 28398: Codechange: Save Tunnel Pool.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
7 years ago
67e7d12eb7
Chunnel patch 28393: Codechange: Rework GetOtherTunnelEnd proc.
...
https://www.tt-forums.net/viewtopic.php?p=1183416#p1183416
7 years ago
a6168dd2f0
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/company_sl.cpp
7 years ago
1b9139efe8
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
7 years ago
60f7168c22
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
7 years ago
f89e8b76d6
Fix increased number of NewGRFs support.
...
Improve error handling if multiplayer limit is exceeded.
7 years ago
072915f2c7
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/settings_gui.cpp
# src/settings_type.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
1f727e9029
Custom bridge heads: Add savegame version and setting.
8 years ago
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
8 years ago
ddae95addb
Rescale town cargo adj setting by 10x, for finer adjustment.
...
Use DECIMAL1 instead of an integer.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
0d2e9f91bf
Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
...
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
8 years ago
5e67582a64
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
8 years ago
597380e099
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
Jonathan G Rennison
Pavel Stupnikov
Charles Pigott
glx22
Michael Lutz
glx22
Yexo
SamuXarick
Niels Martin Hansen
S. D. Cloudt
JMcKiern
peter1138
Henry Wilson
PeterN
Gabda
damfr
keldorkatarn
frosch
HackaLittleBit
alberth