Commit Graph

24178 Commits (11a10299d19d5126c158cc4c0f5141542117c6f1)
 

Author SHA1 Message Date
Jonathan G Rennison c4e06808a2 Merge branch 'master' into save_ext 8 years ago
Jonathan G Rennison 6f07639c34 Merge branch 'master' into zoning
# Conflicts:
#	src/station_cmd.cpp
8 years ago
peter1138 5baf52b938 (svn r27814) -Change: Remove _roadveh_depot_exit_trackdir
_roadveh_depot_exit_trackdir was just a copy of
DiagDirToDiagTrackdir. (cirdan)
8 years ago
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)
8 years ago
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)
8 years ago
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)
8 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)
8 years ago
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)
8 years ago
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)
8 years ago
peter1138 80303515c1 (svn r27807) -Codechange: Remove _ship_leave_depot_offs
There is already TileOffsByDiagDir for that. (cirdan)
8 years ago
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)
8 years ago
peter1138 f0062f94d6 (svn r27805) -Codechange: Remove function ShipGetNewDirectionFromTiles
The only user of ShipGetNewDirectionFromTiles can be better
served by DiagdirBetweenTiles, so remove the former. (cirdan)
8 years ago
translators bf30576255 (svn r27804) -Update from Eints:
italian: 7 changes by lorenzodv
luxembourgish: 11 changes by Phreeze
french: 7 changes by glx
8 years ago
Jonathan G Rennison 33cd1569f4 Merge branch 'chunnel' into jgrpp 8 years ago
Jonathan G Rennison 4af4cbc2a4 Chunnel: Update project files 8 years ago
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
8 years ago
Jonathan G Rennison fae4ac1a5d Merge branch 'master' into save_ext
# Conflicts:
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
8 years ago
alberth 17b46109ad (svn r27803) -Change: Remove obsolete aircraft preview strings from other languages 8 years ago
alberth 1f70279419 (svn r27802) -Add: Display aircraft type in engine preview window (patch by Samu) 8 years ago
alberth 119965125d (svn r27801) -Change: Also rename long aircraft preview window strings of other languages 8 years ago
alberth b110c9c259 (svn r27800) -Change: Rename long aircraft string names of the preview window 8 years ago
alberth fa5fd39c23 (svn r27799) -Add: Display aircraft type in buy window (patch by Samu) 8 years ago
alberth 7c3004c785 (svn r27798) -Change: Also remove obsolete string from the other languages 8 years ago
alberth e2e9bd0b25 (svn r27797) -Add: Display aircraft type in its vehicle window (patch by Samu) 8 years ago
frosch 206a0838e9 (svn r27796) -Fix [FS#6545]: 32bpp-anim blitters assumed that pitch and width of the screen were equal. 8 years ago
translators 5c7f97aff2 (svn r27795) -Update from Eints:
luxembourgish: 3 changes by Phreeze
8 years ago
peter1138 36837a070c (svn r27794) -Fix [FS#6526]: Chat text background overflowed due to missing padding. 8 years ago
peter1138 57745b1c74 (svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status. 8 years ago
michi_cc c706eeda81 (svn r27792) -Add: [Win32] .gitignore for IntelliSense database of VS2015 Update 2. 8 years ago
michi_cc 9a62317dfc (svn r27791) -Fix (r27790) [FS#6366]: Try #2. Now also for Visual Studio 2010. 8 years ago
michi_cc 2d45d55925 (svn r27790) -Fix [FS#6366]: [Win32] Mark OpenTTD as DPI-aware to avoid OS window scaling that breaks mouse input. 8 years ago
translators 9169ab6ce2 (svn r27789) -Update from Eints:
polish: 3 changes by wojteks86
greek: 1 change by kyrm
8 years ago
peter1138 a77044f185 (svn r27788) -Fix [FS#6536]: Get vehicle load amount after executing new cargo trigger. 8 years ago
Jonathan G Rennison ac69b746ab Merge branch 'master' into jgrpp
# Conflicts:
#	src/gfxinit.cpp
#	src/saveload/saveload.cpp
8 years ago
Jonathan G Rennison c1a26459d8 Merge branch 'chunnel' into jgrpp
# Conflicts:
#	src/ground_vehicle.hpp
8 years ago
HackaLittleBit de24fed9d1 Chunnel: Tunnels are only allowed to cross sea. 8 years ago
peter1138 980871a87b (svn r27787) -Fix: Update scrollbar when rebuilding AI/GS setting list. 8 years ago
peter1138 9a489375e3 (svn r27786) -Fix [FS#6479]: AI configuration changed incorrect parameter when some parameters are hidden. 8 years ago
peter1138 c366425de6 (svn r27785) -Fix [FS#6508]: Buoys not always drawn after being placed depending on zoom level (Samu). 8 years ago
peter1138 7501b7cf7a (svn r27784) -Fix [FS#6505]: Allow rail conversion even if ship is on tile (Samu). 8 years ago
frosch ed63b48e76 (svn r27780) -Update: Numbers 8 years ago
frosch d3de080883 (svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames. 8 years ago
frosch bc61ff380a (svn r27777) -Doc: Yearly increment 8 years ago
frosch ffcdd47321 (svn r27776) -Merge: Documentation updates from 1.6 branch 8 years ago
frosch 51c6ae62d1 (svn r27775) -Fix [FS#6510]: Insufficient thread synchronisation when switching blitters. (JGR) 8 years ago
frosch 5b7a04ca27 (svn r27774) -Fix [FS#5889]: Enabling palette animation for 32bpp blitters while paused skipped initialisation of the palette and resulted in black windows.
-Revert (r23978): No SDL-specific fix required anymore. The new fix applies to all backends.
8 years ago
frosch f2af019eb7 (svn r27773) -Update: Baseset translations 8 years ago
Jonathan G Rennison d14d5731d8 Fix wrong palette being used when switching to animated blitter.
Fixes black sprites and UI elements when switching on full
animations on win32 and OSX.
8 years ago
frosch 5e28cc4757 (svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options. 8 years ago
Jonathan G Rennison 2d473c05b0 Fix use-after-free when switching blitters in SDL and Win32 modes.
This mostly occurs when disabling pallete animation when fast-forward
is enabled.
8 years ago