Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-09 19:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,990 Commits 12 Branches 179 Tags 450 MiB
5b7d1f7f80
Commit Graph

176 Commits

Author SHA1 Message Date
Jonathan G Rennison
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
 2019-03-04 01:18:25 +00:00
Eddi-z
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.
 2019-03-02 17:33:16 +00:00
Jonathan G Rennison
65b9a103ad Initial implementation of two rail types per tile 2018-12-21 03:27:58 +00:00
Jonathan G Rennison
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
 2018-07-26 20:54:13 +01:00
Peter Nelson
bf8d7df736 Change: Extend rail types to 64 (6 bit storage) 2018-07-26 13:27:40 +01:00
Peter Nelson
5db883fbe9 Change: Move rail type bits from m3 to m8. 2018-07-26 13:27:40 +01:00
Jonathan G Rennison
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
 2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a Initial support for rail custom bridge heads 2018-07-08 23:03:42 +01:00
Jonathan G Rennison
2419974f19 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
 2018-07-05 01:13:52 +01:00
Jonathan G Rennison
5770f1407a Signals on bridges: Shrink M2 simulated signal states field 2018-07-02 18:29:10 +01:00
Jonathan G Rennison
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
 2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 2018-06-17 04:27:03 +01:00
Jonathan G Rennison
d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 2018-06-17 04:01:31 +01:00
Jonathan G Rennison
315eff1112 Merge branch 'chunnel' into jgrpp 2018-05-03 07:37:38 +01:00
Jonathan G Rennison
e3932dcdaa Documentation: Add use of m2 for tunnel index to landscape docs 
Fixes #49
 2018-05-03 07:37:25 +01:00
Jonathan G Rennison
0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 2017-05-07 19:33:59 +01:00
Jonathan G Rennison
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
 2017-02-05 20:43:56 +00:00
Jonathan G Rennison
0cd99e576c Custom bridge heads: Document landscape array use. 2017-02-05 20:43:19 +00:00
Jonathan G Rennison
d0657a587e Document more rail types patch in landscape HTML docs. 2016-09-18 22:02:20 +01:00
Jonathan G Rennison
11f64c5294 Document programmable signal map bits in lanscape HTML doc. 2016-09-18 20:23:59 +01:00
Jonathan G Rennison
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
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
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.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
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.
 2016-09-18 20:06:39 +01:00
Jonathan G Rennison
6a3ceb3e01 Document tracerestrict bit in landscape HTML docs. 2016-09-18 12:51:40 +01:00
rubidium
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 2014-10-04 19:23:43 +00:00
rubidium
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 2014-10-04 19:23:43 +00:00
rubidium
8a993b6141 (svn r26877) -Update: documentation about the map array 2014-09-21 11:20:29 +00:00
rubidium
18b98afabd (svn r26877) -Update: documentation about the map array 2014-09-21 11:20:29 +00:00
frosch
f794b9786f (svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M. 2013-10-12 16:35:50 +00:00
frosch
69a0c91d63 (svn r25844) -Change: Increase maximum number of object instances on the map from 64k to about 16M. 2013-10-12 16:35:50 +00:00
frosch
d9d978d6d2 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 2013-10-12 16:30:42 +00:00
frosch
35d7e8bca4 (svn r25833) -Codechange: Move ObjectType from map array into pool item. 2013-10-12 16:30:42 +00:00
rubidium
4809627023 (svn r25147) -Fix [FS#5506]: HTML documentation about the map array had a number of small errors (Juanjo) 2013-04-05 19:35:56 +00:00
rubidium
e5a77f94bd (svn r25147) -Fix [FS#5506]: HTML documentation about the map array had a number of small errors (Juanjo) 2013-04-05 19:35:56 +00:00
yexo
0566a6cfda (svn r23168) -Feature [FS#1824]: always draw fences around field tiles 2011-11-08 19:48:47 +00:00
yexo
5c838ff1c3 (svn r23168) -Feature [FS#1824]: always draw fences around field tiles 2011-11-08 19:48:47 +00:00
rubidium
a126dc7500 (svn r20639) -Add: random bits to object tiles 2010-08-27 22:26:21 +00:00
rubidium
536bb704b7 (svn r20639) -Add: random bits to object tiles 2010-08-27 22:26:21 +00:00
rubidium
fa58485e49 (svn r20633) -Cleanup: and clarify some bits in the landscape documentation and make them pass the validator again. 2010-08-27 10:42:48 +00:00
rubidium
8047d84aa0 (svn r20633) -Cleanup: and clarify some bits in the landscape documentation and make them pass the validator again. 2010-08-27 10:42:48 +00:00
rubidium
1d8b95b235 (svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations) 2010-08-26 14:36:00 +00:00
rubidium
7f86dcca90 (svn r20621) -Codechange: move animation frames of houses, objects and industries to m7 (same as airports and stations) 2010-08-26 14:36:00 +00:00
rubidium
f336f61104 (svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns 2010-08-13 12:45:26 +00:00
rubidium
89b2b9370a (svn r20482) -Codechange: move some object related information off the map and unify the relation objects have to towns 2010-08-13 12:45:26 +00:00
rubidium
8975ef1f7b (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00
rubidium
ab5b0ceff2 (svn r20446) -Codechange: unify the location of the water class 2010-08-11 14:14:06 +00:00
rubidium
1f2276b785 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 2010-08-08 10:59:30 +00:00
rubidium
3da3d131c6 (svn r20411) -Codechange: rename unmovables as quite a lot of them are actually movable; e.g. HQ and owned land are pretty movable. 2010-08-08 10:59:30 +00:00
rubidium
5ed887648c (svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension 2010-08-03 08:09:45 +00:00
rubidium
f44c51577b (svn r20334) -Codechange: reorder the unmovable bits a bit for futher extension 2010-08-03 08:09:45 +00:00