Commit Graph

22181 Commits (e24839ed6525c0a08cd2913d15d11ddc46779985)
 

Author SHA1 Message Date
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
translators 163c30570b (svn r27358) -Update from WebTranslator v3.0:
catalan - 25 changes by juanjo
9 years ago
translators e6782df9ba (svn r27357) -Update from WebTranslator v3.0:
catalan - 181 changes by juanjo
9 years ago
frosch 4eb6ce863a (svn r27354) -Fix (r27343): Actually make it work. (rubidium) 9 years ago
translators 66418db43e (svn r27352) -Update from WebTranslator v3.0:
catalan - 134 changes by juanjo
9 years ago
translators 18e7b67864 (svn r27347) -Update from WebTranslator v3.0:
slovenian - 15 changes by matej1245
9 years ago
alberth 67366cf03d (svn r27346) -Feature: Make the object placement gui an independent window. 9 years ago
alberth e36a82c3e6 (svn r27345) -Fix-ish: Hide selected view if no object selected. 9 years ago
alberth b1f1647303 (svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions. 9 years ago
frosch 13a726b18f (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 9 years ago
frosch 730c2177bf (svn r27342) -Add: Optionally return the number of sprites in the spriteset from GetCustomRailSprite. 9 years ago
frosch bd50600f5b (svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding. 9 years ago
frosch 67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 9 years ago
translators 932aaa8cb5 (svn r27339) -Update from WebTranslator v3.0:
frisian - 42 changes by BAJansen
9 years ago
translators 55c177c26d (svn r27338) -Update from WebTranslator v3.0:
frisian - 8 changes by BAJansen
9 years ago
translators f6a3faf927 (svn r27337) -Update from WebTranslator v3.0:
simplified_chinese - 1 changes by Gavin
9 years ago
translators 28f9637aed (svn r27336) -Update from WebTranslator v3.0:
greek - 36 changes by Jubilee
9 years ago
translators 28e885dd51 (svn r27335) -Update from WebTranslator v3.0:
greek - 24 changes by Jubilee
9 years ago
frosch 80df194341 (svn r27334) -Revert (r27232) [FS#6342]: No idea what the plan was, but making the main noise coefficients the same for all smoothness types certainly wasn't. 9 years ago
translators 99ed8df797 (svn r27333) -Update from WebTranslator v3.0:
greek - 7 changes by Jubilee
9 years ago
frosch 86825a745c (svn r27332) -Change: Enable YAPF cache debugging with desync debug level 2. 9 years ago
frosch 2af1fa921a (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 9 years ago
frosch f16fc69e95 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 9 years ago
frosch 04e9978f1f (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 9 years ago
frosch fc902d354f (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 9 years ago
translators d25934580f (svn r27327) -Update from WebTranslator v3.0:
korean - 1 changes by telk5093
9 years ago
translators 81ec32199f (svn r27326) -Update from WebTranslator v3.0:
simplified_chinese - 6 changes by Gavin
9 years ago
translators b50eddaea2 (svn r27325) -Update from WebTranslator v3.0:
catalan - 4 changes by juanjo
9 years ago
frosch d1c2eae95d (svn r27324) -Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines. (noticed by adf88) 9 years ago
frosch e55f1adfa8 (svn r27323) -Fix: Spelling. 9 years ago
frosch 70e2c23772 (svn r27322) -Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width'. (adf88) 9 years ago
translators 1d9c78ef6b (svn r27321) -Update from WebTranslator v3.0:
korean - 2 changes by telk5093
9 years ago
frosch c5a4b89915 (svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying. 9 years ago
translators d3bfb5422f (svn r27319) -Update from WebTranslator v3.0:
frisian - 1 changes by BAJansen
9 years ago
translators d9f8045255 (svn r27318) -Update from WebTranslator v3.0:
frisian - 9 changes by BAJansen
9 years ago
translators d64d56b5a8 (svn r27317) -Update from WebTranslator v3.0:
frisian - 458 changes by BAJansen
9 years ago
frosch 42630dfa01 (svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel 9 years ago
frosch a1ca479a65 (svn r27315) -Fix: Norwegian bokmal 9 years ago
translators 8f84989389 (svn r27314) -Update from WebTranslator v3.0:
norwegian_bokmal - 4 changes by eirik174
9 years ago
frosch 90d50d78c0 (svn r27313) -Fix [FS#6317]: Adding tram to town-owned bridges assigned an incorrect owner to the tram and did not count infrastructure counts properly. (marcole) 9 years ago
frosch d4db9cb109 (svn r27312) -Fix-ish [FS#6317]: Preserve town ownership of bridges when removing road from a road+tram bridge. (marcole) 9 years ago
frosch c0015d6a7c (svn r27311) -Fix: Mark infrastructure window dirty in more cases. (marcole) 9 years ago
translators a2f13f0fe2 (svn r27310) -Update from WebTranslator v3.0:
norwegian_bokmal - 79 changes by eirik174
9 years ago
frosch 0efffb6df4 (svn r27309) -Change [FS#6283]: Auto-complete partial roads when building level-crossings. (adf88) 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 81bdf8928e (svn r27307) -Fix [FS#6259]: Error message window with manager face failed with GUI zoom. (Johnnei) 9 years ago
frosch b1763f1e77 (svn r27306) -Fix (r27305): Confused tiles. 9 years ago
frosch 19d1cda92e (svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad. 9 years ago
frosch 4117c5b747 (svn r27304) -Fix [FS#6321-ish]: Improve password window layout for big font sizes. 9 years ago