dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,784 Commits 1 Branch 0 Tags
efdbde63c88c78bcf2c09a1a3e37d84ef2f2d3a9
Commit Graph

46784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
translators
2385f4adbc (svn r27824) -Update from Eints: 
catalan: 7 changes by juanjo
croatian: 4 changes by VoyagerOne
korean: 15 changes by telk5093
scottish gaelic: 54 changes by GunChleoc
 2017-03-24 18:45:45 +00:00
peter1138
4255e2e136 (svn r27823) -Fix: Vehicle viewport is not user scrollable so flag window as such. 2017-03-24 12:00:52 +00:00
peter1138
65fef84855 (svn r27823) -Fix: Vehicle viewport is not user scrollable so flag window as such. 2017-03-24 12:00:52 +00:00
peter1138
0887289e3d (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
peter1138
19d56a33e8 (svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR) 2017-03-24 07:33:31 +00:00
peter1138
2c0ef5c659 (svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo) 2017-03-23 22:00:00 +00:00
peter1138
bcc5c9f81d (svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo) 2017-03-23 22:00:00 +00:00
Jonathan G Rennison
0d4bf16f57 Merge branch 'custom_bridgeheads' into jgrpp 2017-03-23 20:15:45 +00:00
Jonathan G Rennison
57a5f08687 Fix handling of custom bridge heads on steep slopes. 2017-03-23 20:15:37 +00:00
peter1138
6da57ed3e8 (svn r27820) -Fix: Allow dropdown to be drawn above origin widget even with scrollbar (Juanjo) 2017-03-23 20:07:59 +00:00
peter1138
902663176d (svn r27820) -Fix: Allow dropdown to be drawn above origin widget even with scrollbar (Juanjo) 2017-03-23 20:07:59 +00:00
peter1138
abcab89af3 (svn r27819) -Fix (r26990): Update viewport sign dimensions when changing GUI zoom level. 2017-03-23 18:07:04 +00:00
peter1138
c5660b58d9 (svn r27819) -Fix (r26990): Update viewport sign dimensions when changing GUI zoom level. 2017-03-23 18:07:04 +00:00
translators
b54d144b28 (svn r27818) -Update from Eints: 
greek: 36 changes by kyrm
 2017-03-22 18:45:40 +00:00
translators
0d8ae4d6f4 (svn r27818) -Update from Eints: 
greek: 36 changes by kyrm
 2017-03-22 18:45:40 +00:00
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