Jonathan G Rennison
d3e0c3787f
Merge branch 'master' into jgrpp-nrt
...
Merge trunk multiple docks implementation
# Conflicts:
# docs/landscape_grid.html
# src/order_cmd.cpp
# src/pathfinder/npf/npf.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/oldloader_sl.cpp
# src/saveload/station_sl.cpp
# src/script/api/script_order.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/tunnelbridge_cmd.cpp
5 years ago
Jonathan G Rennison
dbc5f1baed
Merge branch 'master' into jgrpp-nrt
...
# Conflicts:
# src/fontcache.cpp
# src/game/game_text.cpp
# src/lang/korean.txt
# src/os/macosx/crashlog_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/station_cmd.cpp
# src/viewport.cpp
5 years ago
Jonathan G Rennison
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
5 years ago
peter1138
f538179878
Feature: Multi-tile docks and docking points.
5 years ago
Jonathan G Rennison
3fccfa2b48
Update low level changes document
5 years ago
Michael Lutz
2675762ae9
Add: [Win32] GDI engine for font glyph rendering as a replacement for including FreeType.
...
Building with FreeType is still possible and will take precedence over the GDI renderer, but
the project files don't include FreeType anymore by default. Combining GDI rendering with ICU
text layout is untested.
5 years ago
peter1138
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
Jonathan G Rennison
1397bf5755
Update crash log section of low level changes doc
6 years ago
Jonathan G Rennison
f3fb05fad4
Documentation: Fix typo in newgrf-additions
6 years ago
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
6 years ago
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.
6 years ago
Jonathan G Rennison
f4528a43d3
Doc: Add to low level changes document, fix typos
6 years ago
Jonathan G Rennison
a695dcd331
Add docs file on low-level changes
6 years ago
Jonathan G Rennison
281d346fe2
Merge branch 'master' into jgrpp
...
# Conflicts:
# bin/baseset/no_sound.obs
# bin/baseset/orig_dos.obg
# bin/baseset/orig_dos.obs
# bin/baseset/orig_dos_de.obg
# bin/baseset/orig_win.obg
# bin/baseset/orig_win.obm
# bin/baseset/orig_win.obs
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.cpp
# src/blitter/8bpp_base.hpp
# src/blitter/common.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/saveload/saveload.cpp
# src/town_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
6 years ago
Niels Martin Hansen
65782af2f4
Add: Visual Studio 2019 project files
6 years ago
Jonathan G Rennison
9ef889f28f
Docs: Fix error in landscape_grid.html: class 9 bridge ramp m6
6 years ago
Jonathan G Rennison
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
6 years ago
Andy
f99f993e99
Doc: replace 4 references to SVN with Git #6698 ( #7036 )
6 years ago
nikolas
916e911806
Doc: Fix a few typos in docs/multiplayer.txt
6 years ago
Jonathan G Rennison
4f1d54564e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/debug.cpp
6 years ago
Patric Stout
65bc7123d1
Update: Readme_Windows_MSVC documentation now reflects the current reality again
...
It was not updated for a while, and kinda out-of-date. This should
bring it back to reality.
6 years ago
Jonathan G Rennison
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
Jonathan G Rennison
a26db59349
Add Action 5 support for programmable signals graphics
6 years ago
Jonathan G Rennison
5b0cca4b57
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
Jonathan G Rennison
7f87e3d61c
Add an action 5 type ID remapping mechanism
6 years ago
Jonathan G Rennison
254bc4a710
Documentation: Fix typo in action 0 remapping description
6 years ago
Jonathan G Rennison
cef13b79c6
Documentation: Fill in documentation for bridge menu icons and station min bridge height
6 years ago
Jonathan G Rennison
8b37e5aac2
Implement custom bridge pillar flag support
...
Add bridge NewGRF property to set bridge pillars
Add station NewGRF property to disallow bridge pillars
Set values for default bridges and stations
6 years ago
Jonathan G Rennison
d264d71d04
Documentation: Fix typo in action 0 remapping description
6 years ago
Jonathan G Rennison
d320f77c44
Documentation: Fix NewGRF additions CSS
6 years ago
Jonathan G Rennison
2c88645bac
Merge branch 'newgrf-property-mapping' into jgrpp
6 years ago
Jonathan G Rennison
04536952ee
Fix Action 0 mapped property length handling
...
Fix case when Num-info != 1
6 years ago
Jonathan G Rennison
ceae4516ca
Add remappable properties for station min bridge height and bridge menu icon
6 years ago
Jonathan G Rennison
06c458cb19
Merge branch 'newgrf-property-mapping' into jgrpp
...
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
6 years ago
Jonathan G Rennison
9a6a66a054
Add general NewGRF Action 0 property mapping scheme to Action 14
6 years ago
Jonathan G Rennison
2dda1c4351
Documentation: Add docs on NewGRF spec additions
6 years ago
Jonathan G Rennison
b653c55d34
Documentation: Spelling/minor adjustments to NewGRF additions
6 years ago
Jonathan G Rennison
15d818facc
Documentation: Add docs on NewGRF spec additions
6 years ago
J0an Josep
8c0a6bbc4f
Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid.
6 years ago
J0anJosep
41a620c1a7
Fix #6805 : (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype.
6 years ago
Jonathan G Rennison
912ddc85d4
Merge remote-tracking branch 'J0anJosep/MapArrayGrid-m8' into jgrpp
...
# Conflicts:
# docs/landscape_grid.html
6 years ago
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
6 years ago
J0an Josep
94cd6d9a73
Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid.
6 years ago
J0anJosep
51d30d7e1c
Fix #6805 : (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype.
6 years ago
Peter Nelson
bf8d7df736
Change: Extend rail types to 64 (6 bit storage)
6 years ago
Peter Nelson
5db883fbe9
Change: Move rail type bits from m3 to m8.
6 years ago
Peter Nelson
65548c37a8
Change: Extend map array by 2 bytes with a uint16.
6 years ago
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
6 years ago
Jonathan G Rennison
77362b829a
Initial support for rail custom bridge heads
6 years ago
Jonathan G Rennison
2419974f19
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago