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

22181 Commits

This Branch
This Branch
All Branches
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
 2015-08-05 21:25:13 +01:00
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
 2015-08-05 21:24:30 +01:00
translators
163c30570b (svn r27358) -Update from WebTranslator v3.0: 
catalan - 25 changes by juanjo
 2015-08-02 17:45:14 +00:00
translators
e6782df9ba (svn r27357) -Update from WebTranslator v3.0: 
catalan - 181 changes by juanjo
 2015-08-01 17:45:15 +00:00
frosch
4eb6ce863a (svn r27354) -Fix (r27343): Actually make it work. (rubidium) 2015-07-31 21:43:40 +00:00
translators
66418db43e (svn r27352) -Update from WebTranslator v3.0: 
catalan - 134 changes by juanjo
 2015-07-31 17:45:18 +00:00
translators
18e7b67864 (svn r27347) -Update from WebTranslator v3.0: 
slovenian - 15 changes by matej1245
 2015-07-30 17:45:14 +00:00
alberth
67366cf03d (svn r27346) -Feature: Make the object placement gui an independent window. 2015-07-28 18:20:54 +00:00
alberth
e36a82c3e6 (svn r27345) -Fix-ish: Hide selected view if no object selected. 2015-07-28 18:18:59 +00:00
alberth
b1f1647303 (svn r27344) -Doc: Documenting the (Re)setObjectToPlace functions. 2015-07-28 08:16:52 +00:00
frosch
13a726b18f (svn r27343) -Feature [FS#6315]: [NewGRF] Allow railtype NewGRF to define separate sprites for the fences on either track side. 2015-07-26 12:28:34 +00:00
frosch
730c2177bf (svn r27342) -Add: Optionally return the number of sprites in the spriteset from GetCustomRailSprite. 2015-07-26 12:25:37 +00:00
frosch
bd50600f5b (svn r27341) -Fix [FS#6332]: Do not rerandomise the town name when only cost-estimating the founding. 2015-07-26 09:56:43 +00:00
frosch
67ae231f1b (svn r27340) -Fix [FS#6338]: Silence warning by moving _string_colourmap to a file no its own. (Cif) 2015-07-26 09:47:17 +00:00
translators
932aaa8cb5 (svn r27339) -Update from WebTranslator v3.0: 
frisian - 42 changes by BAJansen
 2015-07-25 17:45:15 +00:00
translators
55c177c26d (svn r27338) -Update from WebTranslator v3.0: 
frisian - 8 changes by BAJansen
 2015-07-24 17:45:18 +00:00
translators
f6a3faf927 (svn r27337) -Update from WebTranslator v3.0: 
simplified_chinese - 1 changes by Gavin
 2015-07-21 17:45:18 +00:00
translators
28f9637aed (svn r27336) -Update from WebTranslator v3.0: 
greek - 36 changes by Jubilee
 2015-07-17 17:45:14 +00:00
translators
28e885dd51 (svn r27335) -Update from WebTranslator v3.0: 
greek - 24 changes by Jubilee
 2015-07-16 17:45:15 +00:00
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. 2015-07-16 17:05:40 +00:00
translators
99ed8df797 (svn r27333) -Update from WebTranslator v3.0: 
greek - 7 changes by Jubilee
 2015-07-13 17:45:17 +00:00
frosch
86825a745c (svn r27332) -Change: Enable YAPF cache debugging with desync debug level 2. 2015-07-12 17:06:02 +00:00
frosch
2af1fa921a (svn r27331) -Cleanup (r26999): Make variety distribution curves more sane. 2015-07-11 11:18:24 +00:00
frosch
f16fc69e95 (svn r27330) -Fix [FS#6335]: Make variety distribution not assume that sea level is at height 0.2 / 3 * TGPGetMaxHeight(). 2015-07-11 10:46:25 +00:00
frosch
04e9978f1f (svn r27329) -Fix: Add more height_t type-correctness to TGP code. 2015-07-11 10:43:34 +00:00
frosch
fc902d354f (svn r27328) -Codechange: Add an assertion to check for uninitialised variables when tracing variety distribution's control curves. 2015-07-11 10:41:20 +00:00
translators
d25934580f (svn r27327) -Update from WebTranslator v3.0: 
korean - 1 changes by telk5093
 2015-07-09 17:45:08 +00:00
translators
81ec32199f (svn r27326) -Update from WebTranslator v3.0: 
simplified_chinese - 6 changes by Gavin
 2015-07-08 17:45:12 +00:00
translators
b50eddaea2 (svn r27325) -Update from WebTranslator v3.0: 
catalan - 4 changes by juanjo
 2015-06-30 17:45:15 +00:00
frosch
d1c2eae95d (svn r27324) -Fix: Remove corner-case optimisation for line drawing, which failed for dashed lines. (noticed by adf88) 2015-06-28 16:54:25 +00:00
frosch
e55f1adfa8 (svn r27323) -Fix: Spelling. 2015-06-28 15:54:12 +00:00
frosch
70e2c23772 (svn r27322) -Fix: Clipping of inclined lines did not account for the 'horizontal width' being bigger than the 'real width'. (adf88) 2015-06-28 15:50:13 +00:00
translators
1d9c78ef6b (svn r27321) -Update from WebTranslator v3.0: 
korean - 2 changes by telk5093
 2015-06-27 17:45:18 +00:00
frosch
c5a4b89915 (svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying. 2015-06-27 11:46:41 +00:00
translators
d3bfb5422f (svn r27319) -Update from WebTranslator v3.0: 
frisian - 1 changes by BAJansen
 2015-06-26 17:45:13 +00:00
translators
d9f8045255 (svn r27318) -Update from WebTranslator v3.0: 
frisian - 9 changes by BAJansen
 2015-06-25 17:45:13 +00:00
translators
d64d56b5a8 (svn r27317) -Update from WebTranslator v3.0: 
frisian - 458 changes by BAJansen
 2015-06-24 17:45:14 +00:00
frosch
42630dfa01 (svn r27316) -Doc: Improve documentation on ScriptCargo::GetCargoLabel 2015-06-21 18:53:23 +00:00
frosch
a1ca479a65 (svn r27315) -Fix: Norwegian bokmal 2015-06-21 17:52:18 +00:00
translators
8f84989389 (svn r27314) -Update from WebTranslator v3.0: 
norwegian_bokmal - 4 changes by eirik174
 2015-06-21 17:45:13 +00:00
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) 2015-06-21 09:52:30 +00:00
frosch
d4db9cb109 (svn r27312) -Fix-ish [FS#6317]: Preserve town ownership of bridges when removing road from a road+tram bridge. (marcole) 2015-06-21 09:31:50 +00:00
frosch
c0015d6a7c (svn r27311) -Fix: Mark infrastructure window dirty in more cases. (marcole) 2015-06-21 09:19:27 +00:00
translators
a2f13f0fe2 (svn r27310) -Update from WebTranslator v3.0: 
norwegian_bokmal - 79 changes by eirik174
 2015-06-20 17:45:17 +00:00
frosch
0efffb6df4 (svn r27309) -Change [FS#6283]: Auto-complete partial roads when building level-crossings. (adf88) 2015-06-20 13:15:35 +00:00
frosch
07b83b8869 (svn r27308) -Fix [FS#6283]: Prevent breaking of tram-reversal points by adding more road pieces. (adf88) 2015-06-20 13:11:09 +00:00
frosch
81bdf8928e (svn r27307) -Fix [FS#6259]: Error message window with manager face failed with GUI zoom. (Johnnei) 2015-06-20 12:57:34 +00:00
frosch
b1763f1e77 (svn r27306) -Fix (r27305): Confused tiles. 2015-06-20 12:55:17 +00:00
frosch
19d1cda92e (svn r27305) -Fix [FS#6320]: Account for road-bridges and drive-through-stops in CanFollowRoad. 2015-06-20 12:40:04 +00:00
frosch
4117c5b747 (svn r27304) -Fix [FS#6321-ish]: Improve password window layout for big font sizes. 2015-06-20 12:30:10 +00:00