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
15a7f9da9d
Fix 13056ae: PR #7017 added new enum value in bad position, move it
6 years ago
13056aedbc
Add: Conditional order for max. reliability (patch by Cirdan, #6360 ) ( #7017 )
6 years ago
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
5b0cca4b57
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
7f87e3d61c
Add an action 5 type ID remapping mechanism
6 years ago
b1190b32b0
Merge branch 'master' into jgrpp
6 years ago
e3207a77fb
Add setting to control if and how land purchasing is permitted
6 years ago
868c6f924a
Add: Filter box to the save and load windows ( #6974 )
...
Save and heightmap names can be filtered.
6 years ago
9e30fbab34
Fix #6864 : Normalise colour use in Frame rate window
6 years ago
46b1ea81e4
Add company rate limit for land area purchasing
6 years ago
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
6 years ago
06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
9a6a66a054
Add general NewGRF Action 0 property mapping scheme to Action 14
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
b3b89257f7
Remove: Unused string "STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION"
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
92a5e59165
Zoning: Add modes to show 2x2 and 3x3 town road grids
6 years ago
6bcc705c7c
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/saveload/saveload.cpp
6 years ago
eed0da60a2
Fix #6622 : Fixes empty company name in news when gamescript constructs a town
6 years ago
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
3e50336079
Add trace restrict train status conditional
6 years ago
6228a336d4
Show the most relevant information in the vehicle list window, based on what the list is sorted on.
...
(cherry picked from commit da2d0e14fecec35dbf805395200b12998c8cc52a)
Minor changes
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
5732e4f7ff
Show reversing and timetable waiting in vehicle status bar
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
9038ac5c00
Merge branch 'master' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
6 years ago
16cf577b61
Feature: Added New Russian Ruble as currency ( #6678 )
6 years ago
ef0a0b0f8e
Implement rail station property 1B, bridge clearance information
6 years ago
b9d7f8e0a7
Disallow building bridges over airports
6 years ago
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
6 years ago
4bdbf3863d
Add setting to allow placing stations under bridges
6 years ago
56bde8ce18
Add setting to allow placing all NewGRF objects under bridges
6 years ago
2a868b9f3b
Feature: Framerate display window ( #6822 )
...
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
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
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
dc8fff2c4d
Add: Hover tool-tips to cargo dest flow legend window.
...
This is to improve the usability of the window.
The two-letter abbreviations are not always clear, in particular
when using a large number of cargoes.
The company colours can be ambiguous when there are a large
number of companies.
6 years ago
7fed8fe004
Fix #6553 : Make viewport button text unambiguous.
6 years ago
11ba094582
Feature #4186 : Append '(City)' behind cities in the town directory (sbr)
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
6 years ago
1b4db7d86c
Trace restrict: Add wait at entrance PBS for reservation ending here
6 years ago
Jonathan G Rennison
Niels Martin Hansen
Eddi-z
damfr
Oskari Leppäaho
Max Maton
keldorkatarn
ScumbagDog
Alberth