Commit Graph

46954 Commits

Author SHA1 Message Date
Jonathan G Rennison
f06c2e0475 Add NewGRF feature for varact2 station var 42 2018-08-08 23:03:08 +01:00
Jonathan G Rennison
4566699939 Fix script/AI construction of rail track and waypoints
Broken by increase to 64 rail types (bf8d7df736)
2018-08-07 23:20:51 +01:00
Jonathan G Rennison
cb7eea8896 Add NewGRF features for more bridge types and Action 0 bridges prop 0x14 2018-08-07 22:58:05 +01:00
cirdan
c6d4a6b5e4 Rework end loop in GrowTownWithBridge
Rework the end loop in GrowTownWithBridge to keep track of bridge
types already tried. This also fixes a bug that prevented the last
bridge type from being tried at all.

(cherry picked from commit 2b1d2c5887f8c3e27a8229ef87d670395aab2011)
2018-08-07 22:44:36 +01:00
cirdan
f41a125d8e Raise the maximum number of bridge types to 16
Raise the maximum number of possible bridge types to 16. The new
bridge types have default properties that make them unavailable at
any year and bridge length, so they cannot be used unless a NewGRF
overrides them.

(cherry picked from commit da399d7bf278ba32fb9f14af65cfcefe5d276e71)
2018-08-07 22:42:36 +01:00
cirdan
1aa13c9ea3 Allow NewGRFs to set the selection sprite for a bridge
Allow NewGRFs to define the sprite to use for a bridge in the bridge
selection window through Action0 property 14.

