Commit Graph

254 Commits

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
frosch
97c76a51d6 (svn r27266) -Fix (r27265): Eddi jinxed it. 2015-05-03 10:30:02 +00:00
frosch
5923cfff4f (svn r27265) -Fix: Truncated comment in openttd.grf 2015-05-03 10:10:04 +00:00
frosch
2edbc72ebd (svn r27192) -Change: heading for 1.6 now 2015-03-17 20:33:44 +00:00
alberth
cd36ff1bfe (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 2015-02-22 17:25:29 +00:00
rubidium
dd40950643 (svn r27103) -Update: copyright date 2015-01-01 20:51:18 +00:00
rubidium
f453c166c5 (svn r27041) -Update: ob* translations 2014-10-25 12:35:48 +00:00
planetmaker
ff71a8f5c9 (svn r26993) -Feature: Latin translation (Supercheese) 2014-10-11 21:30:33 +00:00
rubidium
0584d36c0b (svn r26898) -Fix: hopefully make regression under MinGW work again 2014-09-21 17:22:50 +00:00
fonsinchen
14604b9215 (svn r26897) -Change: Add some more AIStationList autotests 2014-09-21 16:45:51 +00:00
fonsinchen
3f2da92ea2 (svn r26896) -Codechange: Move AIStationList* tests to separate test case 2014-09-21 16:44:37 +00:00
fonsinchen
82baae3eb8 (svn r26895) -Change: Allow for multiple independent test cases for AI API regression 2014-09-21 16:41:03 +00:00
fonsinchen
b6833fc6ef (svn r26892) -Feature: Script API for retrieving planned flow 2014-09-21 16:20:14 +00:00
rubidium
6592da4952 (svn r26869) -Add: support for an all black palette to prevent the need of having a black tile of all different slopes (ic111) 2014-09-21 07:57:45 +00:00
fonsinchen
7836470f60 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 2014-05-04 13:57:48 +00:00
planetmaker
74f666d741 (svn r26456) -Update: Baseset translations. 2014-04-12 11:41:45 +00:00
frosch
d6c9900615 (svn r26410) -Fix: Missing svn properties 2014-03-17 20:28:48 +00:00
frosch
e511805439 (svn r26409) -Update: Version number in some more places. 2014-03-17 20:16:05 +00:00
frosch
f89c387723 (svn r26408) -Update: Baseset translations. 2014-03-17 20:06:16 +00:00
frosch
ba112f104b (svn r26407) -Fix: __ln__ never read the script compatibility files. 2014-03-17 20:05:38 +00:00
frosch
50729655ec (svn r26406) -Change: heading for 1.5 now 2014-03-17 20:02:30 +00:00
frosch
b28e5eb117 (svn r26356) -Update: Baseset translations. 2014-02-19 20:42:33 +00:00
frosch
6b07112326 (svn r26168) -Update: Baseset translations 2013-12-22 11:50:52 +00:00
frosch
5df3f1ca6d (svn r26147) -Update: Baseset translations 2013-12-08 14:49:47 +00:00
frosch
fc3040af02 (svn r25967) -Add: [NoGo] GSTown::TOWN_GROWTH_NORMAL to reset a town growth rate set previously via GSTown::SetGrowthRate. 2013-11-12 17:56:35 +00:00
frosch
0d5ab589fe (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 2013-10-27 15:09:41 +00:00
frosch
29c7e59909 (svn r25813) -Update: Baseset translations 2013-10-06 10:14:19 +00:00
alberth
736359623b (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 2013-10-01 20:16:44 +00:00
frosch
e15e0057f1 (svn r25728) -Update: Baseset translations 2013-08-18 15:34:00 +00:00
rubidium
04affb26a9 (svn r25704) -Update: baseset translations 2013-08-09 18:30:33 +00:00
planetmaker
0727c3c76d (svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one 2013-07-30 22:03:36 +00:00
rubidium
8e9618b125 (svn r25629) -Update: baseset translations 2013-07-27 14:45:09 +00:00
rubidium
d4f2bcc545 (svn r25581) -Fix: WT3 validation 2013-07-10 17:46:54 +00:00
rubidium
8ba0735ff3 (svn r25522) -Update: baseset descriptions 2013-06-29 17:50:59 +00:00
rubidium
687ec29b86 (svn r25491) -Fix: ofcourse... doing something with Random messes with the regression result... 2013-06-27 20:30:22 +00:00
frosch
4b13cd5e34 (svn r25428) -Update: Baseset translations 2013-06-19 19:03:51 +00:00
rubidium
d230f22d1c (svn r25404) -Feature: Thai 2013-06-15 15:24:20 +00:00
rubidium
dcad7876c7 (svn r25392) -Fix (r25390): update regression to account for the compatability settings 2013-06-11 05:04:49 +00:00
zuu
7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 2013-06-09 12:48:27 +00:00
rubidium
0a0087f9bf (svn r25324) -Update: the baseset translations 2013-06-06 17:56:02 +00:00
frosch
cbc6b0a668 (svn r25301) -Change: Slightly enlarge the default-windowsize button icon. 2013-05-28 20:10:41 +00:00
frosch
f61a2c0273 (svn r25293) -Add: GUI sprite for default window size button. 2013-05-26 19:29:43 +00:00
planetmaker
2d4b0d0e71 (svn r25250) -Add: Apply changed and newly added translations for base set descriptions 2013-05-18 15:30:32 +00:00
rubidium
f952f0bfdd (svn r25235) -Fix [FS#5543]: keep all cargo whenever cancelling reservations (fonsinchen) 2013-05-12 11:53:53 +00:00
rubidium
b0359223ae (svn r25218) -Fix: the baseset description translation script did not work with any awk other than gawk 2013-05-04 19:30:37 +00:00
rubidium
9d9607e8ec (svn r25213) -Fix [FS#5537]: clarify on which tiles IsDesertTile and IsSnowTile work, i.e. the ones without infrastructure or buildings
-Feature: introduce GetTerrainType which allows one to get that information for tiles with buildings and infrastructure as well
2013-04-30 17:16:32 +00:00
frosch
82e4f3d714 (svn r25208) -Update: Baseset translations 2013-04-26 17:46:09 +00:00
frosch
e4c87948c5 (svn r25205) -Feature: Translations of baseset descriptions via lang files. 2013-04-24 20:30:02 +00:00
frosch
75f7cdf39d (svn r25201) -Add: Scottish Gaelic translations for baseset descriptions (GunChleoc) 2013-04-24 16:55:43 +00:00