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
|
2019-01-29 02:28:14 +00:00 |
|
Niels Martin Hansen
|
65782af2f4
|
Add: Visual Studio 2019 project files
|
2019-01-26 14:56:35 +01:00 |
|
Jonathan G Rennison
|
9ef889f28f
|
Docs: Fix error in landscape_grid.html: class 9 bridge ramp m6
|
2019-01-19 15:34:04 +00:00 |
|
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
|
2019-01-14 00:01:44 +00:00 |
|
Andy
|
f99f993e99
|
Doc: replace 4 references to SVN with Git #6698 (#7036)
|
2019-01-11 13:41:12 +01:00 |
|
nikolas
|
916e911806
|
Doc: Fix a few typos in docs/multiplayer.txt
|
2019-01-10 22:14:23 +00:00 |
|
Jonathan G Rennison
|
4f1d54564e
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/debug.cpp
|
2019-01-02 16:09:44 +00:00 |
|
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.
|
2018-12-26 17:29:11 +01:00 |
|
Jonathan G Rennison
|
65b9a103ad
|
Initial implementation of two rail types per tile
|
2018-12-21 03:27:58 +00:00 |
|
Jonathan G Rennison
|
a26db59349
|
Add Action 5 support for programmable signals graphics
|
2018-11-28 02:53:51 +00:00 |
|
Jonathan G Rennison
|
5b0cca4b57
|
Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
|
2018-11-28 02:41:52 +00:00 |
|
Jonathan G Rennison
|
7f87e3d61c
|
Add an action 5 type ID remapping mechanism
|
2018-11-27 04:06:21 +00:00 |
|
Jonathan G Rennison
|
254bc4a710
|
Documentation: Fix typo in action 0 remapping description
|
2018-11-22 19:12:57 +00:00 |
|
Jonathan G Rennison
|
cef13b79c6
|
Documentation: Fill in documentation for bridge menu icons and station min bridge height
|
2018-11-19 19:51:35 +00:00 |
|
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
|
2018-11-17 19:49:05 +00:00 |
|
Jonathan G Rennison
|
d264d71d04
|
Documentation: Fix typo in action 0 remapping description
|
2018-11-19 19:29:52 +00:00 |
|
Jonathan G Rennison
|
d320f77c44
|
Documentation: Fix NewGRF additions CSS
|
2018-11-19 19:17:39 +00:00 |
|
Jonathan G Rennison
|
2c88645bac
|
Merge branch 'newgrf-property-mapping' into jgrpp
|
2018-11-11 23:51:30 +00:00 |
|
Jonathan G Rennison
|
04536952ee
|
Fix Action 0 mapped property length handling
Fix case when Num-info != 1
|
2018-11-11 23:50:09 +00:00 |
|
Jonathan G Rennison
|
ceae4516ca
|
Add remappable properties for station min bridge height and bridge menu icon
|
2018-11-11 11:28:10 +00:00 |
|
Jonathan G Rennison
|
06c458cb19
|
Merge branch 'newgrf-property-mapping' into jgrpp
# Conflicts:
# docs/newgrf-additions.html
# src/newgrf.cpp
|
2018-11-11 11:27:41 +00:00 |
|
Jonathan G Rennison
|
9a6a66a054
|
Add general NewGRF Action 0 property mapping scheme to Action 14
|
2018-11-11 11:26:05 +00:00 |
|
Jonathan G Rennison
|
2dda1c4351
|
Documentation: Add docs on NewGRF spec additions
|
2018-11-10 18:54:38 +00:00 |
|
Jonathan G Rennison
|
b653c55d34
|
Documentation: Spelling/minor adjustments to NewGRF additions
|
2018-08-09 08:40:34 +01:00 |
|
Jonathan G Rennison
|
15d818facc
|
Documentation: Add docs on NewGRF spec additions
|
2018-08-08 23:19:06 +01: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 |
|
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
|
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 |
|
J0an Josep
|
94cd6d9a73
|
Fix: (Doc) Use free bits and -inherit- more consistently in landscape grid.
|
2018-07-26 18:03:37 +02:00 |
|
J0anJosep
|
51d30d7e1c
|
Fix #6805: (Doc) Road depot and stations (except rail stations and waypoints) do not use m8 for railtype.
|
2018-07-26 18:03:37 +02: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 |
|
Peter Nelson
|
65548c37a8
|
Change: Extend map array by 2 bytes with a uint16.
|
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
|
8e9d68048a
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/string.cpp
|
2018-06-07 06:49:18 +01:00 |
|
Niels Martin Hansen
|
5de2628862
|
Update: Document DOS music loading
|
2018-06-05 22:58:35 +02: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
|
1fe0bb76b9
|
Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp
|
2018-04-27 02:42:20 +01:00 |
|
Ricardo N Feliciano
|
e8de33a61f
|
Cleanup: Use new filename for README file. (#6738)
|
2018-04-21 11:05:38 +02: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 |
|