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
b242a04c7d
Fix #7307 : Add WaterClass to MP_TREES, set when trees are on coast tiles ( #7309 )
...
This allows allows NewGRF object/industry placement rules to treat trees on coast tiles the same as regular bare coast.
5 years ago
9ef889f28f
Docs: Fix error in landscape_grid.html: class 9 bridge ramp m6
5 years ago
65b9a103ad
Initial implementation of two rail types per tile
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
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
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
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
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
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
6a3ceb3e01
Document tracerestrict bit in landscape HTML docs.
8 years ago
c8a727d3fc
(svn r27210) -Doc[FS#6268]: OpenTTD tiles have more attributes nowadays (Samu).
9 years ago
d741839265
(svn r27210) -Doc[FS#6268]: OpenTTD tiles have more attributes nowadays (Samu).
9 years ago
67991b70f0
(svn r26955) -Fix [FS#6126]: owner of road depot road types were not properly changed upon bankruptcy causing crashes when trying to remove the depot in certain situations
10 years ago
4978ece6ee
(svn r26955) -Fix [FS#6126]: owner of road depot road types were not properly changed upon bankruptcy causing crashes when trying to remove the depot in certain situations
10 years ago
8a993b6141
(svn r26877) -Update: documentation about the map array
10 years ago
18b98afabd
(svn r26877) -Update: documentation about the map array
10 years ago
f794b9786f
(svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M.
11 years ago
69a0c91d63
(svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M.
11 years ago
d9d978d6d2
(svn r25833) -Codechange: Move ObjectType from map array into pool item.
11 years ago
35d7e8bca4
(svn r25833) -Codechange: Move ObjectType from map array into pool item.
11 years ago
4809627023
(svn r25147) -Fix [FS#5506]: HTML documentation about the map array had a number of small errors (Juanjo)
11 years ago
e5a77f94bd
(svn r25147) -Fix [FS#5506]: HTML documentation about the map array had a number of small errors (Juanjo)
11 years ago
0566a6cfda
(svn r23168) -Feature [FS#1824]: always draw fences around field tiles
13 years ago
5c838ff1c3
(svn r23168) -Feature [FS#1824]: always draw fences around field tiles
13 years ago
a126dc7500
(svn r20639) -Add: random bits to object tiles
14 years ago
536bb704b7
(svn r20639) -Add: random bits to object tiles
14 years ago
fa58485e49
(svn r20633) -Cleanup: and clarify some bits in the landscape documentation and make them pass the validator again.
14 years ago
8047d84aa0
(svn r20633) -Cleanup: and clarify some bits in the landscape documentation and make them pass the validator again.
14 years ago
1d8b95b235
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
14 years ago
7f86dcca90
(svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations)
14 years ago
f336f61104
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
14 years ago
89b2b9370a
(svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns
14 years ago
8975ef1f7b
(svn r20446) -Codechange: unify the location of the water class
14 years ago
Jonathan G Rennison
Eddi-z
J0an Josep
Peter Nelson
alberth
rubidium
frosch
yexo