dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,741 Commits 1 Branch 0 Tags
258e591f7139eebb5d35b215d7554fdd87eb821b
Commit Graph

22741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
86d1a00ba6 Merge branch 'master' into save_ext 2017-04-01 01:10:21 +01:00
peter1138
f17d38598a (svn r27838) -Fix: Small news window's fake caption (r19943) was not sized to fit its text. 2017-03-31 23:09:50 +00:00
peter1138
60d4d1db3f (svn r27837) -Fix (r26969): Black remap did nothing in 8bpp-simple blitter. 2017-03-30 21:33:40 +00:00
translators
a39bdc14a0 (svn r27836) -Update from Eints: 
catalan: 2 changes by juanjo
 2017-03-30 17:45:36 +00:00
Jonathan G Rennison
48bbe0325d Merge branch 'cpp-11' into save_ext 2017-03-29 19:49:29 +01:00
Jonathan G Rennison
4e9d4dd80a Add a PreCleanPool() static method to pool item types. 
(cherry picked from commit 87142ed840)
 2017-03-29 19:47:25 +01:00
Jonathan G Rennison
a3034891a1 Add missing include guard for dyn arena alloc header. 2017-03-29 19:46:30 +01:00
Jonathan G Rennison
dd0666c5f4 Add support for save/loading std::strings. 2017-03-29 19:41:06 +01:00
Jonathan G Rennison
2fb822d392 Fix includes and header guards of container functions. 2017-03-29 19:39:55 +01:00
translators
4d3d43a70e (svn r27835) -Update from Eints: 
norwegian (bokmal): 37 changes by eirik174
 2017-03-29 17:45:37 +00:00
peter1138
5bcc54e021 (svn r27834) -Change: Parse extmidi command string for parameters to pass on. 2017-03-29 17:36:46 +00:00
peter1138
4f3c7e74e7 (svn r27833) -Change: Trackdir maps directly to TrackdirBits 2017-03-28 21:44:40 +00:00
Jonathan G Rennison
f58fe00294 Merge branch 'master' into save_ext 2017-03-28 02:26:13 +01:00
peter1138
065a0547e2 (svn r27832) -Fix: Missing or incorrect colour codes in translations 2017-03-27 22:00:45 +00:00
peter1138
348607aa89 (svn r27831) -Fix (r24577): Misaligned resize icon (due to widget bounds being inclusive) 2017-03-26 19:07:08 +00:00
translators
485c64fcbe (svn r27830) -Update from Eints: 
catalan: 6 changes by juanjo
italian: 1 change by lorenzodv
russian: 6 changes by Lone_Wolf
 2017-03-26 17:45:37 +00:00
peter1138
01c8ba0d5d (svn r27829) -Fix (r27821): Occasional crash caused by mixing int/uint arithmetic. 2017-03-25 23:19:41 +00:00
translators
7659ec05af (svn r27828) -Update from Eints: 
croatian: 2 changes by VoyagerOne
italian: 6 changes by lorenzodv
english (us): 15 changes by Supercheese
latin: 15 changes by Supercheese
 2017-03-25 18:45:40 +00:00
frosch
98673c94b8 (svn r27827) -Codechange (r27819): Deduplicate code. (adf88) 2017-03-25 12:21:17 +00:00
peter1138
95cab27381 (svn r27826) -Fix (r27825): Wrong code style 2017-03-24 19:25:01 +00:00
peter1138
0e68f9db70 (svn r27825) -Feature [FS#4950]: Add option to close windows with right click (Flamefire) 2017-03-24 18:55:16 +00:00
translators
6ceb8a0d28 (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
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
2c0ef5c659 (svn r27821) -Change: Draw images in centre of buttons (inspired by Juanjo) 2017-03-23 22:00:00 +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
abcab89af3 (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
ccf94e8108 (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
translators
712dbeda33 (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
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
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
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
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
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
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
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
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
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
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
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
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
1f70279419 (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
b110c9c259 (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
alberth
7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 2017-03-18 20:45:18 +00:00