Commit Graph

611 Commits

Author SHA1 Message Date
Jonathan G Rennison
8faead7e7a Graphically indicate restricted signals by recolouring the signal post.
Recolour signal posts from grey to blue for restricted signals which
are not semaphores and are not custom sprites.
2015-08-19 21:56:22 +01:00
Jonathan G Rennison
7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
2015-08-05 21:54:11 +01:00
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
Jonathan G Rennison
6596ba216c Merge branch 'zoning' into jgrpp
Conflicts:
	src/table/sprites.h
2015-08-02 18:20:23 +01:00
patch-import
6de087786c Import and rebase zoning patch
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
2015-08-02 13:17:42 +01:00
patch-import
fc0efe599e Port of the programmable signals patch to recent trunk
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
2015-08-01 17:06:43 +01:00
frosch
97c76a51d6 (svn r27266) -Fix (r27265): Eddi jinxed it. 2015-05-03 10:30:02 +00:00
frosch
386e2ad14a (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
65694cf0cd (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
frosch
6477356dd2 (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
alberth
0143f486f2 (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
9428d6fb34 (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
rubidium
eb3ffa85ca (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
planetmaker
f7df63fbf9 (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
rubidium
8415a15999 (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
d87e20d6f4 (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
57d758f73e (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
d92c95b29c (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
fonsinchen
73d273ffd6 (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
rubidium
2361aaf601 (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
fonsinchen
bb269661d4 (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
planetmaker
911e0e80b8 (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
26262e035a (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
8ff9499fe2 (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
fa0fdd45c6 (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
6baa58a7d8 (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
db96a109ff (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
f7ba7f34f2 (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
b3f08fb67a (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
f317d0146e (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
b1f41a0afb (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
103b6fffbb (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
frosch
699e6b2588 (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
alberth
5437a588a0 (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
frosch
d7c43bbc20 (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
rubidium
78c48ee720 (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
planetmaker
19d393bda1 (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
6ca7a44407 (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
56a899f4bd (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
ccf36ca71b (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
rubidium
43a9cfcaa4 (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
frosch
6794456249 (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
2ef4438882 (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
rubidium
bfdc7fe558 (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
zuu
a2d84868e7 (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
rubidium
12299afa31 (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
caa324ba89 (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
frosch
559b7ef35e (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
planetmaker
3e163928c3 (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
5931faeff6 (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
8d10337bf0 (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
rubidium
5730e63a10 (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
f383011f97 (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
df63cb6cef (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
frosch
e586c29b31 (svn r25201) -Add: Scottish Gaelic translations for baseset descriptions (GunChleoc) 2013-04-24 16:55:43 +00:00
rubidium
25aed3423c (svn r25150) -Fix [FS#5514]: [Script] The was no way to differentiate between a cargo-station combination with or without rating, so introduce [AI|GS]Station::HasRating and let GetRating return -1 when there is no rating 2013-04-06 12:36:33 +00:00
rubidium
7a3d549f2f (svn r25150) -Fix [FS#5514]: [Script] The was no way to differentiate between a cargo-station combination with or without rating, so introduce [AI|GS]Station::HasRating and let GetRating return -1 when there is no rating 2013-04-06 12:36:33 +00:00
rubidium
779870d54c (svn r25144) -Fix (r25143): one of the changes strings was used in the regression test, which subsequently failed 2013-04-04 20:15:51 +00:00
rubidium
7e12c449f1 (svn r25144) -Fix (r25143): one of the changes strings was used in the regression test, which subsequently failed 2013-04-04 20:15:51 +00:00
rubidium
c8661de6be (svn r25001) -Change: heading for 1.4 now 2013-02-14 18:58:04 +00:00
rubidium
7ff6598cd2 (svn r25001) -Change: heading for 1.4 now 2013-02-14 18:58:04 +00:00
rubidium
8b92707d7c (svn r24889) -Fix-ish: extra GRF was built with "broken" grfcodec 2013-01-06 13:01:46 +00:00
rubidium
65ff2c1ce6 (svn r24889) -Fix-ish: extra GRF was built with "broken" grfcodec 2013-01-06 13:01:46 +00:00
frosch
b70eed09e2 (svn r24814) -Fix (r24810): Update AI regression. 2012-12-09 17:09:24 +00:00
frosch
a155a51a18 (svn r24814) -Fix (r24810): Update AI regression. 2012-12-09 17:09:24 +00:00
frosch
3610ad901a (svn r24749) -Add: GUI icons for delete to the left/right. 2012-11-14 22:51:01 +00:00
frosch
d5a798033a (svn r24749) -Add: GUI icons for delete to the left/right. 2012-11-14 22:51:01 +00:00
zuu
b6a601adc0 (svn r24629) -Fix (r24628): Also update regression test 2012-10-25 20:05:04 +00:00
zuu
cb01e4b496 (svn r24629) -Fix (r24628): Also update regression test 2012-10-25 20:05:04 +00:00
yexo
991011df95 (svn r24469) -Fix (r24468): forgot to svn add the new files 2012-08-13 19:33:17 +00:00
yexo
245baf820e (svn r24469) -Fix (r24468): forgot to svn add the new files 2012-08-13 19:33:17 +00:00
michi_cc
ff6da43e8c (svn r24147) -Fix (r24132): AI regression output. 2012-04-17 20:21:09 +00:00
michi_cc
25edf6edb8 (svn r24147) -Fix (r24132): AI regression output. 2012-04-17 20:21:09 +00:00
michi_cc
3e5dc26ded (svn r24141) -Feature: Display rating in the town directory window. (Inspired by patch from MagicBuzz) 2012-04-17 19:44:41 +00:00
michi_cc
a2b2bc3620 (svn r24141) -Feature: Display rating in the town directory window. (Inspired by patch from MagicBuzz) 2012-04-17 19:44:41 +00:00
rubidium
ea113816c0 (svn r24006) -Fix [FS#5088]: AI used in names in API for GSOrder 2012-03-04 16:40:06 +00:00
rubidium
e6a828def1 (svn r24006) -Fix [FS#5088]: AI used in names in API for GSOrder 2012-03-04 16:40:06 +00:00
rubidium
445ef889d7 (svn r23984) -Fix [FS#5082]: fix the order of lights on the helipad (PaulC) 2012-02-25 08:45:48 +00:00
rubidium
d7cae0ab96 (svn r23984) -Fix [FS#5082]: fix the order of lights on the helipad (PaulC) 2012-02-25 08:45:48 +00:00
rubidium
9ea6285d67 (svn r23982) -Codechange: use NFO v32 for the extra graphics 2012-02-24 22:29:44 +00:00
rubidium
7aeb89c984 (svn r23982) -Codechange: use NFO v32 for the extra graphics 2012-02-24 22:29:44 +00:00
rubidium
a28614d6d1 (svn r23981) -Codechange: reduce GRF size by a few percent by letting GRFCodec determine the best compression 2012-02-24 22:19:45 +00:00
rubidium
46b08db917 (svn r23981) -Codechange: reduce GRF size by a few percent by letting GRFCodec determine the best compression 2012-02-24 22:19:45 +00:00
rubidium
e8d9ab4dd5 (svn r23969) -Codechange: trunk heads to 1.3 now 2012-02-19 19:14:17 +00:00
rubidium
a5cb454e94 (svn r23969) -Codechange: trunk heads to 1.3 now 2012-02-19 19:14:17 +00:00
rubidium
254e15df48 (svn r23959) -Change: make regression less faily when spurious warnings are shown 2012-02-16 21:08:32 +00:00
rubidium
fc732206e6 (svn r23959) -Change: make regression less faily when spurious warnings are shown 2012-02-16 21:08:32 +00:00
michi_cc
ff73fdb4b0 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 2012-02-15 21:23:48 +00:00
michi_cc
9101d2e2d2 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 2012-02-15 21:23:48 +00:00
rubidium
92c77dee32 (svn r23926) -Update [FS#5055]: some missing Latin-ish characters as some translations started using them (PaulC) 2012-02-11 19:46:47 +00:00
rubidium
1b13eb49dd (svn r23926) -Update [FS#5055]: some missing Latin-ish characters as some translations started using them (PaulC) 2012-02-11 19:46:47 +00:00
rubidium
35c4b5f73e (svn r23858) -Change [FS#5003]: some updates and improvements of the base font (PaulC) 2012-01-27 21:14:38 +00:00
rubidium
0b4d40b30e (svn r23858) -Change [FS#5003]: some updates and improvements of the base font (PaulC) 2012-01-27 21:14:38 +00:00
rubidium
990045e2b3 (svn r23639) -Fix [FS#4892]: fix transparency for steel mill, colour translations in some arctic buildings and a wrongly replaced sprites (PaulC) 2011-12-20 17:04:31 +00:00
rubidium
7a38642a1c (svn r23639) -Fix [FS#4892]: fix transparency for steel mill, colour translations in some arctic buildings and a wrongly replaced sprites (PaulC) 2011-12-20 17:04:31 +00:00
rubidium
b3fc75c72d (svn r23582) -Fix [FS#4870]: add missing characters for certain languages and the large font
-Codechange: don't remove large font glyphs because they are broken in the original font, just fix them up in openttd.grf using action A
-Change: make extra characters more consistent with the original font
  All by PaulC.
2011-12-17 21:42:11 +00:00
rubidium
ab974bee97 (svn r23582) -Fix [FS#4870]: add missing characters for certain languages and the large font
-Codechange: don't remove large font glyphs because they are broken in the original font, just fix them up in openttd.grf using action A
-Change: make extra characters more consistent with the original font
  All by PaulC.
2011-12-17 21:42:11 +00:00
rubidium
68b25fcf3d (svn r23521) -Codechange: use the actual enum values from the 'core' in the API when they refer to the in-game values in the cases where that is possible and sensible 2011-12-15 18:40:15 +00:00
rubidium
18d929aa21 (svn r23521) -Codechange: use the actual enum values from the 'core' in the API when they refer to the in-game values in the cases where that is possible and sensible 2011-12-15 18:40:15 +00:00
truebrain
43fbfa2414 (svn r23486) -Fix (r22764): 3 for the price of 1: fix up ScriptTile::GetTownAuthority() (tnx to Torrasque for reporting) 2011-12-10 21:07:04 +00:00
truebrain
a8960f64be (svn r23486) -Fix (r22764): 3 for the price of 1: fix up ScriptTile::GetTownAuthority() (tnx to Torrasque for reporting) 2011-12-10 21:07:04 +00:00
truebrain
974f1ee8d1 (svn r23397) -Change: remove the AI_ prefix from all AIEvent enums 2011-12-02 23:40:16 +00:00