commit 4dd2678fc5f6f0a482e729bfc80b56ed335c5c58 Merge: 93b99fe 1da52d2 Author: fonsinchen Date: Sat Jun 4 10:04:01 2011 +0200 Merge branch 'station-gui' into cd-tmp commit 93b99fecd8015f192efbd86f9ee2a84755cf67f9 Merge: c8ef981 ce8da3d Author: fonsinchen Date: Sat Jun 4 10:04:00 2011 +0200 Merge branch 'ext-rating' into cd-tmp commit c8ef981a15234b72d5244339764a40345a622f7e Merge: 01a349d 8872713 Author: fonsinchen Date: Sat Jun 4 10:04:00 2011 +0200 Merge branch 'smallmap-overlay' into cd-tmp commit 01a349d9ffa00e5741f2d8e60e77f747cd9c5637 Merge: d799588 97e6c91 Author: fonsinchen Date: Sat Jun 4 10:04:00 2011 +0200 Merge branch 'viewport-overlay' into cd-tmp commit 8872713bffc4939ba599a077b9497e6b365854bf Merge: ad2b93e b152f66 Author: fonsinchen Date: Sat Jun 4 10:03:59 2011 +0200 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit b152f66329d918881ae22558c054630a36c6356e Merge: 5947a1e 23d5237 Author: fonsinchen Date: Sat Jun 4 10:03:59 2011 +0200 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit 5947a1e27a50798f55b535d4514edb835c9e869a Merge: 6c67682 e839cae Author: fonsinchen Date: Sat Jun 4 10:03:58 2011 +0200 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit 23d5237d65b0d5c6a7db6d0ae9b204fea4704d8f Merge: 96989db 6996709 Author: fonsinchen Date: Sat Jun 4 10:03:58 2011 +0200 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor commit 97e6c91de26bf7a1bf57c50a6263d389fb57d9d9 Merge: f0907aa 1864e28 Author: fonsinchen Date: Sat Jun 4 10:03:57 2011 +0200 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit 1864e28b5b2e49a0e210ee952b377d9cd6c8e75b Merge: f265c53 e839cae Author: fonsinchen Date: Sat Jun 4 10:03:56 2011 +0200 Merge branch 'overlay-legend-tmp' into overlay-legend commit e839cae7686b3fbcd418b617f8c377b594a9bb78 Merge: 4cca01e f468c70 Author: fonsinchen Date: Sat Jun 4 10:03:55 2011 +0200 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit ce8da3dc475e3f4abd033cb1602ab3b6f47a825d Merge: 795da65 f468c70 Author: fonsinchen Date: Sat Jun 4 10:03:53 2011 +0200 Merge branch 'ext-rating-tmp' into ext-rating commit 1da52d2117fd806fbf27a87ef883bbfa3ec43829 Merge: 9d93a6a f468c70 Author: fonsinchen Date: Sat Jun 4 10:03:49 2011 +0200 Merge branch 'station-gui-tmp' into station-gui commit f468c7066da65d8a041f0c2e7a754f4ef3e6f72c Merge: 596f598 7e2203e Author: fonsinchen Date: Sat Jun 4 10:03:48 2011 +0200 Merge branch 'cargomap-tmp' into cargomap commit 7e2203eaf61da4a0af822bbd1165baf6fd4d6545 Merge: 3e8f200 5a25a22 Author: fonsinchen Date: Sat Jun 4 10:03:48 2011 +0200 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit 3e8f200a0228fb96248059e103a14141c7d32293 Merge: 4582a43 0e8f7e8 Author: fonsinchen Date: Sat Jun 4 10:03:48 2011 +0200 Merge branch 'reservation' into cargomap-tmp commit 4582a433c620f189e73ae7926acdca37f6d45325 Merge: 84a418a 768e2fc Author: fonsinchen Date: Sat Jun 4 10:03:47 2011 +0200 Merge branch 'multimap' into cargomap-tmp commit 84a418ad10431eb245a8e847570c69f641738a45 Merge: 2ae80ea 7a7924c Author: fonsinchen Date: Sat Jun 4 10:03:47 2011 +0200 Merge branch 'texteff' into cargomap-tmp commit 2ae80ea28302c222a184b72dd468f4760e923599 Merge: 2e69901 ecbd1f3 Author: fonsinchen Date: Sat Jun 4 10:03:47 2011 +0200 Merge branch 'flowmapping-core' into cargomap-tmp commit 5a25a2200032fdfb5b9d767250bbd3ee350096af Merge: ef4a79f 6996709 Author: fonsinchen Date: Sat Jun 4 10:03:46 2011 +0200 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit 0e8f7e81db2e9aa025e1889b59def0f1b436537b Merge: c6e3aa8 f9dd053 Author: fonsinchen Date: Sat Jun 4 10:03:45 2011 +0200 Merge branch 'reservation-tmp' into reservation commit f9dd0536954742b34be210705260df5028a238df Merge: 6f45d2a 6996709 Author: fonsinchen Date: Sat Jun 4 10:03:45 2011 +0200 Merge branch 'gitmake' into reservation-tmp commit 768e2fc9cfe353ab8827a038b7464eddf3858d7c Merge: 101b4df 6996709 Author: fonsinchen Date: Sat Jun 4 10:03:44 2011 +0200 Merge branch 'multimap-tmp' into multimap commit 7a7924c8ad2a649338eeeb2f07ca7e93222fb0bb Merge: 9117e75 6996709 Author: fonsinchen Date: Sat Jun 4 10:03:44 2011 +0200 Merge branch 'texteff-tmp' into texteff commit ecbd1f30cadbf728e711dab9ea32981d0eaba6e0 Merge: 67520a4 b9939ac Author: fonsinchen Date: Sat Jun 4 10:03:43 2011 +0200 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit b9939acd4f299f40a5c7fdb8af1ece6d2a7e869c Merge: fd763f8 5d41712 Author: fonsinchen Date: Sat Jun 4 10:03:42 2011 +0200 Merge branch 'mcf-tmp' into mcf commit 5d41712b9b594a2cf6578b3281dd1a8f31eb4c2e Merge: 02dc54c 660ec06 Author: fonsinchen Date: Sat Jun 4 10:03:41 2011 +0200 Merge branch 'demands-tmp' into demands commit 660ec063e1ee570837e7575140aab5a77efa4745 Merge: b4c0237 2130e1b Author: fonsinchen Date: Sat Jun 4 10:03:39 2011 +0200 Merge branch 'components-tmp' into components commit 2130e1b8a2ea1fe0d8731984f6ffaea700344398 Merge: 57d8845 f3ee9fe Author: fonsinchen Date: Sat Jun 4 10:03:38 2011 +0200 Merge branch 'capacities-tmp' into capacities commit f3ee9fe47e8f9443f2b0088ae733ee21c57fda5e Merge: 4f60fa8 832fa08 Author: fonsinchen Date: Sat Jun 4 10:03:38 2011 +0200 Merge branch 'moving-average' into capacities-tmp commit 832fa08c0716740707765d254f9c4381e923ae9b Merge: 17c05f7 9a63dd9 Author: fonsinchen Date: Sat Jun 4 10:03:37 2011 +0200 Merge branch 'moving-average-tmp' into moving-average commit 6996709ff99d57cc86dabd2385a00f2775030402 Merge: 2f94d8c a82acad Author: fonsinchen Date: Sat Jun 4 10:03:36 2011 +0200 Merge branch 'master' into gitmake commit 9a63dd930ca858c0a2b6c8ebc46867ff8142f9fb Merge: 08c3003 6996709 Author: fonsinchen Date: Sat Jun 4 10:03:36 2011 +0200 Merge branch 'gitmake' into moving-average-tmp commit a82acadba1bed967b2d81824b52215a8f1f7b02d Author: planetmaker Date: Fri Jun 3 20:41:30 2011 +0000 (svn r22535) -Cleanup: Remove uneeded constants, update and unify some comments relating to sprite numbers commit 72caaebd757d50ff41f3d8f28f83748381989e0f Author: yexo Date: Fri Jun 3 19:18:39 2011 +0000 (svn r22534) -Fix [FS#4631] (r21250): doing rescan_ai in a game with running AIs caused a crash commit f93ac6c5887fde9382878425c27cbfd4fac2ae29 Author: translators Date: Fri Jun 3 17:45:11 2011 +0000 (svn r22533) -Update from WebTranslator v3.0: catalan - 2 changes by arnau czech - 3 changes by rala commit 5970854fa8e86b4a96b554bd94003e3a800ee527 Author: michi_cc Date: Thu Jun 2 22:41:05 2011 +0000 (svn r22532) -Fix: Do not create an implicit order if the current order is the first order in the order list and we visit the station of the last entry of the order list. commit 9b06a6a832778d1c7f78baef44a0ea7ee8e8ad2e Author: translators Date: Thu Jun 2 17:45:06 2011 +0000 (svn r22531) -Update from WebTranslator v3.0: simplified_chinese - 5 changes by Gavin commit 66e3e4e4d1de5e7841c05359e19cc540cbb18c65 Author: translators Date: Wed Jun 1 17:45:09 2011 +0000 (svn r22530) -Update from WebTranslator v3.0: frisian - 6 changes by Fopper polish - 5 changes by nouwak commit f385764b7d0cdf7f7fdbaafc760b9697c243afb4 Author: frosch Date: Tue May 31 20:51:19 2011 +0000 (svn r22529) -Doc (r22419): Reflect removal of '-i' option in documentation. commit d9cf72eeb7e8d35b8a832b46b9ffa7905c6f0888 Author: translators Date: Tue May 31 17:45:09 2011 +0000 (svn r22526) -Update from WebTranslator v3.0: serbian - 4 changes by etran commit 7538e19aacd5cee08e9acf7054bcb2cca0203e9c Author: translators Date: Mon May 30 17:45:22 2011 +0000 (svn r22525) -Update from WebTranslator v3.0: belarusian - 3 changes by KorneySan croatian - 3 changes by VoyagerOne dutch - 3 changes by Yexo finnish - 1 changes by jpx_ italian - 3 changes by lorenzodv russian - 1 changes by KorneySan commit 501facad250a1c93bb3a1d71eefd96bb7c088a64 Author: rubidium Date: Sun May 29 20:01:39 2011 +0000 (svn r22523) -Doc: how OpenTTD finds a font, and what to do when that "fails" commit ea311e79044a76ca8949f2781c43528a9059bb36 Author: frosch Date: Sun May 29 18:35:31 2011 +0000 (svn r22522) -Fix (r22489): (size_t)(uint32)(-1) != (size_t)-1 commit eaec8881cc8df7be3e944fb8434ecc694b36aeea Author: rubidium Date: Sun May 29 17:57:53 2011 +0000 (svn r22521) -Fix: tiny typo in translation commit 92cf4134607c65826ed5a41477c87741ce912e88 Author: translators Date: Sun May 29 17:45:19 2011 +0000 (svn r22519) -Update from WebTranslator v3.0: dutch - 1 changes by Rubidium english_US - 3 changes by Rubidium french - 3 changes by glx german - 3 changes by frosch spanish - 4 changes by Terkhen commit becf6c823f849e3401ad202184f599971c53f442 Author: frosch Date: Sun May 29 16:56:22 2011 +0000 (svn r22518) -Feature: [NewGRF] Advanced sprite layouts with register modifiers. commit 2d24e00b27cd7339d9c6d89ff3a2049f9625098d Author: frosch Date: Sun May 29 16:54:40 2011 +0000 (svn r22517) -Fix (r22472): If a NewGRF sprite ran out of bytes at a very specific point, data might be freed twice. commit a2dcfce59dba0a769f02ab6c0f4215982aa98842 Author: frosch Date: Sun May 29 08:56:05 2011 +0000 (svn r22516) -Codechange: Replace some magic numbers with the appropiate enum values. (Eddi)