(cherry picked from commit 8434809a5b57477908e8d5f663e950546c7c8408)
2018-08-07 22:42:07 +01:00
Jonathan G Rennison
848a92e0d9 Fix signal state propagation from the back side of tunnel/bridge tiles 2018-08-07 08:24:06 +01:00
Jonathan G Rennison
59c396cc3b Fix wrong line height in click to select order in timetable GUI 2018-08-07 07:47:31 +01:00
Jonathan G Rennison
9774606c22 Version: Committing version data for tag: jgrpp-0.26.1 2018-08-06 02:43:34 +01:00
Jonathan G Rennison
b582ef8078 Add NewGRF feature: action0_station_prop1B 2018-08-06 02:33:35 +01:00
Jonathan G Rennison
2735e7748c Merge branch 'newgrf-feature-detection' into jgrpp 2018-08-06 02:33:17 +01:00
Jonathan G Rennison
9038ac5c00 Merge branch 'master' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-08-06 02:33:13 +01:00
Jonathan G Rennison
9f2515d793 Add general NewGRF feature detection scheme to Action 14 2018-08-06 02:29:26 +01:00
Patric Stout
5df3a65074 Add: notify IRC about pull-requests and issues 2018-08-05 17:46:30 +02:00
Jonathan G Rennison
64c71f5136 Add recalculated total to AssertCountConsistency assertion message 2018-08-05 11:32:05 +01:00
Jonathan G Rennison
f13b686d0c Merge branch 'custom_bridgeheads' into jgrpp
# Conflicts:
#	src/settings_gui.cpp
#	src/train_cmd.cpp
2018-08-05 10:49:02 +01:00
Jonathan G Rennison
1b9775479d Fix incorrect vehicle alignment when entering bridge from W,N directions 2018-08-05 10:47:13 +01:00
Jonathan G Rennison
a87720ca06 Fix train bounding box/delta not being updated when entering bridge from 45° angle 2018-08-05 10:45:21 +01:00
Patric Stout
74eb77f0a8 Add: notify IRC about pushes to this repository 2018-08-04 22:43:54 +02:00
translators
b34a1f372f Update: Translations from eints
italian: 1 change by lorenzodv
2018-08-04 19:45:41 +02:00
Jonathan G Rennison
a87e77015c Fix being able to add signals to bridge with junction custom bridge head at far end 2018-08-04 17:40:11 +01:00
J0an Josep
67f6bcdc9b Fix #6805: Update CmdBuilRailWaypoint bits. 2018-08-04 08:59:22 +02:00
J0an Josep
a53f13cff6 Fix #6805: Clear some m8 bits when making some tiles. 2018-08-04 08:59:22 +02:00
J0an Josep
8c0a6bbc4f Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid. 2018-08-04 08:59:22 +02:00
J0anJosep
41a620c1a7 Fix #6805: (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype. 2018-08-04 08:59:22 +02:00
ScumbagDog
16cf577b61 Feature: Added New Russian Ruble as currency (#6678) 2018-08-04 08:58:50 +02:00
translators
76f788124b Update: Translations from eints
latvian: 8 changes by krixis02
2018-08-03 19:45:40 +02:00
Jonathan G Rennison
ef0a0b0f8e Implement rail station property 1B, bridge clearance information 2018-08-02 08:27:20 +01:00
Jonathan G Rennison
76a7b70cad Implement NewGRF Station var 0x42 (rail type) for unbuilt stations 2018-08-01 01:37:23 +01:00
Jonathan G Rennison
743802974c Fix typo in changelog 2018-08-01 01:01:32 +01:00
Jonathan G Rennison
649118c928 Fix assertion failure when deleting train from signalled tunnel/bridge 2018-07-31 20:53:53 +01:00
translators
4bd281cef3 Update: Translations from eints
korean: 44 changes by telk5093
2018-07-30 19:45:41 +02:00
Jonathan G Rennison
912ddc85d4 Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
# Conflicts:
#	docs/landscape_grid.html
2018-07-30 02:05:52 +01:00
Jonathan G Rennison
a84fbcb219 Change bridges over stations/objects settings from expert to advanced 2018-07-30 01:56:52 +01:00
Jonathan G Rennison
b9d7f8e0a7 Disallow building bridges over airports 2018-07-30 01:55:58 +01:00
Jonathan G Rennison
25bfeec048 Fix line height mismatch between columns in timetable window
This could occur when using small fonts or large icons (e.g. BigGUI
NewGRF).
2018-07-29 23:42:50 +01:00
Jonathan G Rennison
5d8c560c5b Merge branch 'signal_tunnels_bridges' into jgrpp 2018-07-29 23:38:03 +01:00
Jonathan G Rennison
53acbd57b1 Fix buffer overflow in savegame upgrade path in 5770f1407a 2018-07-29 23:37:46 +01:00
Niels Martin Hansen
9627577596 Fix: HouseSpec::watched_cargoes not 64 bit
Looks like HouseSpec::watched_cargoes was missed in the conversion to 64 cargo types.
2018-07-29 17:12:56 +02:00
translators
64dac65e20 Update: Translations from eints
spanish (mexican): 1 change by Absay
2018-07-28 19:45:41 +02:00
J0an Josep
b843373245 Fix #6805: Update CmdBuilRailWaypoint bits. 2018-07-28 16:00:53 +02:00
J0an Josep
9cabab03b1 Fix #6805: Clear some m8 bits when making some tiles. 2018-07-28 16:00:33 +02:00
Jonathan G Rennison
b80c3198cc Version: Committing version data for tag: jgrpp-0.26.0 2018-07-27 08:19:38 +01:00
Jonathan G Rennison
df7177876c Update baseset files 2018-07-26 20:37:20 +01:00
Jonathan G Rennison
e261a71271 Merge branch 'crashlog_improvements' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
2018-07-26 20:26:09 +01: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
Jonathan G Rennison
1b5da1f2aa Add m8 support to DumpTileInfo 2018-07-26 20:03:16 +01:00
Jonathan G Rennison
9490f33a6c Merge branch 'master' into crashlog_improvements
# Conflicts:
#	src/console_cmds.cpp
#	src/openttd.cpp
#	src/vehicle.cpp
2018-07-26 20:01:08 +01:00
Jonathan G Rennison
9e1e074c2b Update existing assertions to log tile information where suitable 2018-07-26 19:13:35 +01:00
Jonathan G Rennison
5661763d6a Merge branch 'crashlog_improvements' into jgrpp 2018-07-26 19:04:34 +01:00