4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
65bc7123d1
Update: Readme_Windows_MSVC documentation now reflects the current reality again
...
It was not updated for a while, and kinda out-of-date. This should
bring it back to reality.
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
a26db59349
Add Action 5 support for programmable signals graphics
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
254bc4a710
Documentation: Fix typo in action 0 remapping description
6 years ago
cef13b79c6
Documentation: Fill in documentation for bridge menu icons and station min bridge height
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
d264d71d04
Documentation: Fix typo in action 0 remapping description
6 years ago
d320f77c44
Documentation: Fix NewGRF additions CSS
6 years ago
2c88645bac
Merge branch 'newgrf-property-mapping' into jgrpp
6 years ago
04536952ee
Fix Action 0 mapped property length handling
...
Fix case when Num-info != 1
6 years ago
ceae4516ca
Add remappable properties for station min bridge height and bridge menu icon
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
2dda1c4351
Documentation: Add docs on NewGRF spec additions
6 years ago
b653c55d34
Documentation: Spelling/minor adjustments to NewGRF additions
6 years ago
15d818facc
Documentation: Add docs on NewGRF spec additions
6 years ago
8c0a6bbc4f
Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid.
6 years ago
41a620c1a7
Fix #6805 : (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype.
6 years ago
912ddc85d4
Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
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
94cd6d9a73
Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid.
6 years ago
51d30d7e1c
Fix #6805 : (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype.
6 years ago
bf8d7df736
Change: Extend rail types to 64 (6 bit storage)
6 years ago
5db883fbe9
Change: Move rail type bits from m3 to m8.
6 years ago
65548c37a8
Change: Extend map array by 2 bytes with a uint16.
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
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
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
6 years ago
8e9d68048a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/string.cpp
6 years ago
5de2628862
Update: Document DOS music loading
6 years ago
315eff1112
Merge branch 'chunnel' into jgrpp
6 years ago
e3932dcdaa
Documentation: Add use of m2 for tunnel index to landscape docs
...
Fixes #49
6 years ago
1fe0bb76b9
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
6 years ago
e8de33a61f
Cleanup: Use new filename for README file. ( #6738 )
6 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
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
7 years ago
0cd99e576c
Custom bridge heads: Document landscape array use.
7 years ago
d0657a587e
Document more rail types patch in landscape HTML docs.
8 years ago
11f64c5294
Document programmable signal map bits in lanscape HTML doc.
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
556594f2f0
Extend bridge signal simulation to support an unlimited no. of signals.
...
This is instead of the previous limit of 16, all stored in M2.
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
6a3ceb3e01
Document tracerestrict bit in landscape HTML docs.
8 years ago
Jonathan G Rennison
Patric Stout
J0an Josep
Peter Nelson
Niels Martin Hansen
Ricardo N Feliciano