Commit Graph

624 Commits (jgrpp)

Author SHA1 Message Date
rubidium 668fb3f658 (svn r27559) -Update: baseset translations 8 years ago
Jonathan G Rennison 3da991bf9b Merge branch 'master' into jgrpp
# Conflicts:
#	src/rail_gui.cpp
8 years ago
frosch 4cfa482786 (svn r27541) -Update: Baseset translations 8 years ago
frosch 208d83f9d3 (svn r27541) -Update: Baseset translations 8 years ago
frosch e580d9e623 (svn r27533) -Update: Baseset translations 8 years ago
frosch 5931616e71 (svn r27533) -Update: Baseset translations 8 years ago
Jonathan G Rennison 57cbecb0e0 Merge branch 'master' into jgrpp 8 years ago
frosch fbd79d88f0 (svn r27518) -Update: Numbers 8 years ago
frosch 0c7c0ada78 (svn r27518) -Update: Numbers 8 years ago
Jonathan G Rennison cbf1ece361 Merge branch 'group_collapse' into jgrpp 8 years ago
frosch 265c8d090f (svn r27496) -Update: Baseset translations 8 years ago
frosch 00ce319efa (svn r27496) -Update: Baseset translations 8 years ago
Jonathan G Rennison f2d0c3a441 Merge branch 'tracerestrict-sx' into jgrpp
Conflicts:
	src/gfxinit.cpp
	src/rail_cmd.cpp
	src/table/sprites.h
9 years ago
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.
9 years ago
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
9 years ago
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
Jonathan G Rennison 6596ba216c Merge branch 'zoning' into jgrpp
Conflicts:
	src/table/sprites.h
9 years ago
patch-import 6de087786c Import and rebase zoning patch
Fix some of the whitespace issues

