dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ed1b842ad38d9c6471e92f4da7a1a88e1e9d63eb
openttd/src/table
History
Jonathan G Rennison ed1b842ad3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
2023-09-15 20:44:22 +01:00
..
settings
Merge branch 'master' into jgrpp
2023-09-02 20:48:58 +01:00
airport_defaults.h
Codechange: Define Date/Year/Month/Day within TimerGameCalendar class
2023-04-26 07:14:03 -04:00
airport_movement.h
…
airporttile_ids.h
…
airporttiles.h
…
animcursors.h
…
autorail.h
…
bridge_land.h
…
build_industry.h
…
cargo_const.h
…
clear_land.h
…
CMakeLists.txt
…
control_codes.h
Merge branch 'master' into jgrpp
2023-09-12 20:06:47 +01:00
darklight_colours.h
…
elrail_data.h
Fix #10257: Incorrect wire position on sloped bridge heads. (#10258)
2022-12-19 20:16:26 +00:00
engines.h
Fix: Don't assume engclass 2 should be elrail. (#10315)
2023-01-06 00:44:57 +00:00
genland.h
…
heightmap_colours.h
…
industry_land.h
…
landscape_sprite.h
…
newgrf_debug_data.h
Add: [NewGRF] Inspection window for airports.
2023-09-10 20:50:57 +01:00
object_land.h
Codechange: Don't use macros for DAYS_TILL and friends (#10746)
2023-05-07 05:25:24 -04:00
opengl_shader.h
Cleanup: Remove svn-style $Id$ comments. (#10122)
2022-11-01 18:24:31 -06:00
palette_convert.h
…
palettes.h
…
pricebase.h
…
railtypes.h
…
road_land.h
Feature: Multi-track level crossings (#9931)
2022-11-01 16:51:23 -04:00
roadtypes.h
Add road/tram type properties to set road vehicle collision mode
2023-02-19 14:30:21 +00:00
roadveh_movement.h
…
settings.h.postamble
…
settings.h.preamble
Remove linkgraph duration not day length scaled setting
2023-05-22 19:38:52 +01:00
sprites.h
Merge branch 'master' into jgrpp
2023-09-15 20:44:22 +01:00
station_land.h
…
strgen_tables.h
Merge branch 'master' into jgrpp
2023-09-12 20:06:47 +01:00
string_colours.h
…
town_land.h
Avoid unnecessary viewport redraws for unused tile loop house triggers
2022-11-24 02:38:10 +00:00
townname.h
…
track_land.h
…
train_cmd.h
…
tree_land.h
Fix duplication of tree sprite table
2022-12-03 22:48:49 +00:00
unicode.h
Change: Rename some freetype things to fontcache.
2022-09-25 18:34:24 +01:00
water_land.h
…