Jonathan G Rennison
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
2018-05-22 18:43:34 +01:00
Jonathan G Rennison
a60eff174d
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
2018-05-13 15:01:29 +01:00
Jonathan G Rennison
5877cd0f9b
TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes
...
Slight code, GUI layout, and savegame format tidying
2018-05-13 15:00:26 +01:00
Jonathan G Rennison
e0126a1fbc
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
2018-04-30 15:39:55 +01:00
Jonathan G Rennison
0dd3ff23de
Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared
2018-04-30 15:39:33 +01:00
keldorkatarn
c2678b896e
Fix clearing of train reservations in tunnels and on bridges.
...
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)
See: #46
2018-04-30 15:23:40 +01:00
Jonathan G Rennison
2821599f6b
Better handle out of track and depot through load cases
...
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
2018-03-29 19:16:44 +01:00
Jonathan G Rennison
c779915ccb
Fix train through load always advancing last section to far end of platform
2018-03-26 21:11:11 +01:00
Jonathan G Rennison
f012d45491
Merge branch 'signal_tunnels_bridges' into jgrpp
2018-03-26 20:49:11 +01:00
Jonathan G Rennison
df72bc6e09
Fix signal on tun/bridge gradual decel end tile detection
2018-03-26 20:48:52 +01:00
Jonathan G Rennison
78838ee2a2
Add freight train load/unload mode: through load
2018-03-26 20:12:50 +01:00
Jonathan G Rennison
09ca051ff8
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train.h
2018-03-26 18:42:23 +01:00
Jonathan G Rennison
def3a3933b
Move dual-use of load_unload_ticks for bridge/tun signals to new field
2018-03-26 18:40:05 +01:00
Jonathan G Rennison
10db379202
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
2018-03-25 00:57:59 +00:00
Jonathan G Rennison
38cb80872b
Gradually slow down for red signals on bridges/tunnels
...
Instead of coming to a sudden halt immediately before the signal
2018-03-25 00:57:20 +00:00
Jonathan G Rennison
8a4d462d44
Merge branch 'chunnel' into jgrpp
2018-02-26 00:58:26 +00:00
HackaLittleBit
d5a316e365
Use flag GVF_CHUNNEL_BIT properly
2018-02-26 00:58:16 +00:00
Jonathan G Rennison
ec661d7ae9
Merge branch 'template_train_replacement' into jgrpp
2018-01-30 18:58:34 +00:00
Jonathan G Rennison
4a9df57665
TBTR: Enable autorenew when template replacement active
2018-01-30 18:58:09 +00:00
Jonathan G Rennison
06a2457efc
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
2018-01-29 22:09:40 +00:00
Jonathan G Rennison
233b0f8e9e
TBTR: Add sanity check assertions
2018-01-29 22:05:55 +00:00
Jonathan G Rennison
bb6b8d8cd6
Increase verbosity of some assertion failure messages
2018-01-29 00:18:49 +00:00
Jonathan G Rennison
d730cfd51d
Cache sprite sequence bounds for vehicles
2018-01-19 19:13:01 +00:00
Jonathan G Rennison
dda20d08c1
Merge branch 'improved_breakdowns' into jgrpp
...
Update German and Korean language strings
# Conflicts:
# src/saveload/extended_ver_sl.cpp
2018-01-04 19:47:46 +00:00
Jonathan G Rennison
beda7ebb39
Set minimum speed for train critical breakdown reduction.
2018-01-04 19:05:18 +00:00
Jonathan G Rennison
4b392b66db
Fix DeleteVisibleTrain being called on virtual trains
...
Add assertion to check for this case
2017-12-31 14:29:15 +00:00
Jonathan G Rennison
1c04653518
Add scope info logging to DeleteVisibleTrain
2017-12-31 14:23:33 +00:00
Jonathan G Rennison
9559ad4946
Merge branch 'template_train_replacement' into jgrpp
2017-09-23 11:40:07 +01:00
Jonathan G Rennison
40c99956ed
TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual
2017-09-23 11:39:59 +01:00
Jonathan G Rennison
ba33754993
Merge branch 'save_ext' into tracerestrict-sx
...
# Conflicts:
# src/vehiclelist.cpp
2017-08-15 19:28:30 +01:00
Jonathan G Rennison
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
2017-08-15 19:26:26 +01:00
Jonathan G Rennison
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
2017-08-15 19:17:12 +01:00
frosch
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
frosch
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
2017-08-13 18:38:42 +00:00
Jonathan G Rennison
b76d594654
Merge branch 'adjacent_crossings' into jgrpp
...
# Conflicts:
# src/road_func.h
2017-07-20 01:07:52 +01:00
Jonathan G Rennison
3e85e9fc53
Fix MaybeBarCrossingWithSound setting crossing reservation
...
Improve efficiency of adjacent crossings checks
2017-07-20 01:07:02 +01:00
Jonathan G Rennison
bbd2e6f2f5
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
2017-06-06 21:08:37 +01:00
Jonathan G Rennison
350c2bb24f
Make trains break down after collision with road vehicle.
2017-06-06 20:20:33 +01:00
Jonathan G Rennison
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
2017-06-06 18:41:01 +01: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
4979309094
TBTR: Fix build and refit of template trains.
2017-04-26 19:09:57 +01:00
Jonathan G Rennison
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
2017-04-05 19:00:24 +01:00
Jonathan G Rennison
4d21d6f81c
Merge branch 'chunnel' into jgrpp
2017-04-04 23:30:04 +01:00
Jonathan G Rennison
40eff50c98
Clear waiting due to tracerestrict flag when no longer required.
2017-04-04 00:39:46 +01:00
Jonathan G Rennison
85c7c4b307
Merge branch 'signal_tunnels_bridges' into jgrpp
2017-03-31 22:43:12 +01:00
Jonathan G Rennison
ab595bf67c
Fix bridge/tunnel exit PBS signals never being set to green.
2017-03-31 22:43:00 +01:00
Jonathan G Rennison
f4b5efd67d
Merge branch 'template_train_replacement' into jgrpp
2017-03-31 14:30:49 +01:00
Jonathan G Rennison
753fc2ab67
TBTR: Fix virtual rail engines not havign build year set.
2017-03-31 14:30:40 +01:00
Jonathan G Rennison
0772236986
Add a release slot at front of train slot action.
...
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
2017-03-31 01:10:26 +01:00