Commit Graph

727 Commits (424e4691ce2122ccfe42d19aad4edb6b71b5c689)

Author SHA1 Message Date
Jonathan G Rennison fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 7 years ago
Jonathan G Rennison 6f07639c34 Merge branch 'master' into zoning
# Conflicts:
#	src/station_cmd.cpp
7 years ago
peter1138 4107f78eae (svn r27810) -Change: Factor out reservation-handling code in station_cmd.cpp
Code dealing with freeing and restoring track reservations is
duplicated in CmdBuildRailStation and RemoveFromRailBaseStation;
make separate functions for it. (cirdan)
7 years ago
Jonathan G Rennison 478ff2538e Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/korean.txt
8 years ago
frosch 4753097c3d (svn r27686) -Change: List railtype of rail tiles explicitly in the tile info window. 8 years ago
Jonathan G Rennison 8630512810 Merge branch 'master' into jgrpp 8 years ago
fonsinchen cdbb864725 (svn r27682) -Fix: Don't check if links are alive for manually routed cargo 8 years ago
fonsinchen aa26edfa48 (svn r27681) -Fix: When deleting stale links, iterate through order lists before iterating through vehicles 8 years ago
Jonathan G Rennison 37a58fd11d Add setting to increase station catchment radius.
Update acceptance and refresh screen when catchment settings change.
8 years ago
Jonathan G Rennison 10ae23d3b9 Merge branch 'departure-boards' into jgrpp
VehicleListIdentifier API changes.

# Conflicts:
#	src/departures.cpp
#	src/vehicle_gui.cpp
8 years ago
frosch 616c02c42e (svn r27676) -Codechange: Rename catenary functions, so that they refer unambiguously to either RoadCatenary or RailCatenary. 8 years ago
Jonathan G Rennison e844b82d9e Use vector instead of list for Station::loading_vehicles. 8 years ago
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
8 years ago
Jonathan G Rennison 3507b51d9e Initial LinkRefresher support for cargo-specific links. 8 years ago
keldorkatarn 5cc56d6ad9 Make 32 instead of 16 rail types possible. by using one free bit of m1 in the map array.
(cherry picked from commit b44843800880cdc186f5183301ee0f42afbb5f84)

Also set non-rail type M3 bits to 0 where applicable.
Change savegame versioning to SLXI format.
8 years ago
Jonathan G Rennison 196b78af30 Merge branch 'zoning' into jgrpp 9 years ago
Jonathan G Rennison c120b810d1 Mark dirty the catchment of a station on change as necessary for zoning.
If the zoning mode is station catchment, or unserved industry/building,
mark dirty the station catchment rectangle before removing, or after
adding, (a) station tile(s).
In the case of unserved industry mode, increase the refreshed catchment
radius by 10 tiles, to wholly include industries partially inside
the catchment area.
9 years ago
Jonathan G Rennison 2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 7bcd090a0f Add reverse at waypoint orders.
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
9 years ago
Jonathan G Rennison 58dbc8fbd6 Scale link graph timeout and compression intervals by day length. 9 years ago
patch-import c72b29cfd0 Import upgrade airport patch
http://www.tt-forums.net/viewtopic.php?f=33&t=35867
9 years ago
frosch c0015d6a7c (svn r27311) -Fix: Mark infrastructure window dirty in more cases. (marcole) 9 years ago
frosch 07b83b8869 (svn r27308) -Fix [FS#6283]: Prevent breaking of tram-reversal points by adding more road pieces. (adf88) 9 years ago
frosch be30f224c7 (svn r27256) -Change [FS#6165]: Do not consider cargo that is already being loaded as waiting cargo wrt. the station rating. 9 years ago
frosch e9c3ca62cd (svn r27251) -Feature [FS#6252]: Make Ctrl+Remove-Roadstop also remove the road, just like for rail stations. (adf88) 9 years ago
frosch 269d702cc8 (svn r27246) -Codechange: Deduplicate code between removing part of a rail station and removing the whole rail station. (adf88) 9 years ago
frosch 7fdc4da4b9 (svn r27245) -Fix [FS#6251]: Removing a rail waypoint used the remove-rail-station cost. (adf88) 9 years ago
planetmaker fcaff34724 (svn r27225) -Change [FS#6262]: Be more lenient about road stop removal when at least one stop could be removed (afd88) 9 years ago
frosch a14b836bf2 (svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects. 9 years ago
fonsinchen 78df68e695 (svn r26891) -Codechange: Add methods to retrieve flows from a FlowStatMap 10 years ago
rubidium dc2b4f2498 (svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible 10 years ago
fonsinchen ef2caa02b2 (svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size. 10 years ago
rubidium 1b11ea80ee (svn r26582) -Feature-ish: quickly decay cargo after about 21 months of not having picked any of the cargo, and prevent houses and industries providing more cargo 10 years ago
rubidium fb9dbf30fa (svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore) 10 years ago
fonsinchen b8381b6b25 (svn r26549) -Change: better estimation for link capacities during full load 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
planetmaker c10662e4cc (svn r26458) -Doc: Correct a few spelling mistakes (__ln__) 10 years ago
fonsinchen 8395c08738 (svn r26448) -Fix [FS#5970]: Avoid division by 0 when scaling flow values. 10 years ago
fonsinchen 3570104d24 (svn r26393) -Fix: Update distances between link graph nodes when station sign is moved 10 years ago
frosch 504bd2a913 (svn r26375) -Fix [FS#5929]: Station sizes > 8 were always allowed. (adf88) 10 years ago
rubidium 5f323f9967 (svn r26363) -Codechange [FS#5894]: make it clearer that drive through road stops need an Axis in CmdBuildRoadStop and the non drive through stops need a DiagDir 10 years ago
frosch 22e86e3d1a (svn r26275) -Fix: If NewGRF provided the same station name for different industry types, stations would end up with same name. So also consider the provided name, not only the industry type. 11 years ago
fonsinchen fea3a433b2 (svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors. 11 years ago
fonsinchen bcc91be5b1 (svn r26013) -Revert (r25495) [FS#5684]: Having trains miss a platform that is just being modified is less of a problem than having trains stop twice without moving. 11 years ago
fonsinchen 05b50ada5c (svn r25963) -Fix [FS#5758]: Mixtures of old and new flows could create cycles. 11 years ago
fonsinchen b83b4ab4c2 (svn r25948) -Fix [FS#5796]: Make sure LinkRefresher doesn't delete the LinkGraph DeleteStaleLinks() is examining. 11 years ago
fonsinchen 25e40b1e5b (svn r25915) -Fix: Unrestricted flow was counted incorrectly when invalidating flow. 11 years ago
fonsinchen 49d2cd4049 (svn r25910) -Fix: Guard against empty FlowStats in a few more places. 11 years ago
fonsinchen fb281ce23c (svn r25903) -Codechange: Refactor RefreshNextHopsStats into an own class LinkRefresher. 11 years ago