http://www.tt-forums.net/viewtopic.php?p=888801#p888801
9 years ago
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.
9 years ago
frosch 97c76a51d6 (svn r27266) -Fix (r27265): Eddi jinxed it. 9 years ago
frosch 386e2ad14a (svn r27266) -Fix (r27265): Eddi jinxed it. 9 years ago
frosch 5923cfff4f (svn r27265) -Fix: Truncated comment in openttd.grf 9 years ago
frosch 65694cf0cd (svn r27265) -Fix: Truncated comment in openttd.grf 9 years ago
frosch 2edbc72ebd (svn r27192) -Change: heading for 1.6 now 9 years ago
frosch 6477356dd2 (svn r27192) -Change: heading for 1.6 now 9 years ago
alberth cd36ff1bfe (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 9 years ago
alberth 0143f486f2 (svn r27164) -Add: [NoGo] Game scripts can point to a location, station, industry, or town when publishing news. 9 years ago
rubidium dd40950643 (svn r27103) -Update: copyright date 9 years ago
rubidium 9428d6fb34 (svn r27103) -Update: copyright date 9 years ago
rubidium f453c166c5 (svn r27041) -Update: ob* translations 10 years ago
rubidium eb3ffa85ca (svn r27041) -Update: ob* translations 10 years ago
planetmaker ff71a8f5c9 (svn r26993) -Feature: Latin translation (Supercheese) 10 years ago
planetmaker f7df63fbf9 (svn r26993) -Feature: Latin translation (Supercheese) 10 years ago
rubidium 0584d36c0b (svn r26898) -Fix: hopefully make regression under MinGW work again 10 years ago
rubidium 8415a15999 (svn r26898) -Fix: hopefully make regression under MinGW work again 10 years ago
fonsinchen 14604b9215 (svn r26897) -Change: Add some more AIStationList autotests 10 years ago
fonsinchen d87e20d6f4 (svn r26897) -Change: Add some more AIStationList autotests 10 years ago
fonsinchen 3f2da92ea2 (svn r26896) -Codechange: Move AIStationList* tests to separate test case 10 years ago
fonsinchen 57d758f73e (svn r26896) -Codechange: Move AIStationList* tests to separate test case 10 years ago
fonsinchen 82baae3eb8 (svn r26895) -Change: Allow for multiple independent test cases for AI API regression 10 years ago
fonsinchen d92c95b29c (svn r26895) -Change: Allow for multiple independent test cases for AI API regression 10 years ago
fonsinchen b6833fc6ef (svn r26892) -Feature: Script API for retrieving planned flow 10 years ago
fonsinchen 73d273ffd6 (svn r26892) -Feature: Script API for retrieving planned flow 10 years ago
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) 10 years ago
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) 10 years ago
fonsinchen 7836470f60 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 10 years ago
fonsinchen bb269661d4 (svn r26557) -Fix: clean up, test (somewhat), and complete the API for waiting cargo 10 years ago
planetmaker 74f666d741 (svn r26456) -Update: Baseset translations. 10 years ago
planetmaker 911e0e80b8 (svn r26456) -Update: Baseset translations. 10 years ago
frosch d6c9900615 (svn r26410) -Fix: Missing svn properties 10 years ago
frosch 26262e035a (svn r26410) -Fix: Missing svn properties 10 years ago
frosch e511805439 (svn r26409) -Update: Version number in some more places. 10 years ago
frosch 8ff9499fe2 (svn r26409) -Update: Version number in some more places. 10 years ago
frosch f89c387723 (svn r26408) -Update: Baseset translations. 10 years ago
frosch fa0fdd45c6 (svn r26408) -Update: Baseset translations. 10 years ago
frosch ba112f104b (svn r26407) -Fix: __ln__ never read the script compatibility files. 10 years ago
frosch 6baa58a7d8 (svn r26407) -Fix: __ln__ never read the script compatibility files. 10 years ago
frosch 50729655ec (svn r26406) -Change: heading for 1.5 now 10 years ago
frosch db96a109ff (svn r26406) -Change: heading for 1.5 now 10 years ago
frosch b28e5eb117 (svn r26356) -Update: Baseset translations. 10 years ago
frosch f7ba7f34f2 (svn r26356) -Update: Baseset translations. 10 years ago
frosch 6b07112326 (svn r26168) -Update: Baseset translations 11 years ago
frosch b3f08fb67a (svn r26168) -Update: Baseset translations 11 years ago
frosch 5df3f1ca6d (svn r26147) -Update: Baseset translations 11 years ago
frosch f317d0146e (svn r26147) -Update: Baseset translations 11 years ago
frosch fc3040af02 (svn r25967) -Add: [NoGo] GSTown::TOWN_GROWTH_NORMAL to reset a town growth rate set previously via GSTown::SetGrowthRate. 11 years ago
frosch b1f41a0afb (svn r25967) -Add: [NoGo] GSTown::TOWN_GROWTH_NORMAL to reset a town growth rate set previously via GSTown::SetGrowthRate. 11 years ago
frosch 0d5ab589fe (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 11 years ago
frosch 103b6fffbb (svn r25916) -Add: GUI sprite for the smallmap cargoflow button. (frosch, planetmaker, V453000) 11 years ago
frosch 29c7e59909 (svn r25813) -Update: Baseset translations 11 years ago
frosch 699e6b2588 (svn r25813) -Update: Baseset translations 11 years ago
alberth 736359623b (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 11 years ago
alberth 5437a588a0 (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 11 years ago
frosch e15e0057f1 (svn r25728) -Update: Baseset translations 11 years ago
frosch d7c43bbc20 (svn r25728) -Update: Baseset translations 11 years ago
rubidium 04affb26a9 (svn r25704) -Update: baseset translations 11 years ago
rubidium 78c48ee720 (svn r25704) -Update: baseset translations 11 years ago
planetmaker 0727c3c76d (svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one 11 years ago
planetmaker 19d393bda1 (svn r25638) -Fix (r25470): Some icu_config are too stupid to separate two ldflags by spaces, thus only call it with one 11 years ago
rubidium 8e9618b125 (svn r25629) -Update: baseset translations 11 years ago
rubidium 6ca7a44407 (svn r25629) -Update: baseset translations 11 years ago
rubidium d4f2bcc545 (svn r25581) -Fix: WT3 validation 11 years ago
rubidium 56a899f4bd (svn r25581) -Fix: WT3 validation 11 years ago
rubidium 8ba0735ff3 (svn r25522) -Update: baseset descriptions 11 years ago
rubidium ccf36ca71b (svn r25522) -Update: baseset descriptions 11 years ago
rubidium 687ec29b86 (svn r25491) -Fix: ofcourse... doing something with Random messes with the regression result... 11 years ago
rubidium 43a9cfcaa4 (svn r25491) -Fix: ofcourse... doing something with Random messes with the regression result... 11 years ago
frosch 4b13cd5e34 (svn r25428) -Update: Baseset translations 11 years ago
frosch 6794456249 (svn r25428) -Update: Baseset translations 11 years ago
rubidium d230f22d1c (svn r25404) -Feature: Thai 11 years ago
rubidium 2ef4438882 (svn r25404) -Feature: Thai 11 years ago
rubidium dcad7876c7 (svn r25392) -Fix (r25390): update regression to account for the compatability settings 11 years ago
rubidium bfdc7fe558 (svn r25392) -Fix (r25390): update regression to account for the compatability settings 11 years ago
zuu 7a5cedf078 (svn r25344) -Feature: GUI for viewing story pages 11 years ago
zuu a2d84868e7 (svn r25344) -Feature: GUI for viewing story pages 11 years ago
rubidium 0a0087f9bf (svn r25324) -Update: the baseset translations 11 years ago
rubidium 12299afa31 (svn r25324) -Update: the baseset translations 11 years ago
frosch cbc6b0a668 (svn r25301) -Change: Slightly enlarge the default-windowsize button icon. 11 years ago
frosch caa324ba89 (svn r25301) -Change: Slightly enlarge the default-windowsize button icon. 11 years ago
frosch f61a2c0273 (svn r25293) -Add: GUI sprite for default window size button. 11 years ago
frosch 559b7ef35e (svn r25293) -Add: GUI sprite for default window size button. 11 years ago
planetmaker 2d4b0d0e71 (svn r25250) -Add: Apply changed and newly added translations for base set descriptions 11 years ago
planetmaker 3e163928c3 (svn r25250) -Add: Apply changed and newly added translations for base set descriptions 11 years ago
rubidium f952f0bfdd (svn r25235) -Fix [FS#5543]: keep all cargo whenever cancelling reservations (fonsinchen) 11 years ago
rubidium 5931faeff6 (svn r25235) -Fix [FS#5543]: keep all cargo whenever cancelling reservations (fonsinchen) 11 years ago
rubidium b0359223ae (svn r25218) -Fix: the baseset description translation script did not work with any awk other than gawk 11 years ago
rubidium 8d10337bf0 (svn r25218) -Fix: the baseset description translation script did not work with any awk other than gawk 11 years ago
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
11 years ago
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
11 years ago
frosch 82e4f3d714 (svn r25208) -Update: Baseset translations 11 years ago
frosch f383011f97 (svn r25208) -Update: Baseset translations 11 years ago
frosch e4c87948c5 (svn r25205) -Feature: Translations of baseset descriptions via lang files. 11 years ago
frosch df63cb6cef (svn r25205) -Feature: Translations of baseset descriptions via lang files. 11 years ago
frosch 75f7cdf39d (svn r25201) -Add: Scottish Gaelic translations for baseset descriptions (GunChleoc) 11 years ago
frosch e586c29b31 (svn r25201) -Add: Scottish Gaelic translations for baseset descriptions (GunChleoc) 11 years ago
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 11 years ago
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 11 years ago
rubidium 779870d54c (svn r25144) -Fix (r25143): one of the changes strings was used in the regression test, which subsequently failed 11 years ago
rubidium 7e12c449f1 (svn r25144) -Fix (r25143): one of the changes strings was used in the regression test, which subsequently failed 11 years ago
rubidium c8661de6be (svn r25001) -Change: heading for 1.4 now 11 years ago
rubidium 7ff6598cd2 (svn r25001) -Change: heading for 1.4 now 11 years ago
rubidium 8b92707d7c (svn r24889) -Fix-ish: extra GRF was built with "broken" grfcodec 12 years ago
rubidium 65ff2c1ce6 (svn r24889) -Fix-ish: extra GRF was built with "broken" grfcodec 12 years ago
frosch b70eed09e2 (svn r24814) -Fix (r24810): Update AI regression. 12 years ago
frosch a155a51a18 (svn r24814) -Fix (r24810): Update AI regression. 12 years ago
frosch 3610ad901a (svn r24749) -Add: GUI icons for delete to the left/right. 12 years ago
frosch d5a798033a (svn r24749) -Add: GUI icons for delete to the left/right. 12 years ago
zuu b6a601adc0 (svn r24629) -Fix (r24628): Also update regression test 12 years ago
zuu cb01e4b496 (svn r24629) -Fix (r24628): Also update regression test 12 years ago
yexo 991011df95 (svn r24469) -Fix (r24468): forgot to svn add the new files 12 years ago
yexo 245baf820e (svn r24469) -Fix (r24468): forgot to svn add the new files 12 years ago
michi_cc ff6da43e8c (svn r24147) -Fix (r24132): AI regression output. 12 years ago
michi_cc 25edf6edb8 (svn r24147) -Fix (r24132): AI regression output. 12 years ago
michi_cc 3e5dc26ded (svn r24141) -Feature: Display rating in the town directory window. (Inspired by patch from MagicBuzz) 12 years ago
michi_cc a2b2bc3620 (svn r24141) -Feature: Display rating in the town directory window. (Inspired by patch from MagicBuzz) 12 years ago
rubidium ea113816c0 (svn r24006) -Fix [FS#5088]: AI used in names in API for GSOrder 12 years ago
rubidium e6a828def1 (svn r24006) -Fix [FS#5088]: AI used in names in API for GSOrder 12 years ago
rubidium 445ef889d7 (svn r23984) -Fix [FS#5082]: fix the order of lights on the helipad (PaulC) 12 years ago
rubidium d7cae0ab96 (svn r23984) -Fix [FS#5082]: fix the order of lights on the helipad (PaulC) 12 years ago
rubidium 9ea6285d67 (svn r23982) -Codechange: use NFO v32 for the extra graphics 12 years ago
rubidium 7aeb89c984 (svn r23982) -Codechange: use NFO v32 for the extra graphics 12 years ago
rubidium a28614d6d1 (svn r23981) -Codechange: reduce GRF size by a few percent by letting GRFCodec determine the best compression 12 years ago
rubidium 46b08db917 (svn r23981) -Codechange: reduce GRF size by a few percent by letting GRFCodec determine the best compression 12 years ago
rubidium e8d9ab4dd5 (svn r23969) -Codechange: trunk heads to 1.3 now 12 years ago
rubidium a5cb454e94 (svn r23969) -Codechange: trunk heads to 1.3 now 12 years ago
rubidium 254e15df48 (svn r23959) -Change: make regression less faily when spurious warnings are shown 12 years ago
rubidium fc732206e6 (svn r23959) -Change: make regression less faily when spurious warnings are shown 12 years ago
michi_cc ff73fdb4b0 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 12 years ago
michi_cc 9101d2e2d2 (svn r23952) -Feature: [NewGRF] Customisable tunnel portals for rail types (sprites by Snail). 12 years ago