dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
04ef407ddff18c0984eea99a4739a6ee01bbad57
openttd/src/table
History
Jonathan G Rennison 04ef407ddf Merge branch 'jgrpp' into jgrpp-nrt 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
#	src/ship_cmd.cpp
2019-08-24 10:41:08 +01:00
..
airport_defaults.h
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
airport_movement.h
Codechange: Remove Direction*Byte types
2019-04-29 17:40:22 +01:00
airporttile_ids.h
…
airporttiles.h
…
animcursors.h
…
autorail.h
…
bridge_land.h
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
build_industry.h
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
cargo_const.h
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
clear_land.h
…
company_settings.ini
Merge: Codechange: Use null pointer literal instead of the NULL macro
2019-04-11 18:14:13 +01:00
control_codes.h
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
2018-04-27 02:42:20 +01:00
currency_settings.ini
Merge branch 'master' into jgrpp
2019-07-08 16:19:07 +01:00
darklight_colours.h
…
elrail_data.h
(svn r27972) -Fix (r15271) [FS#6670]: Catenary sprites got mixed up for depots.
2018-03-05 21:24:48 +00:00
engines.h
Feature: Add NotRoadTypes (NRT)
2019-05-01 21:36:27 +02:00
gameopt_settings.ini
Merge branch 'master' into jgrpp
2019-07-08 16:19:07 +01:00
genland.h
…
heightmap_colours.h
…
industry_land.h
…
landscape_sprite.h
…
misc_settings.ini
Merge branch 'master' into jgrpp-nrt
2019-07-11 20:03:23 +01:00
newgrf_debug_data.h
Merge branch 'jgrpp' into jgrpp-nrt
2019-08-24 10:41:08 +01:00
object_land.h
…
palette_convert.h
…
palettes.h
…
pricebase.h
…
railtypes.h
Feature: Add NotRoadTypes (NRT)
2019-05-01 21:36:27 +02:00
road_land.h
Feature: Add NotRoadTypes (NRT)
2019-05-01 21:36:27 +02:00
roadtypes.h
Fix #7565: Incorrect cursor used for placing road/tram tunnels.
2019-05-09 11:51:04 +01:00
roadveh_movement.h
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
settings.h.postamble
…
settings.h.preamble
Merge branch 'master' into jgrpp
2019-07-08 16:19:07 +01:00
settings.ini
Merge branch 'jgrpp' into jgrpp-nrt
2019-08-24 10:41:08 +01:00
sprites.h
Merge branch 'master' into jgrpp-nrt
2019-07-11 19:45:56 +01:00
station_land.h
Codechange: Use null pointer literal instead of the NULL macro
2019-04-10 23:22:20 +02:00
strgen_tables.h
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
2018-04-27 02:42:20 +01:00
string_colours.h
…
town_land.h
Add: Houses can accept up to 16 different cargo types via NewGRF.
2019-01-21 16:06:25 +01:00
townname.h
Merge branch 'master' into jgrpp
2019-04-16 18:03:08 +01:00
track_land.h
…
train_cmd.h
…
tree_land.h
…
unicode.h
…
water_land.h
…
win32_settings.ini
Merge branch 'master' into jgrpp
2019-07-08 16:19:07 +01:00
window_settings.ini
Merge branch 'master' into jgrpp
2019-07-08 16:19:07 +01:00