dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,019 Commits 1 Branch 0 Tags
6bcc705c7c7337859fc39b694b7fb19772e91afc
Commit Graph

47019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
ccf94e8108 (svn r27817) -Update from Eints: 
greek: 39 changes by kyrm
croatian: 7 changes by VoyagerOne
 2017-03-21 18:45:37 +00:00
translators
1fa25f128f (svn r27817) -Update from Eints: 
greek: 39 changes by kyrm
croatian: 7 changes by VoyagerOne
 2017-03-21 18:45:37 +00:00
peter1138
48b9cbbb76 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 2017-03-20 19:30:49 +00:00
peter1138
73ea8cdb21 (svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path. 2017-03-20 19:30:49 +00:00
Jonathan G Rennison
efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 2017-03-20 19:20:19 +00:00
Jonathan G Rennison
88a524717b Merge branch 'tracerestrict' into tracerestrict-sx 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-20 19:19:18 +00:00
Jonathan G Rennison
58d8a791e4 Merge branch 'save_ext' into tracerestrict-sx 2017-03-20 19:18:34 +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
translators
712dbeda33 (svn r27815) -Update from Eints: 
russian: 7 changes by Lone_Wolf
 2017-03-20 18:45:36 +00:00
translators
e8ea4748ed (svn r27815) -Update from Eints: 
russian: 7 changes by Lone_Wolf
 2017-03-20 18:45:36 +00:00
Jonathan G Rennison
c4e06808a2 Merge branch 'master' into save_ext 2017-03-20 18:41:22 +00:00
Jonathan G Rennison
6f07639c34 Merge branch 'master' into zoning 
# Conflicts:
#	src/station_cmd.cpp
 2017-03-20 18:38:10 +00:00
peter1138
5baf52b938 (svn r27814) -Change: Remove _roadveh_depot_exit_trackdir 
_roadveh_depot_exit_trackdir was just a copy of
DiagDirToDiagTrackdir. (cirdan)
 2017-03-20 18:16:23 +00:00
peter1138
c3ae3989c2 (svn r27814) -Change: Remove _roadveh_depot_exit_trackdir 
_roadveh_depot_exit_trackdir was just a copy of
DiagDirToDiagTrackdir. (cirdan)
 2017-03-20 18:16:23 +00:00
peter1138
c03ccdb36b (svn r27813) -Change: Remove _road_enter_dir_to_reachable_trackdirs 
_road_enter_dir_to_reachable_trackdirs was just a copy of
DiagdirReachesTrackdirs. (cirdan)
 2017-03-20 18:14:22 +00:00
peter1138
2e27a35f1b (svn r27813) -Change: Remove _road_enter_dir_to_reachable_trackdirs 
_road_enter_dir_to_reachable_trackdirs was just a copy of
DiagdirReachesTrackdirs. (cirdan)
 2017-03-20 18:14:22 +00:00
peter1138
380e1a240f (svn r27812) -Fix: Road tunnel/bridge heads have no trackbits wrt catenary drawing 
Road tunnels and bridges do not have any rail, so do not treat them
as if they had when drawing a catenary. (cirdan)
 2017-03-20 17:57:24 +00:00
peter1138
6d0f8ec7b9 (svn r27812) -Fix: Road tunnel/bridge heads have no trackbits wrt catenary drawing 
Road tunnels and bridges do not have any rail, so do not treat them
as if they had when drawing a catenary. (cirdan)
 2017-03-20 17:57:24 +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
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)
 2017-03-20 17:44:37 +00:00
peter1138
890a44f130 (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)
 2017-03-20 17:44:37 +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
peter1138
e3a1ae2be5 (svn r27808) -Codechange: Adjust the size of _track_crosses_trackdirs 
_track_crosses_trackdirs is indexed by a Track, not a
Trackdir, so adjust its size accordingly. (cirdan)
 2017-03-19 22:30:47 +00:00
peter1138
f3cbe98156 (svn r27808) -Codechange: Adjust the size of _track_crosses_trackdirs 
_track_crosses_trackdirs is indexed by a Track, not a
Trackdir, so adjust its size accordingly. (cirdan)
 2017-03-19 22:30:47 +00:00
peter1138
80303515c1 (svn r27807) -Codechange: Remove _ship_leave_depot_offs 
There is already TileOffsByDiagDir for that. (cirdan)
 2017-03-19 22:02:20 +00:00
peter1138
3c7dc746d5 (svn r27807) -Codechange: Remove _ship_leave_depot_offs 
There is already TileOffsByDiagDir for that. (cirdan)
 2017-03-19 22:02:20 +00:00
peter1138
54ec06258a (svn r27806) -Codechange: Remove function ShipGetNewDirection 
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.

Also remove now unused _new_vehicle_direction_table. (cirdan)
 2017-03-19 21:59:24 +00:00
peter1138
2a555480bd (svn r27806) -Codechange: Remove function ShipGetNewDirection 
ShipGetNewDirection has no side effects and its return value
is ignored by its only caller, so do away with it.

Also remove now unused _new_vehicle_direction_table. (cirdan)
 2017-03-19 21:59:24 +00:00
peter1138
f0062f94d6 (svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles 
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
 2017-03-19 21:57:54 +00:00
peter1138
4f9fd074b8 (svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles 
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
 2017-03-19 21:57:54 +00:00
translators
bf30576255 (svn r27804) -Update from Eints: 
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
 2017-03-19 18:45:38 +00:00
translators
8c49f7b98a (svn r27804) -Update from Eints: 
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
 2017-03-19 18:45:38 +00:00
Jonathan G Rennison
33cd1569f4 Merge branch 'chunnel' into jgrpp 2017-03-19 12:30:26 +00:00
Jonathan G Rennison
4af4cbc2a4 Chunnel: Update project files 2017-03-19 12:30:14 +00:00
Jonathan G Rennison
b3fd11efd2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse4.cpp
 2017-03-19 12:27:24 +00:00
Jonathan G Rennison
fae4ac1a5d Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
 2017-03-19 12:12:52 +00:00
alberth
17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
49c0facf2e (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 2017-03-18 20:49:24 +00:00
alberth
1f70279419 (svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu) 2017-03-18 20:48:54 +00:00
alberth
da608f6214 (svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu) 2017-03-18 20:48:54 +00:00
alberth
119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
2f1d808781 (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 2017-03-18 20:48:27 +00:00
alberth
b110c9c259 (svn r27800) -Change: Rename long aircraft string names of the preview window 2017-03-18 20:47:48 +00:00
alberth
dda71fab19 (svn r27800) -Change: Rename long aircraft string names of the preview window 2017-03-18 20:47:48 +00:00
alberth
fa5fd39c23 (svn r27799) -Add: Display aircraft type in buy window (patch by Samu) 2017-03-18 20:46:15 +00:00