Jonathan G Rennison
|
cbdd9f84d8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
|
2019-11-12 18:43:10 +00:00 |
|
Jonathan G Rennison
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
2019-07-08 16:19:07 +01:00 |
|
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
2019-04-11 18:14:13 +01:00 |
|
keldorkatarn
|
98da7019d6
|
Plans: Make it possible to give plans a name.
(cherry picked from commit d9b553f130a6eda36e2eea217785f829d3d8624e)
|
2018-08-16 05:30:56 +01:00 |
|
Jonathan G Rennison
|
2f2937356b
|
Add command parameter validation to plan commands
(cherry picked from commit 957cff34dc)
|
2018-08-16 05:29:10 +01:00 |
|
Jonathan G Rennison
|
f3ed6765a5
|
Add Ctrl+Click to scroll to plan.
|
2017-03-31 14:15:36 +01:00 |
|
patch-import
|
536a95dfd0
|
Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
|
2015-08-05 21:24:30 +01:00 |
|