commit d043d6d10beee392076ec9a2f636927f11426085 Merge: a91a390 68dd975 Author: fonsinchen Date: Sat Dec 10 19:36:04 2011 +0100 Merge branch 'station-gui' into cd-tmp commit a91a3907135e2d369dce7efa550c0d18f0bd493b Merge: 473f8bf 017f8b4 Author: fonsinchen Date: Sat Dec 10 19:36:04 2011 +0100 Merge branch 'ext-rating' into cd-tmp commit 473f8bf472a968b60f76ab046bcbde98504b4b37 Merge: 3b9dbe6 2c55475 Author: fonsinchen Date: Sat Dec 10 19:36:04 2011 +0100 Merge branch 'smallmap-overlay' into cd-tmp commit 3b9dbe6eb3f408fbf68b9e67c92296f1039bd1c4 Merge: 70863e4 813702a Author: fonsinchen Date: Sat Dec 10 19:36:03 2011 +0100 Merge branch 'viewport-overlay' into cd-tmp commit 68dd97599f7d3b5b73add044418befd36efe1e03 Merge: 108df16 67ee709 Author: fonsinchen Date: Sat Dec 10 19:36:01 2011 +0100 Merge branch 'station-gui-tmp' into station-gui commit 017f8b4c702f2b0d944d6e941fa3b26906821f0b Merge: 3a187f3 67ee709 Author: fonsinchen Date: Sat Dec 10 19:36:00 2011 +0100 Merge branch 'ext-rating-tmp' into ext-rating commit 2c5547569f85dd56f26a4b9be6520339872518c6 Merge: bda2a8b 593c779 Author: fonsinchen Date: Sat Dec 10 19:35:58 2011 +0100 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 593c779c732e5597880204b592334759043ab4e0 Merge: 90c0daa 462d1f2 Author: fonsinchen Date: Sat Dec 10 19:35:57 2011 +0100 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit 90c0daa30364e5b87fbc72b5360d5832ce14d38a Merge: 26229a9 d4dc4a4 Author: fonsinchen Date: Sat Dec 10 19:35:57 2011 +0100 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit 462d1f2108ac6453d3650c175d38260d781edd1b Merge: fe8aeaa 4aad5b1 Author: fonsinchen Date: Sat Dec 10 19:35:55 2011 +0100 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor commit 813702a25dab8b28ee1b70ca9832538b5882ee24 Merge: 2923ff2 d43ecb5 Author: fonsinchen Date: Sat Dec 10 19:35:54 2011 +0100 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit d43ecb505199b0777f254dd2e7569e5408085135 Merge: 17648d9 d4dc4a4 Author: fonsinchen Date: Sat Dec 10 19:35:52 2011 +0100 Merge branch 'overlay-legend-tmp' into overlay-legend commit d4dc4a43954d2428d45cefc12880048f0040e194 Merge: 32d349f 67ee709 Author: fonsinchen Date: Sat Dec 10 19:35:51 2011 +0100 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit 67ee709c724cb85298b11b42bb6a41e747a8aa62 Merge: a2822d0 4248d7b Author: fonsinchen Date: Sat Dec 10 19:35:49 2011 +0100 Merge branch 'cargomap-tmp' into cargomap commit 4248d7b12ceb5a372f6c1d9512a07a10dae07c2a Merge: 2c3b1d7 8bbf146 Author: fonsinchen Date: Sat Dec 10 19:35:48 2011 +0100 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit 2c3b1d73bc80f87f0200a04f133995bc08e9a470 Merge: fc1f7e2 3512e82 Author: fonsinchen Date: Sat Dec 10 19:35:48 2011 +0100 Merge branch 'reservation' into cargomap-tmp commit fc1f7e247a2c08b7414854e14e78d8e7d1c8b933 Merge: 704b6ca 972e373 Author: fonsinchen Date: Sat Dec 10 19:35:48 2011 +0100 Merge branch 'multimap' into cargomap-tmp commit 704b6ca39a76d392aed8c6b0f38d76330b0e4afc Merge: fd19700 dca43be Author: fonsinchen Date: Sat Dec 10 19:35:48 2011 +0100 Merge branch 'texteff' into cargomap-tmp commit fd19700d2ce173b80225e746836e06a5ccd454b5 Merge: 26203df 0c3d052 Author: fonsinchen Date: Sat Dec 10 19:35:47 2011 +0100 Merge branch 'flowmapping-core' into cargomap-tmp commit 8bbf146518603d30cc0272667ccc4117630a8ade Merge: ba2278f 4aad5b1 Author: fonsinchen Date: Sat Dec 10 19:35:46 2011 +0100 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit 3512e8295cfb08f6c9c525aae04f22585589d0fd Merge: 00bc557 dd35f81 Author: fonsinchen Date: Sat Dec 10 19:35:44 2011 +0100 Merge branch 'reservation-tmp' into reservation commit dd35f81fca5af4ff8b8ac706b8d8c841f7071173 Merge: daa314f 4aad5b1 Author: fonsinchen Date: Sat Dec 10 19:35:43 2011 +0100 Merge branch 'gitmake' into reservation-tmp commit 972e3737f4fd63c4fc0b1942ba35af2189c7acc0 Merge: 6c1bd47 4aad5b1 Author: fonsinchen Date: Sat Dec 10 19:35:42 2011 +0100 Merge branch 'multimap-tmp' into multimap commit dca43bef72296296ce8800d0e578f6c4769f252b Merge: 066b92a 4aad5b1 Author: fonsinchen Date: Sat Dec 10 19:35:41 2011 +0100 Merge branch 'texteff-tmp' into texteff commit 0c3d052da31e47035bd7d16ad65836eb09e063e3 Merge: d8d6c50 1e7ffb9 Author: fonsinchen Date: Sat Dec 10 19:35:38 2011 +0100 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit 1e7ffb91e4547aed341ecf83b9f9c85d1f64b60f Merge: 02b754c 97911cf Author: fonsinchen Date: Sat Dec 10 19:35:36 2011 +0100 Merge branch 'mcf-tmp' into mcf commit 97911cf9e45fb27791d8e9449578cb5f763a9027 Merge: 9fbbec7 71255ef Author: fonsinchen Date: Sat Dec 10 19:35:33 2011 +0100 Merge branch 'demands-tmp' into demands commit 71255efce98fcacd51c5b46044ed1e5c3d71f19d Merge: 6d299c1 fa6e4d3 Author: fonsinchen Date: Sat Dec 10 19:35:29 2011 +0100 Merge branch 'components-tmp' into components commit fa6e4d3bb2df18840199c7f6520b07bcc06e6cce Merge: 0854201 96726c3 Author: fonsinchen Date: Sat Dec 10 19:35:15 2011 +0100 Merge branch 'capacities-tmp' into capacities Conflicts: src/station_base.h commit 96726c3c3c7def9cf45c6730fa83ecb15b02bcf9 Merge: ddb7ce4 3e63f1a Author: fonsinchen Date: Sat Dec 10 19:32:14 2011 +0100 Merge branch 'moving-average' into capacities-tmp commit 3e63f1aa68abed40fca0395d6cc2c94e8d61cf52 Merge: 4d9038f f977752 Author: fonsinchen Date: Sat Dec 10 19:32:12 2011 +0100 Merge branch 'moving-average-tmp' into moving-average commit f977752ded1ee7323cbb20dd8a1719ed574b52ad Merge: aeb96a7 4aad5b1 Author: fonsinchen Date: Sat Dec 10 19:32:12 2011 +0100 Merge branch 'gitmake' into moving-average-tmp commit 4aad5b17264826ff3f556155a2fbb0b327330ae0 Merge: c502701 4159371 Author: fonsinchen Date: Sat Dec 10 19:32:11 2011 +0100 Merge branch 'master' into gitmake commit 0854201acc8becd231a542e8da58b52cdd04730d Author: fonsinchen Date: Sat Dec 10 19:31:49 2011 +0100 don't try to update next hop stats for empty order list commit 4159371e3e2ae4f2e65d87bb757bb78fcc38e1d8 Author: michi_cc Date: Sat Dec 10 16:54:46 2011 +0000 (svn r23482) -Change: [Win32] Move re-painting the window and doing palette animation into a separate thread. commit 62ea921e2f6236381a01b914f437b146b134e945 Author: michi_cc Date: Sat Dec 10 16:54:41 2011 +0000 (svn r23481) -Add: Function to get the CPU core count. commit c3440658e81adcda9c95d9bf84459128b59939e2 Author: rubidium Date: Sat Dec 10 16:05:26 2011 +0000 (svn r23480) -Fix [FS#4594]: replace OS error messages with internal error messages when that's possible commit c7d2c294fcf0698fa80b4c629b357fa9e613bc27 Author: rubidium Date: Sat Dec 10 16:04:32 2011 +0000 (svn r23479) -Codechange: keep a copy of raw strings from the parameters of the error messages commit 87045ae4ee63efdce5cb755e920ecfa025af3e95 Author: rubidium Date: Sat Dec 10 16:03:12 2011 +0000 (svn r23478) -Codechange: add a method to copy string parameters *and* its raw strings commit 9b81a5db97e3fe0a3339ede74e01b0266dfe7b3f Author: rubidium Date: Sat Dec 10 15:41:39 2011 +0000 (svn r23477) -Fix [FS#4878] (r23300): like r23342, but now for the user interface ;) commit 56f37d9386e2787fbda94cefc1c1e4a8bca89833 Author: rubidium Date: Sat Dec 10 15:16:58 2011 +0000 (svn r23476) -Codechange: use the error queue to replace switch mode error strings, again making it possible to return multiple errors commit 43e78a88ca6879826f397c5b87b46cd95765de68 Author: rubidium Date: Sat Dec 10 15:14:11 2011 +0000 (svn r23475) -Codechange: queue critical error messages, so when multiple happen you won't miss any commit 9aab2dc861ba8fd4dfabf63ff2ebb51d5261ef85 Author: rubidium Date: Sat Dec 10 13:54:10 2011 +0000 (svn r23474) -Codechange: move the declaration error related functions to error.h commit 3ea7690ae7f0dfd70f334bd39501ec96819f9cbd Author: rubidium Date: Sat Dec 10 12:57:30 2011 +0000 (svn r23473) -Codechange: refactor the error message data into a separate structure commit 30eee4db4e47f9b64425cb73e7fc25d38f0bf292 Author: rubidium Date: Sat Dec 10 12:56:37 2011 +0000 (svn r23472) -Fix [FS#4877]: the monospace font broke the bootstrap GUI's ability to find a font commit b9a1468fde84322fdafe61d01e049c590575f3e6 Author: rubidium Date: Sat Dec 10 08:49:42 2011 +0000 (svn r23471) -Codechange: move the error related code out of misc_gui.cpp into error_gui.cpp commit daba7e588a9ca515988439993350a7a9264dcfa7 Author: rubidium Date: Sat Dec 10 08:31:14 2011 +0000 (svn r23470) -Codechange: move declaration of SwitchToMode to a header instead of declaring it in 6 other files commit 3ab6652a5453e459fb585064bd741db80006919d Author: yexo Date: Sat Dec 10 01:49:50 2011 +0000 (svn r23469) -Fix (r23468): gcc warning about initialization order commit 78d5ec5aa6ee0a833ff508866d185644c26e9099 Author: yexo Date: Sat Dec 10 00:01:28 2011 +0000 (svn r23468) -Feature [FS#4827]: when looking for missing content, automatically select it so you can easily start the download commit 9070d4824ffd40009dce27e1e103399954c6a7aa Author: yexo Date: Fri Dec 9 22:44:06 2011 +0000 (svn r23467) -Feature [FS#4827]: automatically close the online content window after confirming the download with 'ok' commit 330ea6f27785363329b16aa37b1f1b3e77614571 Author: rubidium Date: Fri Dec 9 22:07:00 2011 +0000 (svn r23466) -Fix [FS#4871, FS#4874]: assertion triggered when resizing a window during ReInit by an amount that's not a multiple of the resize interval commit 442caecab099d51851127bb235dbbbb104bbf78e Author: yexo Date: Fri Dec 9 21:49:52 2011 +0000 (svn r23465) -Feature [FS#4827]: add 'find missing content online' button to 'load savegame' and 'find network game' windows commit 700c1682ce388978def147046c9191fc3c46fb53 Author: rubidium Date: Fri Dec 9 20:48:13 2011 +0000 (svn r23464) -Fix [FS#4876]: clear the backed up orders of a removed station as well, otherwise one could create orders to a station that was never in the original backupped orders. For example a road vehicle trying to go to a buoy. commit 15899c37cea9fbc813b48cd4fa203d3e03e2f4f5 Author: yexo Date: Fri Dec 9 20:27:59 2011 +0000 (svn r23463) -Fix (r23461): unused variable commit f883f466843e4a42e7ca56bb3f25138661aa70e3 Author: yexo Date: Fri Dec 9 19:53:42 2011 +0000 (svn r23462) -Codechange: use AirportTileTableIterator in a few more places to make the code easier to read commit a8f0dfd5bec9b210aadf58ef1bd526bfddfa422a Author: yexo Date: Fri Dec 9 19:30:30 2011 +0000 (svn r23461) -Fix: handle a missing airport newgrf as graceful as possible by not crashing when loading such savegame or when an airport is removed commit a9b1cddbb34ec361906c30b35493d6f33fcadb81 Author: translators Date: Fri Dec 9 18:45:15 2011 +0000 (svn r23460) -Update from WebTranslator v3.0: czech - 42 changes by ReisRyos brazilian_portuguese - 33 changes by Tucalipe urdu - 154 changes by haider commit e24dc59bc59deaa81dcad9feccb43e479dc64be0 Author: yexo Date: Fri Dec 9 17:14:03 2011 +0000 (svn r23459) -Fix: don't crash trying to draw airport tiles when the airport grf is missing commit 20f83ba002458a7863a521308e2d7de830ba2cb6 Author: yexo Date: Fri Dec 9 16:12:38 2011 +0000 (svn r23458) -Fix: don't assume all industries that cut trees have tile 0,0 -Fix: wait until all tiles of an industry are completed before starting to cut trees commit e98786e15de93488caab4012d6abb08fd8cdcd9c Author: yexo Date: Fri Dec 9 16:11:42 2011 +0000 (svn r23457) -Codechange: introduce Industry::TileBelongsToIndustry() to simplify code checking for that commit 4e9e15a3f339e4ec5ba88ce39e32c8b9ad5cb4de Author: yexo Date: Fri Dec 9 15:16:21 2011 +0000 (svn r23456) -Fix (r23441): oilrigs don't have any layouts nor do they provide airport noise commit f9f4a120b27cbef5fbd7c17f72f8a8a549e028a5 Author: truebrain Date: Fri Dec 9 15:06:14 2011 +0000 (svn r23455) -Fix (r23438): send the stderr in the right part to /dev/null commit 001b76c50bbaec8205955e7a9a4a0826c723945f Author: peter1138 Date: Fri Dec 9 08:10:15 2011 +0000 (svn r23454) -Change: Mark company window dirty when moving a rail engine creates or deletes a train. commit 15dc9acb01962d16f8e97754ec027855809bf8b6 Author: yexo Date: Thu Dec 8 23:28:43 2011 +0000 (svn r23453) -Add: [NoAI] AIStation.GetStationCoverageRadius(StationID) commit 4430cadfa13d594a186ad7644549247e3808fbb3 Author: yexo Date: Thu Dec 8 23:28:02 2011 +0000 (svn r23452) -Codechange: document instead of writing to stderr that ScriptStation::GetCoverageRadius doesn't work for STATION_AIRPORT commit 2c07e9cae86b7e8e4cf56a55f31d02baf8b716c7 Author: rubidium Date: Thu Dec 8 20:01:31 2011 +0000 (svn r23451) -Codechange: [SDL] Move 32bpp-anim palette animation to the draw thread instead of the single threaded bit of the game loop. This causes a speedup of up to 15% when animation is turned on with the 32bpp-anim blitter commit 824f27368e70419e7a760b9eaa59db439971d063 Author: frosch Date: Thu Dec 8 19:49:29 2011 +0000 (svn r23450) -Fix (r23449): Forgot unfinished languages. commit 24a8f07848c42a2551a596fab22f7fa8d9ff7777 Author: frosch Date: Thu Dec 8 19:47:45 2011 +0000 (svn r23449) -Fix (r23140): Wrong parameters in error message. commit e6c46d4cf4574e51b5f3e548bd94d0221657510b Author: rubidium Date: Thu Dec 8 19:37:33 2011 +0000 (svn r23448) -Fix: keep a local copy of the palette in the 32bpp animated blitter so changes of the palette data during the game don't influence drawing (with SDL) commit 636ac3c0419e24086757fa7e9b346e46f71bffb7 Author: translators Date: Thu Dec 8 18:45:30 2011 +0000 (svn r23447) -Update from WebTranslator v3.0: catalan - 42 changes by arnau dutch - 1 changes by Jacco011 polish - 26 changes by matma6 brazilian_portuguese - 27 changes by Tucalipe urdu - 150 changes by haider commit a531ec189910dee5b1c530500dccd76fa72a2677 Author: rubidium Date: Thu Dec 8 18:13:29 2011 +0000 (svn r23446) -Codechange: move _cur_palette and it's related first/count dirty variables into a single structure commit 1e38f50be135a41563852d0905a82f930061c933 Author: rubidium Date: Wed Dec 7 21:09:10 2011 +0000 (svn r23445) -Fix [FS#4715]: document behaviour with aircraft/ships poking outside of the depot before getting hidden commit 1f42b6fc2f5f04d4fa84b264cfd1763023e1553f Author: translators Date: Wed Dec 7 18:45:05 2011 +0000 (svn r23444) -Update from WebTranslator v3.0: urdu - 92 changes by haider commit 8b9d2a8a47a33d2e9af512221323638e154516df Author: frosch Date: Wed Dec 7 18:41:38 2011 +0000 (svn r23443) -Fix (r23413): Building of locks in SE failed. commit 0073f59ebfcbdcc1d79dc36d7f5045379c587f11 Author: rubidium Date: Wed Dec 7 16:01:43 2011 +0000 (svn r23442) -Fix [FS#4511]: document that some video card drivers have trouble going to 8bpp mode commit bff33e348cc362927d614ce320c05d81642d9db4 Author: rubidium Date: Tue Dec 6 21:02:57 2011 +0000 (svn r23441) -Fix [FS#4764]: some airport functions didn't take the layout into account resulting in wrong noise levels or nearests towns (patch by Zuu) commit f90dcddd3fb0a66b2a785da8312a79d2a4ec92d2 Author: translators Date: Tue Dec 6 18:46:15 2011 +0000 (svn r23440) -Update from WebTranslator v3.0: estonian - 35 changes by hellohboy french - 25 changes by glx hungarian - 35 changes by Brumi italian - 2 changes by lorenzodv japanese - 4 changes by ikanotheokara korean - 21 changes by junho2813 luxembourgish - 99 changes by Phreeze tamil - 37 changes by aswn urdu - 4 changes by haider commit 5677505b3faab284041c9aa7dc2c49f84ddc614f Author: yexo Date: Tue Dec 6 15:09:02 2011 +0000 (svn r23439) -Fix: Use the DEBUG macro to output the reason for a compile failure in info.nut instead of printing it directly to stderr commit 8ffe63764b83fefd37c431b5eaa32ac8a7a681a5 Author: rubidium Date: Mon Dec 5 20:11:42 2011 +0000 (svn r23438) -Fix [FS#4867]: perform checks for nforenum/grfcodec in configure, including a version check so a proper error can be given when a too old grfcodec or nforenum is used commit 434e1e16397e1f86f2862b6dd2d7e8f7fa23675c Author: translators Date: Mon Dec 5 18:46:07 2011 +0000 (svn r23437) -Update from WebTranslator v3.0: belarusian - 27 changes by Wowanxm dutch - 25 changes by habell finnish - 1 changes by jpx_ italian - 25 changes by lorenzodv korean - 24 changes by junho2813 romanian - 22 changes by kkmic russian - 28 changes by Lone_Wolf, akasoft tamil - 29 changes by aswn vietnamese - 5 changes by nglekhoi 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 daa314f18f5d113729c1c0fa3ffd063d348004da Merge: 05ac2ca c502701 Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'gitmake' into reservation-tmp commit 6c083a733d552945b4a4b9e581b2b5294ad72d0b Merge: 983cc1f 066b92a Author: fonsinchen Date: Sun Dec 4 23:12:16 2011 +0100 Merge branch 'texteff' into cargomap-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 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 946d024a4049ea9cbedb7343255f7ef7d77594e5 Merge: e6bfeac ddb7ce4 Author: fonsinchen Date: Sun Dec 4 23:12:13 2011 +0100 Merge branch 'capacities-tmp' into capacities 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