dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,558 Commits 1 Branch 0 Tags
29a1e49c2881d6979b0ee99923f92b584b5bed72
Commit Graph

1903 Commits

Author SHA1 Message Date
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00
Jonathan G Rennison
c882082467 Chunnel: Fix swap of vehicle chunnel flag when reversing consist. 2017-03-27 18:34:55 +01:00
Jonathan G Rennison
efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 2017-03-20 19:20:19 +00:00
Jonathan G Rennison
2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation" 
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
 2017-03-20 19:16:32 +00:00
Jonathan G Rennison
f9f2d37a8e Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/saveload/saveload.cpp
 2017-03-20 19:14:48 +00:00
Jonathan G Rennison
fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 2017-03-20 19:06:09 +00:00
Jonathan G Rennison
0c42b384bc Merge branch 'save_ext' into adjacent_crossings 
# Conflicts:
#	src/train_cmd.cpp
 2017-03-20 18:48:12 +00:00
peter1138
166e504c13 (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation 
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
 2017-03-20 17:49:44 +00:00
peter1138
5951d2406e (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation 
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
 2017-03-20 17:49:44 +00:00
peter1138
040df26e9e (svn r27809) -Codechange: Improve check in UpdateLevelCrossing 
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
 2017-03-20 08:04:47 +00:00
peter1138
67ab0450dd (svn r27809) -Codechange: Improve check in UpdateLevelCrossing 
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
 2017-03-20 08:04:47 +00:00
Jonathan G Rennison
ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 2017-03-05 18:05:04 +00:00
Jonathan G Rennison
f3bea35fcc Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp 2017-01-24 19:49:01 +00:00
Jonathan G Rennison
11e4bcee40 Slightly decrease proximity required for trains to crash. 
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
 2017-01-24 19:47:13 +00:00
Jonathan G Rennison
f5e4d8e73a Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
 2017-01-17 19:20:46 +00:00
Jonathan G Rennison
dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 2017-01-02 18:13:45 +00:00
Jonathan G Rennison
074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 2016-12-28 15:06:08 +00:00
Jonathan G Rennison
66751457ad Fix train crash on bridge/tunnel with signals leaving red signals. 
Update signals on far end of bridge/tunnel.
If clearing the crash results in a clear bridge/tunnel, set all
bridge/tunnel signals green.
 2016-12-18 18:09:48 +00:00
Jonathan G Rennison
7f10d83a4a Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/linkgraph/linkgraphjob.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-11-01 23:00:48 +00:00
Jonathan G Rennison
92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 2016-11-01 20:27:30 +00:00
Jonathan G Rennison
d204062300 Merge branch 'master' into template_train_replacement 2016-11-01 19:43:35 +00:00
frosch
a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
c175067ed9 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 2016-10-16 14:58:38 +00:00
frosch
f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 2016-10-16 14:57:56 +00:00
frosch
2a1e955fee (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 2016-10-16 14:56:33 +00:00
frosch
a6d1d128da (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 2016-10-16 14:56:33 +00:00
Jonathan G Rennison
f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	projects/openttd_vs100.vcxproj
#	projects/openttd_vs100.vcxproj.filters
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs80.vcproj
#	projects/openttd_vs90.vcproj
#	source.list
#	src/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 2016-09-18 20:07:48 +01:00
Jonathan G Rennison
556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
61500b596e Fix tunnel/bridge entrance signal not being refreshed. 
When a train left a tunnel or a bridge with no intermediary signals,
when setting the entrance signal to green, the display was not refreshed
with show track reservations was enabled.
 2016-09-18 20:06:59 +01:00
Jonathan G Rennison
0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 2016-09-18 20:06:39 +01:00
Jonathan G Rennison
888cd1be07 Merge branch 'cpp-11' into signal_tunnels_bridges 
# Conflicts:
#	src/saveload/saveload.cpp
 2016-09-11 13:16:54 +01:00
Jonathan G Rennison
9ea018abc5 Merge branch 'cargo_type_order' into jgrpp 
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
 2016-09-08 00:12:48 +01:00
Jonathan G Rennison
3507b51d9e Initial LinkRefresher support for cargo-specific links. 2016-09-05 00:12:48 +01:00
Jonathan G Rennison
23a1c07378 Merge branch 'master' into template_train_replacement 
Fix Template creation window vehicle drag cursor.
 2016-08-26 00:00:20 +01:00
Jonathan G Rennison
3ac94e97c8 Cache the result of GetImage() in Vehicle::UpdateViewport() where possible. 
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
 2016-07-08 19:07:25 +01:00
Jonathan G Rennison
cf26d48c9b Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine. 2016-06-18 13:22:59 +01:00
Jonathan G Rennison
e95a24a4e9 Merge branch 'template_train_replacement-sx' into jgrpp 2016-06-10 00:06:16 +01:00
Jonathan G Rennison
b7aac40da8 Fix deleting an in-use template vehicle, only updating the first group. 2016-06-10 00:05:24 +01:00
Jonathan G Rennison
09291a3b74 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/train_cmd.cpp
#	src/vehicle_base.h
 2016-05-23 18:41:00 +01:00
frosch
c9f68ede59 (svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts. 2016-05-22 11:45:03 +00:00
frosch
d188d02384 (svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts. 2016-05-22 11:45:03 +00:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
Jonathan G Rennison
efcdd6c36f Remove global automated timetable setting. 2016-05-06 23:33:12 +01:00
Jonathan G Rennison
cf59b4fcab Merge branch 'signal_tunnels_bridges-sx' into jgrpp 2016-04-28 22:24:36 +01:00
Jonathan G Rennison
17f74e4c51 Fix signalled bridge/tunnel not always being redrawn on (un)reservation. 2016-04-28 22:19:35 +01:00
Jonathan G Rennison
5d42d07988 Merge branch 'tracerestrict-sx' into jgrpp 2016-03-01 20:55:19 +00:00
Jonathan G Rennison
df2a1b1bcd Merge branch 'tracerestrict' into tracerestrict-sx 2016-03-01 20:54:28 +00:00