commit 70863e4df4efb5589574b3cb8e62c31f03728b83 Merge: 18978be 108df16 Author: fonsinchen Date: Sun Dec 4 23:12:35 2011 +0100 Merge branch 'station-gui' into cd-tmp commit 18978be8b320a1be6a386786d2f9abbf79d2c64c Merge: 03e1930 3a187f3 Author: fonsinchen Date: Sun Dec 4 23:12:34 2011 +0100 Merge branch 'ext-rating' into cd-tmp commit 03e1930244fba9a284ff6dc6550d5b9ac66597dc Merge: 5297bb4 bda2a8b Author: fonsinchen Date: Sun Dec 4 23:12:34 2011 +0100 Merge branch 'smallmap-overlay' into cd-tmp commit 5297bb40913c8f066585d05239b63e152a70f10b Merge: dfb19f8 2923ff2 Author: fonsinchen Date: Sun Dec 4 23:12:33 2011 +0100 Merge branch 'viewport-overlay' into cd-tmp commit 108df1609cab94878eeada72eeeecd969bff7548 Merge: 1670a78 a2822d0 Author: fonsinchen Date: Sun Dec 4 23:12:32 2011 +0100 Merge branch 'station-gui-tmp' into station-gui commit 3a187f3889a4273292ebc75d281c71bedfda3d58 Merge: 428624d a2822d0 Author: fonsinchen Date: Sun Dec 4 23:12:31 2011 +0100 Merge branch 'ext-rating-tmp' into ext-rating commit bda2a8b4e385f6876414702eca68459c2e51a617 Merge: ae301ea 26229a9 Author: fonsinchen Date: Sun Dec 4 23:12:29 2011 +0100 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 26229a9f7b2f764309d67a64405921d2b2cd2084 Merge: bc07eb3 fe8aeaa Author: fonsinchen Date: Sun Dec 4 23:12:28 2011 +0100 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit bc07eb354f23d9815d232b1bfd563e0e92048ca3 Merge: 3136cfc 32d349f Author: fonsinchen Date: Sun Dec 4 23:12:27 2011 +0100 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit fe8aeaae8a018694d39228529d57884ca61ee4eb Merge: 5cf0c10 c502701 Author: fonsinchen Date: Sun Dec 4 23:12:26 2011 +0100 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor commit 2923ff245afd7cf55ae9087c714ef2825fb7031a Merge: 537801a 17648d9 Author: fonsinchen Date: Sun Dec 4 23:12:23 2011 +0100 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit 17648d9a88ab84640b84611ce7ab2b52011e428e Merge: 3561470 32d349f Author: fonsinchen Date: Sun Dec 4 23:12:21 2011 +0100 Merge branch 'overlay-legend-tmp' into overlay-legend commit 32d349f8e864f3d188a7dba10338491c0982be5b Merge: 59164ad a2822d0 Author: fonsinchen Date: Sun Dec 4 23:12:19 2011 +0100 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit a2822d0963aaccc7fa91be45d05cf79972bbdaaa Merge: 0b9b388 26203df Author: fonsinchen Date: Sun Dec 4 23:12:17 2011 +0100 Merge branch 'cargomap-tmp' into cargomap commit 26203df84d62c843b089adda270b2dba05e4e9e8 Merge: fd49daa ba2278f Author: fonsinchen Date: Sun Dec 4 23:12:17 2011 +0100 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit fd49daa39aec56b350d193bc784019488511d1e8 Merge: 9f8f035 00bc557 Author: fonsinchen Date: Sun Dec 4 23:12:17 2011 +0100 Merge branch 'reservation' into cargomap-tmp commit 9f8f035e7453cd060bf872a67c418f0df9dde66e Merge: 6c083a7 6c1bd47 Author: fonsinchen Date: Sun Dec 4 23:12:17 2011 +0100 Merge branch 'multimap' into cargomap-tmp commit ba2278f83b0a62214273965435ac697b6065569f Merge: c933b95 c502701 Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit 00bc55744aeb10b571b462a70ce97e2bb801b4a7 Merge: 72d0269 daa314f Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'reservation-tmp' into reservation commit 6c083a733d552945b4a4b9e581b2b5294ad72d0b Merge: 983cc1f 066b92a Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'texteff' into cargomap-tmp commit daa314f18f5d113729c1c0fa3ffd063d348004da Merge: 05ac2ca c502701 Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'gitmake' into reservation-tmp commit 983cc1fd4ee71a4f43d6e2f59ab2b3ffd797b106 Merge: c0b2610 d8d6c50 Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'flowmapping-core' into cargomap-tmp commit 6c1bd47ff8359ab0ed9b009695ca34bf4678e4d8 Merge: fb7d2e1 c502701 Author: fonsinchen Date: Sun Dec 4 23:12:15 2011 +0100 Merge branch 'multimap-tmp' into multimap commit 066b92a104e71f65e99ec9f6a6fe0e0c1c6b81af Merge: 67271ca c502701 Author: fonsinchen Date: Sun Dec 4 23:12:15 2011 +0100 Merge branch 'texteff-tmp' into texteff commit d8d6c507ce218026a2a4ec9c00456b796283c9f5 Merge: 1765e2a 02b754c Author: fonsinchen Date: Sun Dec 4 23:12:15 2011 +0100 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit 02b754c1bb4376d6ba1475fe3ccc5a613f7097eb Merge: f2fae1f 9fbbec7 Author: fonsinchen Date: Sun Dec 4 23:12:14 2011 +0100 Merge branch 'mcf-tmp' into mcf commit 9fbbec773d259ce02aea5821ea330747e91dbb8e Merge: 21bd51a 6d299c1 Author: fonsinchen Date: Sun Dec 4 23:12:14 2011 +0100 Merge branch 'demands-tmp' into demands commit 6d299c17fadf6f35fc3292925ea2efd3251acf72 Merge: defc657 946d024 Author: fonsinchen Date: Sun Dec 4 23:12:14 2011 +0100 Merge branch 'components-tmp' into components commit 946d024a4049ea9cbedb7343255f7ef7d77594e5 Merge: e6bfeac ddb7ce4 Author: fonsinchen Date: Sun Dec 4 23:12:13 2011 +0100 Merge branch 'capacities-tmp' into capacities commit ddb7ce416e7ab6b6b0c9fd68bfaeeb7c3ee69061 Merge: d1d5bb3 4d9038f Author: fonsinchen Date: Sun Dec 4 23:12:13 2011 +0100 Merge branch 'moving-average' into capacities-tmp commit 4d9038f6f97bdc02a87133b71e1260f70ca0ea06 Merge: 2ceca7f aeb96a7 Author: fonsinchen Date: Sun Dec 4 23:12:13 2011 +0100 Merge branch 'moving-average-tmp' into moving-average commit aeb96a7218f396d3b782356bbc56bcc0caaf7791 Merge: ad48f49 c502701 Author: fonsinchen Date: Sun Dec 4 23:12:13 2011 +0100 Merge branch 'gitmake' into moving-average-tmp commit c50270144e768dc68f7afe6f65f0851eb3376bdf Author: fonsinchen Date: Sun Dec 4 23:12:11 2011 +0100 remove old branches commit 1670a783c83a50be40fec652e198a8bee873517f Merge: 0d0f341 0b9b388 Author: fonsinchen Date: Sun Dec 4 23:10:03 2011 +0100 Merge branch 'station-gui-tmp' into station-gui commit 0b9b38817166e5e53b922d33501cf4b415cc9fe2 Merge: 0f28d87 c0b2610 Author: fonsinchen Date: Sun Dec 4 23:09:56 2011 +0100 Merge branch 'cargomap-tmp' into cargomap Conflicts: src/economy.cpp commit c0b2610f846493a94a9c78074fda9e947a8f4f4c Merge: 72cd2ec c933b95 Author: fonsinchen Date: Sun Dec 4 23:08:48 2011 +0100 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit 72cd2ec1cf77447d07b51af89a43da079c03f897 Merge: 922883d 72d0269 Author: fonsinchen Date: Sun Dec 4 23:08:40 2011 +0100 Merge branch 'reservation' into cargomap-tmp Conflicts: src/saveload/saveload.cpp commit 922883dce6c53b0ebe41cc875d7a0fe3ef2fb290 Merge: 9ef8e15 fb7d2e1 Author: fonsinchen Date: Sun Dec 4 23:07:58 2011 +0100 Merge branch 'multimap' into cargomap-tmp commit 9ef8e1581eebaa90261b63934c6f7cf984ae54c6 Merge: 647982e 67271ca Author: fonsinchen Date: Sun Dec 4 23:07:57 2011 +0100 Merge branch 'texteff' into cargomap-tmp commit 647982e8147f18b46dff4c355e46a540da80179e Merge: 9d77d5b 1765e2a Author: fonsinchen Date: Sun Dec 4 23:07:52 2011 +0100 Merge branch 'flowmapping-core' into cargomap-tmp Conflicts: src/saveload/saveload.h commit c933b9520e9c98d033698f0a4693911064eb0217 Merge: 1edf0b6 f86ed57 Author: fonsinchen Date: Sun Dec 4 23:05:27 2011 +0100 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit 72d0269a3a4713093977d9523237e491eebdd40a Merge: edfc393 05ac2ca Author: fonsinchen Date: Sun Dec 4 23:05:21 2011 +0100 Merge branch 'reservation-tmp' into reservation Conflicts: src/saveload/saveload.cpp commit 05ac2cab369f4d8316e891b879438cfccd797970 Merge: e9dcd61 f86ed57 Author: fonsinchen Date: Sun Dec 4 23:03:21 2011 +0100 Merge branch 'gitmake' into reservation-tmp commit fb7d2e17bc2ade22e80bb6edecac5eecca407450 Merge: 421188d f86ed57 Author: fonsinchen Date: Sun Dec 4 23:03:20 2011 +0100 Merge branch 'multimap-tmp' into multimap commit 67271ca9255eaf30f281c94d08f8cb359df208ec Merge: 43d8b1b f86ed57 Author: fonsinchen Date: Sun Dec 4 23:03:17 2011 +0100 Merge branch 'texteff-tmp' into texteff commit 1765e2a1a1233a66c8585c9cb090a0223d4f61c6 Merge: 849a9dc f2fae1f Author: fonsinchen Date: Sun Dec 4 23:03:11 2011 +0100 Merge branch 'flowmapping-core-tmp' into flowmapping-core Conflicts: src/station_func.h commit f2fae1fe56dbdd9852c11aee08a082cd0c4b739b Merge: c484bc9 21bd51a Author: fonsinchen Date: Sun Dec 4 23:01:15 2011 +0100 Merge branch 'mcf-tmp' into mcf commit 21bd51a40fdbcabcafec49f366e2181b34f5441a Merge: 1838b20 defc657 Author: fonsinchen Date: Sun Dec 4 23:01:13 2011 +0100 Merge branch 'demands-tmp' into demands commit defc65786900acb8318b439c0a894f016a62f085 Merge: da10c12 e6bfeac Author: fonsinchen Date: Sun Dec 4 23:01:06 2011 +0100 Merge branch 'components-tmp' into components Conflicts: src/saveload/saveload_internal.h commit e6bfeace6a3ca6d150e0a3122b890d36a7414c5e Merge: 69857fc d1d5bb3 Author: fonsinchen Date: Sun Dec 4 22:58:50 2011 +0100 Merge branch 'capacities-tmp' into capacities Conflicts: src/core/math_func.cpp src/saveload/saveload.cpp src/station_func.h commit d1d5bb3ee09070524ee13f078d69d6f031441f80 Merge: 6804fae 2ceca7f Author: fonsinchen Date: Sun Dec 4 22:53:24 2011 +0100 Merge branch 'moving-average' into capacities-tmp commit 2ceca7fda48269132dd2864e9ee4c691c3eed540 Merge: b3c86e1 ad48f49 Author: fonsinchen Date: Sun Dec 4 22:53:22 2011 +0100 Merge branch 'moving-average-tmp' into moving-average commit ad48f49e833ee219863f3e211c4e3fdf62753719 Merge: 5a37ad5 f86ed57 Author: fonsinchen Date: Sun Dec 4 22:53:21 2011 +0100 Merge branch 'gitmake' into moving-average-tmp commit f86ed572e680d6adf91903dd809ef839bf896aca Merge: ee390f6 13f991e Author: fonsinchen Date: Sun Dec 4 22:53:20 2011 +0100 Merge branch 'master' into gitmake commit 13f991ea747d4344448b1e36bb2cd0d9c1d05577 Author: rubidium Date: Sun Dec 4 20:11:20 2011 +0000 (svn r23436) -Merge: documentation updates from 1.1 commit db41e1751ae4b96eb3b6f78fd5b8201d6c85dcda Author: rubidium Date: Sun Dec 4 19:07:24 2011 +0000 (svn r23433) -Fix [FS#4868]: recolouring of some animated colours from the windows palette went wrong commit a1f1ae6c226d8c56fcc1c4e60f66734866d5f4b6 Author: translators Date: Sun Dec 4 18:45:55 2011 +0000 (svn r23432) -Update from WebTranslator v3.0: croatian - 27 changes by VoyagerOne english_US - 25 changes by Rubidium finnish - 27 changes by jpx_ german - 25 changes by planetmaker korean - 1 changes by junho2813 romanian - 5 changes by kkmic spanish - 25 changes by Terkhen swedish - 27 changes by Zuu tamil - 90 changes by aswn commit c43cdbfc75c783a5bdce09925eaf3a399d053f27 Author: truebrain Date: Sun Dec 4 15:48:15 2011 +0000 (svn r23431) -Fix: typo in @param variable commit a7cde1ebb17e79368de55692c708020c3332382a Author: glx Date: Sun Dec 4 14:17:51 2011 +0000 (svn r23430) -Fix (r23219): also consider the old directories when playing a song commit 8576d825c7838964e7f9c1fe85d3666608600801 Author: rubidium Date: Sun Dec 4 14:00:23 2011 +0000 (svn r23429) -Fix [FS#4842]: prevent windows to be resized beyond the bounds of the (main) window commit dc3bd6020e6072dbf341158564140684094865e4 Author: michi_cc Date: Sun Dec 4 13:27:24 2011 +0000 (svn r23428) -Fix (r23415): Initial size of the infrastructure details windows was sometimes too small. commit ac150080ded6ac6e95cee86073916b4c6d184a08 Author: frosch Date: Sun Dec 4 13:21:51 2011 +0000 (svn r23427) -Fix: Do not load screen resolution and other basic stuff after bootstrap is finished. It was already loaded before, and might got changed already. commit 7e02f9072be93653b7e62bd8ccbaf2a7e545c33b Author: alberth Date: Sun Dec 4 12:11:27 2011 +0000 (svn r23426) -Change [FS#4685] (r23423): Put currency window above game options. commit e5442cd6bfea4ca4572d1cc4b5a6bc5a3e2321c7 Author: rubidium Date: Sun Dec 4 12:07:19 2011 +0000 (svn r23425) -Document [FS#4815]: why vehicles might be continuously changing speed up and down commit 91f577da3c208838c849e16c27e07c4addb2705c Author: frosch Date: Sun Dec 4 11:59:08 2011 +0000 (svn r23424) -Change: Make the company GUI somewhat smaller if there are no shareholders. commit 41730e91bf83b7ce30409c2da66927944ff58698 Author: alberth Date: Sun Dec 4 11:58:56 2011 +0000 (svn r23423) -Revert (r23421): NewGRF windows may not be moved to normal priority. commit b92c6ae0b7ea0fdb3b963e40c160f22ea405cb4e Author: rubidium Date: Sun Dec 4 11:18:43 2011 +0000 (svn r23422) -Fix [FS#4863] (r22797): the default palette setting wasn't applied correctly anymore as the configuration file is loaded after the first NewGRF scan commit 6baa785b5f081b4f34f307559dc444f54404ad0a Author: alberth Date: Sun Dec 4 10:52:08 2011 +0000 (svn r23421) -Fix [FS#4865, FS#4861] (r23393): The priority of WC_GAME_OPTIONS windows were too high, causing hiding of currency window as well. commit 030483495b8d47811e1ba01683c88acddb2d8253 Author: frosch Date: Sun Dec 4 10:47:57 2011 +0000 (svn r23420) -Change: Put the manager name directly under the picture instead of vertically centering it. commit ac1e1e3a3f87a28436c5fe903baff4471f2c3405 Author: rubidium Date: Sun Dec 4 09:15:13 2011 +0000 (svn r23419) -Fix [FS#4864] (r23316): the sprite aligner was broken as it didn't scale properly to 'GUI' scale commit 4e352df9c9186f970c77ec0dbbf539caf7f623d3 Author: rubidium Date: Sun Dec 4 08:20:01 2011 +0000 (svn r23418) -Fix [FS#4866] (r22958): saves made with the Catalan town name generator would trigger a "savegame corrupt" exception commit 0e5ade090749092f0955e11173b9ac9d79213ed6 Author: rubidium Date: Sat Dec 3 23:47:42 2011 +0000 (svn r23417) -Fix: wrong argument to printf commit 351da038ebd1316d24e614c11c399995ba8ea903 Author: michi_cc Date: Sat Dec 3 23:40:57 2011 +0000 (svn r23416) -Add: [NoAI] API for querying infrastructure costs. commit fc8633e1acda324223bca557d3d0328e3076e21e Author: michi_cc Date: Sat Dec 3 23:40:46 2011 +0000 (svn r23415) -Feature: Infrastructure maintenance costs. commit bf5ef7537e9ec05160ef92198d32939fe9a857a9 Author: michi_cc Date: Sat Dec 3 23:40:30 2011 +0000 (svn r23414) -Add: Company infrastructure counts for stations/airports. commit 796fe54a2ff393922fff2f8b44734844ef9cfaef Author: michi_cc Date: Sat Dec 3 23:40:23 2011 +0000 (svn r23413) -Add: Company infrastructure counts for canals. commit 7a6b45c1335442f47491b5e5dd067505ac38e457 Author: michi_cc Date: Sat Dec 3 23:40:18 2011 +0000 (svn r23412) -Add: Company infrastructure counts for road. commit 85ec2f07af38bdabb80f66f790716cc4cf8f8f9c Author: michi_cc Date: Sat Dec 3 23:40:13 2011 +0000 (svn r23411) -Add: Company infrastructure counts for rail. commit b68ced52c43f1d72077a1e507ea8247e8bae68ee Author: michi_cc Date: Sat Dec 3 23:40:08 2011 +0000 (svn r23410) -Add: A window with a detailed overview over the infrastructure of a company. commit cc680fbfa5a9b17c3808fcae9f7053cdb4278bd4 Author: glx Date: Sat Dec 3 22:34:15 2011 +0000 (svn r23409) -Change: reorder files in langs project commit 29fae5aaaf9aaf51837852f3e12584c86d99297f Author: terkhen Date: Sat Dec 3 22:26:30 2011 +0000 (svn r23408) -Feature: Allow to create subsidies for any combination of source and destination types. -Change: Do not rely in TownEffects for awarding subsidies. commit a6557b4f0967c4bd1689530e34655133f27491f8 Author: terkhen Date: Sat Dec 3 22:23:10 2011 +0000 (svn r23407) -Codechange: Keep a bitmap of all cargos accepted by towns. commit ad555a4cb2cf9f259c85ee7f6e0d247bc07a8763 Author: terkhen Date: Sat Dec 3 22:22:25 2011 +0000 (svn r23406) -Change: Run the monthly subsidy loop after cargo acceptance has been calculated. commit a9cc00bf6800131e86952dff625435204239a31d Author: terkhen Date: Sat Dec 3 22:21:27 2011 +0000 (svn r23405) -Codechange: Keep a matrix of cargos accepted by houses for each town (michi_cc). commit 03db6e6df160c0fb3896eeee8bbebf832810e3bd Author: terkhen Date: Sat Dec 3 22:19:09 2011 +0000 (svn r23404) -Add: Tilematrix structure (michi_cc). commit fa210ceace46e5e7e9fddb1116029afb74dd2c46 Author: terkhen Date: Sat Dec 3 20:19:33 2011 +0000 (svn r23402) -Add: Function to check if a TileArea contains a tile. (michi_cc) commit f41586224f3ff75e7167644cec8ec358b2c5e75c Author: translators Date: Sat Dec 3 18:45:12 2011 +0000 (svn r23401) -Update from WebTranslator v3.0: korean - 1 changes by junho2813 serbian - 17 changes by etran commit 5665252eff4c6ccfa88ce63f9082736e350f9eff Author: planetmaker Date: Sat Dec 3 14:45:02 2011 +0000 (svn r23400) -Fix (r23393, r23382): Text query window was hidden in numerous cases commit 36ca7fea791a02bcbb480708633633c1c44c99c9 Author: truebrain Date: Fri Dec 2 23:40:32 2011 +0000 (svn r23399) -Fix (r23362): a randomizer should return a random value, not always the first commit a9531da713890bdd81698096d280d6a8c36ecd01 Author: truebrain Date: Fri Dec 2 23:40:24 2011 +0000 (svn r23398) -Fix: the AIEvent.ET_COMPANY_NEW was only triggered if a company named itself, which seems like a very odd place to do so. Trigger it when the company is created instead commit 974f1ee8d15b3d97efd81c29981af1d7b545aa22 Author: truebrain Date: Fri Dec 2 23:40:16 2011 +0000 (svn r23397) -Change: remove the AI_ prefix from all AIEvent enums commit c3ae66089a30b66cc44391b3c98607dc84e0f753 Author: truebrain Date: Fri Dec 2 23:40:09 2011 +0000 (svn r23396) -Fix: squirrel export script did not ignore Doxygen blocks, causing funny results in some corner cases commit 72f8aa94cc56643fab7f534c26c5b538ed194834 Author: rubidium Date: Fri Dec 2 19:58:34 2011 +0000 (svn r23395) -Fix [FS#4862]: a character that is path of the 'normal' fonts, but relocated after loading, was missing for the monospace font commit a43428dfe438329c25855be75fd479752eaafbfe Author: translators Date: Fri Dec 2 18:45:23 2011 +0000 (svn r23394) -Update from WebTranslator v3.0: german - 2 changes by planetmaker italian - 2 changes by lorenzodv russian - 2 changes by Lone_Wolf spanish - 2 changes by Terkhen commit 523d781cbc80d6701916545c241e1a72111ec62c Author: yexo Date: Fri Dec 2 11:48:54 2011 +0000 (svn r23393) -Fix (r23382): AI / NewGRF sub-windows were now hidden under their parent windows commit b78549d43b2080245f676ddb4112caf64ebaebc6 Author: yexo Date: Thu Dec 1 22:23:13 2011 +0000 (svn r23392) -Fix: [NoAI] assigning 'null' to an AIList element to remove it didn't work commit d765d3ac2e36db0174bc1f387b1dbdeb9e9615d6 Author: rubidium Date: Thu Dec 1 19:42:51 2011 +0000 (svn r23391) -Feature: [NewGRF] Allow translating multiple languages with Action 13 in GRFv8 commit f6b31c6bd3989ab99c18bf32fdad9149d1f384f6 Author: translators Date: Thu Dec 1 18:45:32 2011 +0000 (svn r23390) -Update from WebTranslator v3.0: belarusian - 2 changes by Wowanxm dutch - 2 changes by habell english_US - 2 changes by Rubidium finnish - 2 changes by jpx_ french - 2 changes by glx polish - 1 changes by Spankin