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
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.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
97221a67f2
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
5 years ago
bba36aef1b
TBTR: Check for mixed virtual/non-virtual consists on load
5 years ago
0f6c5ee622
Fix saveload exception handling when gamelog action in progress
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
f78b72989b
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/vehicle_sl.cpp
# src/train.h
5 years ago
f1946af707
TBTR: Delete leftover virtual trains on non-network client load
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
829c635add
Add road layout change counter, add to road veh path caches
...
Update layout counter when non-leaf road bits are added or removed
5 years ago
5a9790a196
Store crash/desync logs in crash/desync savegame
...
Add console command to dump loaded debug log
5 years ago
ec1e848a7f
Add log of game events since last load and overall
...
Add console command
Add to crashlog
5 years ago
6fabfc3f21
Fix #7577 : Check if linkgraph station index is valid before dereferencing. ( #7583 )
...
(cherry picked from commit 83c1678f9e
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
140a96b3a0
Change: Limit memory allocations for each Squirrel instance
...
This can avoid out-of-memory situations due to single scripts using up the entire address space.
Instead, scripts that go above the maximum are killed.
The maximum is default 1 GB per script, but can be configured by a setting.
5 years ago
83c1678f9e
Fix #7577 : Check if linkgraph station index is valid before dereferencing. ( #7583 )
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
1ee33c46ef
Linkgraph: Allow overriding distribution mode on a per-cargo basis, in game
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
3299d6540b
Cleanup: Delete GetSavegameType function since it's been commented out since 2005
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
327ff89808
Codechange: Remove PauseModeByte
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
931d32f414
Codechange: Remove RailTypeByte type
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
f54f549632
Add SlXvCheckSpecialSavegameVersions constants to SaveLoadVersion enum
5 years ago
a6ea1ea408
Allow articulated road vehicles to overtake other vehicles
...
Add setting
5 years ago
0d93ecb6bf
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/alloc_type.hpp
# src/group_gui.cpp
# src/newgrf.cpp
# src/saveload/economy_sl.cpp
# src/saveload/map_sl.cpp
# src/station_cmd.cpp
5 years ago
4e85ccf3c0
Codechange: Replace SmallStackSafeStackAlloc with std::array.
...
The only port that ever used it to make heap allocations instead of stack ones was the NDS port, which got thrown out some time ago.
5 years ago
4f052fc2a4
Cleanup: Fix alignment after NULL -> nullptr change.
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
f5747bf753
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/group_gui.cpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
5 years ago
8c3d1b1c45
Convert secondary rail types in AfterLoadLabelMaps
...
Handle missing rail types
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
8b1880187a
Remove: AutoFreeSmallVector.
...
The last use was for storing a list of memory blocks. As the way these lists are accessed is very
specific, it is easier to just write an explicit destructor instead of trying to exactly match the behaviour.
5 years ago
e804173595
Codechange: If something is a vector of strings, use a vector of strings instead of an AutoFreeSmallVector.
5 years ago
d3e113eb5f
Codechange: Use std::vector instead of AutoDeleteSmallVector in GS text handling.
5 years ago
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# 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/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
d5ee9d34da
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# projects/determineversion.vbs
# source.list
# src/crashlog.cpp
# src/misc.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/rev.h
# src/thread/thread.h
# src/thread/thread_morphos.cpp
# src/thread/thread_none.cpp
# src/thread/thread_os2.cpp
# src/thread/thread_pthread.cpp
# src/thread/thread_win32.cpp
5 years ago
7f80884047
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
5 years ago
94c5269fa7
Codechange: Use atomic variables for thread synchronization where useful.
5 years ago
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
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
58433c7667
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/smallmap_type.hpp
# src/lang/korean.txt
# src/network/network_content.cpp
# src/smallmap_gui.cpp
# src/station_cmd.cpp
5 years ago
66dd7c3879
Fix: MSVC warnings ( #7423 )
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
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
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
f3938fdb83
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
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
af7d9020a1
Codechange: Use override specifer for overriding member declarations
...
This is a C++11 feature that allows the compiler to check that a virtual
member declaration overrides a base-class member with the same signature.
Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked
as virtual despite being a template.
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
7adae09897
Codechange: liblzma is called liblzma, how ever strange that might be
...
It is the only library we use that calls itself with 'lib' in the
name. This might be confusing, but with the arrival of cmake a lot
of these things are automated. And detection will find 'liblzma',
not 'lzma', like with 'lzo', 'zlib', ..
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
6c6971fb43
Add: Road vehicle path cache. ( #7261 )
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
b8a0107ad1
Change: Add configurable curve penalty for ships.
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
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
5 years ago
a67ee02529
Change: Heading for 1.10 now ( #7319 )
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
4c8b358ffe
Add game setting to allow only non-stop orders for ground vehicles
5 years ago
e6b788591d
Fix 1 byte buffer over-read in old gamelog loader
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
1db19208ba
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.h
5 years ago
c0c8fb25fb
Change: Use SlErrorCorrupt() on pool index error when loading a savegame, instead of terminating. ( #7219 )
5 years ago
37bb2c9308
Codechange: Make the style of MakeVoid calls uniform ( #7192 )
5 years ago
b11f1a233f
Fix type mismatch in _sl_version extern declaration
5 years ago
c59ecb01ad
Fix loading of bridges from Spring 2013 Patchpack v2.1.147 and later
5 years ago
64878320cc
Fix #6803 : CargoMonitorID bit packing updated to handle 64 cargo types.
...
This requires a saveload bump to change the bitpacking on loading older saves.
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
46b5b0155c
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
5 years ago
33e3f49161
Fix #7119 : When rotating a ship, apply an additional offset to avoid movement glitch.
5 years ago
faee0737e0
Codechange: Separate gamelog revision length from network revision length
5 years ago
e21ade375e
Codechange: Change from numeric to descriptive SLV enum labels for last entries.
5 years ago
0f37a683a2
Codechange: Additional type safety for saveload version variables.
5 years ago
9de12521ec
Codechange: Convert saveload numbers to enum values.
...
(This was mostly achieved with a few in-place regexes)
5 years ago
ea4ea62816
Codechange: Make saveload version upper bound exclusive, i.e. version object was removed instead of version object last appeared.
5 years ago
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
5 years ago
c41463b259
Merge branch 'save_ext' into jgrpp
5 years ago
02e2627765
Extend documentation in extended_ver_sl.cpp
...
Correct typo
5 years ago
5f0258b0c5
Fix minor formatting issue in SlXvIsChunkDiscardable
5 years ago
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
5 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
67633606b0
Codechange: Remove value mangling and field misuse in SLE_WRITEBYTE.
...
The original translation functionality hasn't been used since 2007.
5 years ago
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
6 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
225790892d
Change: Make ships stop and change direction slowly instead of instantly turning.
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
8e832afb65
Merge branch 'save_ext' into jgrpp
6 years ago
d3cef7284a
Fix missing case in SlCalcObjMemberLength
...
Fixes 80d6f6c622
6 years ago
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
6 years ago
80d6f6c622
Merge branch 'master' into save_ext
...
# Conflicts:
# src/saveload/saveload.cpp
# src/saveload/saveload.h
6 years ago
81330b8d6e
Change: Add path cache for ships.
6 years ago
1c725fce47
Change: Add ability to save/load std::deque<> containers.
6 years ago
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
6 years ago
0bb9207f4d
Index OrderList contents in a flat vector
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
0dba091d79
Merge branch 'cpp-11' into save_ext
...
# Conflicts:
# config.lib
# src/saveload/saveload.cpp
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
a315d39067
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/tracerestrict.h
6 years ago
cae0b21534
Trace restrict: Bump size of item type field
...
Reserve value for TRIT_REVERSE
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
83a063f51c
Add train is in slot conditional order
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
e0c0394e37
Fix: Remove various dead or unnecessary assignments
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
4b0b4e0643
Feature: [NewGRF] Increase size of persistent storage to 256.
6 years ago
3e50336079
Add trace restrict train status conditional
6 years ago
d8b9e2953e
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
98da7019d6
Plans: Make it possible to give plans a name.
...
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
e55a327c09
Enable locking timetable travel times
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
Jonathan G Rennison
peter1138
Niels Martin Hansen
Charles Pigott
Michael Lutz
Henry Wilson
glx22
Patric Stout
PeterN
frosch
Gabda
damfr
keldorkatarn