commit 7c20bfc00ba0c5dcf252566c985c9663653964be Merge: c49f83f 5250ce1 Author: fonsinchen Date: Thu Jan 5 19:32:52 2012 +0100 Merge branch 'station-gui' into cd-tmp commit c49f83f88629c973fde5d38c4a0650dc638f68ec Merge: c90c50f 263a9e1 Author: fonsinchen Date: Thu Jan 5 19:32:52 2012 +0100 Merge branch 'ext-rating' into cd-tmp commit c90c50f1f4b7997a1a7751ad9595d5ef096993df Merge: 242c30c 1aa3380 Author: fonsinchen Date: Thu Jan 5 19:32:51 2012 +0100 Merge branch 'smallmap-overlay' into cd-tmp commit 242c30c7c9bcf9201ce7f832fd73b0e0effead0c Merge: d11dc6f 24b4716 Author: fonsinchen Date: Thu Jan 5 19:32:51 2012 +0100 Merge branch 'viewport-overlay' into cd-tmp commit 5250ce1bfc1b1160683d8803120da10e8b2ec957 Merge: 80e6ae9 09eada8 Author: fonsinchen Date: Thu Jan 5 19:32:50 2012 +0100 Merge branch 'station-gui-tmp' into station-gui commit 263a9e1b994bb2de40cd0dd42aeb664760b91b8f Merge: 0f13605 09eada8 Author: fonsinchen Date: Thu Jan 5 19:32:48 2012 +0100 Merge branch 'ext-rating-tmp' into ext-rating commit 1aa3380b73232127e0c4eefb74ffacaa912dda6a Merge: fc5e8a4 5d59aa8 Author: fonsinchen Date: Thu Jan 5 19:32:46 2012 +0100 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 5d59aa843dd2864a946bb35a185fa4e8522a4854 Merge: ff8ed2d ab47e37 Author: fonsinchen Date: Thu Jan 5 19:32:45 2012 +0100 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit ff8ed2dd4abe14d8ac7cd3551fe6323a99eabb41 Merge: 0675a94 5a5060a Author: fonsinchen Date: Thu Jan 5 19:32:44 2012 +0100 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit ab47e37ba51b603c20628a54eef688eed60635c5 Merge: 8c1465e 99b3af1 Author: fonsinchen Date: Thu Jan 5 19:32:43 2012 +0100 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor commit 24b47164efe5ac69eadbd43242d0b39961798e29 Merge: 4f31a16 1cfb246 Author: fonsinchen Date: Thu Jan 5 19:32:42 2012 +0100 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit 1cfb24699588fe3fe7f0a5ea7cfc4286e3fe1673 Merge: 474c106 5a5060a Author: fonsinchen Date: Thu Jan 5 19:32:40 2012 +0100 Merge branch 'overlay-legend-tmp' into overlay-legend commit 5a5060abb99e7ecf7c3b9d3a519595c012575568 Merge: 43d4b90 09eada8 Author: fonsinchen Date: Thu Jan 5 19:32:38 2012 +0100 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit 09eada89207b8f239034dc2f98142194f4f6e7e8 Merge: 30089f7 c1564a1 Author: fonsinchen Date: Thu Jan 5 19:32:36 2012 +0100 Merge branch 'cargomap-tmp' into cargomap commit c1564a1e37b72680b385032982a214db8e0317d6 Merge: efcdd79 52de638 Author: fonsinchen Date: Thu Jan 5 19:32:36 2012 +0100 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit efcdd79e3bca2debc372d3d1bca573841f15f6b4 Merge: 27b619a bbfcaa9 Author: fonsinchen Date: Thu Jan 5 19:32:35 2012 +0100 Merge branch 'reservation' into cargomap-tmp commit 27b619aa5709bb71d60ebbc79c75b8185a7ad2bc Merge: f1e9f0b 75f8ea8 Author: fonsinchen Date: Thu Jan 5 19:32:35 2012 +0100 Merge branch 'multimap' into cargomap-tmp commit f1e9f0b5e9d1d57ecc9a266823cbb04d5c02fc8a Merge: d463b06 ef837a1 Author: fonsinchen Date: Thu Jan 5 19:32:35 2012 +0100 Merge branch 'texteff' into cargomap-tmp commit d463b067a071bd1a93f0f2032074b3e1f00d4baa Merge: 1941898 6bb0072 Author: fonsinchen Date: Thu Jan 5 19:32:34 2012 +0100 Merge branch 'flowmapping-core' into cargomap-tmp commit 52de6384783a55dcdd60b4c131054c3eeb7676b5 Merge: c229d43 99b3af1 Author: fonsinchen Date: Thu Jan 5 19:32:33 2012 +0100 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit bbfcaa9aec44f84046d3bd21a98b3e8f526e5a8c Merge: fac0f4b 99b3af1 Author: fonsinchen Date: Thu Jan 5 19:32:32 2012 +0100 Merge branch 'reservation-tmp' into reservation commit 75f8ea8c0e12fd1d8fe47462502a618a3a18614c Merge: dc04da7 99b3af1 Author: fonsinchen Date: Thu Jan 5 19:32:30 2012 +0100 Merge branch 'multimap-tmp' into multimap commit ef837a1cb27817e189bf2b79c3f77080f1b83fd1 Merge: 4a0fca3 99b3af1 Author: fonsinchen Date: Thu Jan 5 19:32:28 2012 +0100 Merge branch 'texteff-tmp' into texteff commit 6bb0072b11e5e67fe79799d798707cdbfb185916 Merge: a1baffe f1676c1 Author: fonsinchen Date: Thu Jan 5 19:32:26 2012 +0100 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit f1676c1e8b0a4a98c52886609555ecbfcb2f8c2a Merge: a575185 0d0a2f0 Author: fonsinchen Date: Thu Jan 5 19:32:24 2012 +0100 Merge branch 'mcf-tmp' into mcf commit 0d0a2f0197500932460dae393874bdb1fca86197 Merge: fcf2150 45bd669 Author: fonsinchen Date: Thu Jan 5 19:32:23 2012 +0100 Merge branch 'demands-tmp' into demands commit 45bd669e3f839e39e0b810c1bffb4960e87f2f29 Merge: ff1ced0 fa9d09c Author: fonsinchen Date: Thu Jan 5 19:32:21 2012 +0100 Merge branch 'components-tmp' into components commit fa9d09c095134de48ec53c58d8396af0d9a11e88 Merge: 4d29877 216f34b Author: fonsinchen Date: Thu Jan 5 19:32:14 2012 +0100 Merge branch 'capacities-tmp' into capacities Conflicts: src/station_base.h src/station_func.h src/vehicle_cmd.cpp commit 216f34b42d767aa5faa48fe716cf9b40756e9056 Merge: e93b705 99b3af1 Author: fonsinchen Date: Thu Jan 5 19:17:42 2012 +0100 Merge branch 'moving-average-tmp' into moving-average commit 99b3af121221790d8df495f64e31c994433ab7aa Merge: 57148b3 1481ae6 Author: fonsinchen Date: Thu Jan 5 19:17:40 2012 +0100 Merge branch 'master' into gitmake commit 1481ae689984edd21b279d2af9d6d4e789e4a6f9 Author: rubidium Date: Thu Jan 5 17:08:49 2012 +0000 (svn r23754) -Fix (r23752): the locks aren't reentrant commit b3fb593eb156fcd154e0860d1f642373e0c468f4 Author: rubidium Date: Thu Jan 5 06:14:08 2012 +0000 (svn r23753) -Fix [FS#4952]: use plurals for the infrastructure stats commit 22be2a7f4334b8746b172a5a64476254300e7301 Author: rubidium Date: Wed Jan 4 22:11:26 2012 +0000 (svn r23752) -Fix [FS#4938]: missing locking causing crash is extreme case when being in the MP lobby commit f8faaebaf03994e09f4f93e336ef1e94cd4b3c54 Author: rubidium Date: Wed Jan 4 22:08:43 2012 +0000 (svn r23751) -Codechange: rename NetworkUDPGameLoop to a more descriptive name, and move the UDP specific bits to network_udp commit 24534562753ce49504e6fb52dc05770fca6276ae Author: translators Date: Wed Jan 4 18:45:54 2012 +0000 (svn r23750) -Update from WebTranslator v3.0: belarusian - 19 changes by Wowanxm croatian - 19 changes by VoyagerOne english_AU - 20 changes by tomas4g italian - 20 changes by lorenzodv lithuanian - 161 changes by BlinK_ norwegian_bokmal - 22 changes by eloekset, mantaray norwegian_nynorsk - 32 changes by eloekset vietnamese - 5 changes by nglekhoi welsh - 19 changes by kazzie commit cc9e7f07dcfcb18d3dbcfc050d27df8f6b907edc Author: michi_cc Date: Wed Jan 4 00:45:36 2012 +0000 (svn r23749) -Fix: [Win32] Work around a possible deadlock when initialising threaded drawing. commit e3e7375c6d52d06713fff740acb668f95a32bc99 Author: frosch Date: Tue Jan 3 23:53:53 2012 +0000 (svn r23748) -Fix: Make vehicle variables A8 and A9 always return 0. Returning cur_image is a potential desyncer due to Action1 in static NewGRFs. commit 10b9faf2f014bb3c431616cd926272386043d019 Author: truebrain Date: Tue Jan 3 23:13:53 2012 +0000 (svn r23747) -Fix (r23746): forgot one more case commit a13070307350d854eb0809b251573cd2dccad1e6 Author: truebrain Date: Tue Jan 3 23:09:48 2012 +0000 (svn r23746) -Fix: also set 'info' to NULL if 'instance' dies (for both AI and GS); avoids invalid memory reads commit 9317aad5ee1bd5a067e83eca75d68b77d0ca2368 Author: frosch Date: Tue Jan 3 23:08:15 2012 +0000 (svn r23745) -Fix (r23087): If autorefit fails, count the vehicle capacity nevertheless, if it is already carrying the right thing. commit 0c237c337c591f7b137dd2948bf1a21335c9b171 Author: frosch Date: Tue Jan 3 22:36:35 2012 +0000 (svn r23744) -Fix (r23142) [FS#4923]: Check the version of the right GRF. commit 8b7143ef886c71bd056dc5f20f8cb5754152c225 Author: frosch Date: Tue Jan 3 22:04:12 2012 +0000 (svn r23743) -Fix [FS#4906]: Call CB 15E for all vehicles before actually executing any refit. commit 1117c9cd9520fcd99aeaa00052f36b3f9cc5d881 Author: rubidium Date: Tue Jan 3 21:58:26 2012 +0000 (svn r23742) -Revert (r23735): for some reason gcc-trunk is more picky than basically everything else :( commit 3481ca0f57aaf4e2c80d628202962fd909d953bc Author: rubidium Date: Tue Jan 3 21:47:01 2012 +0000 (svn r23741) -Revert (r23740): the few parts that the Windows / non-network compiles stumble on commit d5eeab43b7c03a93b3d0ea0fd42c12b0e59a46e2 Author: rubidium Date: Tue Jan 3 21:32:51 2012 +0000 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files commit d76c2ff76e4cbb6140f0f0564685c634b15a434c Author: truebrain Date: Tue Jan 3 20:41:38 2012 +0000 (svn r23739) -Fix (r23738): owh vim, when can you learn to copy/paste tabs correctly? commit d3567c0ac33660ce5b723849ecebc5316019b602 Author: truebrain Date: Tue Jan 3 20:38:41 2012 +0000 (svn r23738) -Fix (r23731): forgot to sync the new window with the script API commit 8344d3f01bf957ea9c63fb1656d877017b69b600 Author: truebrain Date: Tue Jan 3 20:37:56 2012 +0000 (svn r23737) -Fix: fix the svn:properties of a few files that got added lately commit 4b1404997e3f175084de7be803ccce8aab990556 Author: truebrain Date: Tue Jan 3 20:28:28 2012 +0000 (svn r23736) -Document: document correctly that WC_GOAL_QUESTION has a WindowNumber which is identical to the uniqueid given by the GameScript commit 0cfe86cead32af5f46f2091ac250a4a6e4a13a5b Author: rubidium Date: Tue Jan 3 20:26:05 2012 +0000 (svn r23735) -Codechange: remove ~50 includes from headers that weren't needed commit a237ceba7f1bdc2d4471b1d942e976b0917c862f Author: rubidium Date: Tue Jan 3 19:22:33 2012 +0000 (svn r23734) -Cleanup: remove the translated strings as well commit 98115709b7d92d7ae805f589c8b1c1c49c1cb1db Author: rubidium Date: Tue Jan 3 19:21:32 2012 +0000 (svn r23733) -Fix-ish [FS#4939]: cheating to different climates messes things even more up than changing NewGRFs in-game... so guess what happened commit 9eeb3dedc61d48345b9cd81aabe97f8f3f1a5fc8 Author: translators Date: Tue Jan 3 18:46:13 2012 +0000 (svn r23732) -Update from WebTranslator v3.0: bulgarian - 7 changes by kokobongo croatian - 3 changes by VoyagerOne dutch - 20 changes by Yexo english_US - 20 changes by Rubidium finnish - 22 changes by jpx_ french - 20 changes by glx german - 1 changes by planetmaker lithuanian - 1 changes by BlinK_ norwegian_nynorsk - 1 changes by mantaray portuguese - 1 changes by JayCity russian - 1 changes by akasoft serbian - 1 changes by etran ukrainian - 27 changes by Fixer commit d11dc6f606bec0d1c8f3d7a7845b74eb570c2022 Merge: 215d052 80e6ae9 Author: fonsinchen Date: Tue Jan 3 19:27:55 2012 +0100 Merge branch 'station-gui' into cd-tmp commit 215d052c3058e5a6a27a51828ebe17b748307fed Merge: d68d9b5 0f13605 Author: fonsinchen Date: Tue Jan 3 19:27:54 2012 +0100 Merge branch 'ext-rating' into cd-tmp commit d68d9b5967b83e39d5d5ee52874f7a81c9dc7b74 Merge: 09bd95a fc5e8a4 Author: fonsinchen Date: Tue Jan 3 19:27:54 2012 +0100 Merge branch 'smallmap-overlay' into cd-tmp commit 09bd95ad49e0b48ad68d3aa533a04bad58fef3ab Merge: f51f65d 4f31a16 Author: fonsinchen Date: Tue Jan 3 19:27:54 2012 +0100 Merge branch 'viewport-overlay' into cd-tmp commit 80e6ae93baf731ec496f6ca24f450dc720be23bd Merge: 49425ec 30089f7 Author: fonsinchen Date: Tue Jan 3 19:27:53 2012 +0100 Merge branch 'station-gui-tmp' into station-gui commit 0f13605b334d4ad55f366104dbf2a29a5bacf529 Merge: 966f410 30089f7 Author: fonsinchen Date: Tue Jan 3 19:27:53 2012 +0100 Merge branch 'ext-rating-tmp' into ext-rating commit fc5e8a41d10751a06f5dfcf4da8a53545c08c374 Merge: 1ee4a74 0675a94 Author: fonsinchen Date: Tue Jan 3 19:27:52 2012 +0100 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 0675a941de87b0a8c6e8d6b85ae2f075772b7d6a Merge: 4b0021d 8c1465e Author: fonsinchen Date: Tue Jan 3 19:27:52 2012 +0100 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit 8c1465eede10b68a0ad7a285de05431d992cdf2f Merge: 3310fc5 57148b3 Author: fonsinchen Date: Tue Jan 3 19:27:52 2012 +0100 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor commit 4b0021d5ed474d5266adbc7437952fbe79351580 Merge: 5a5f973 43d4b90 Author: fonsinchen Date: Tue Jan 3 19:27:52 2012 +0100 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit 4f31a1671f3550791312a2afa216432be05fde17 Merge: a38507f 474c106 Author: fonsinchen Date: Tue Jan 3 19:27:51 2012 +0100 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit 474c106070f615fd07c879b6eb4eddaf478c2241 Merge: 0378f24 43d4b90 Author: fonsinchen Date: Tue Jan 3 19:27:51 2012 +0100 Merge branch 'overlay-legend-tmp' into overlay-legend commit 43d4b90d5e14dae0009522d6ca10a238659ac839 Merge: 3672f78 30089f7 Author: fonsinchen Date: Tue Jan 3 19:27:50 2012 +0100 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit 30089f796fbdc194c3bebca41aad6932943e7939 Merge: a379df1 1941898 Author: fonsinchen Date: Tue Jan 3 19:27:50 2012 +0100 Merge branch 'cargomap-tmp' into cargomap commit 1941898b858d1a0700a2f0146a3718da4f88f7ed Merge: 027f4b8 c229d43 Author: fonsinchen Date: Tue Jan 3 19:27:50 2012 +0100 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit 027f4b8d02515137f0d72a2bc0da47f2dd20e152 Merge: fd4e6fb fac0f4b Author: fonsinchen Date: Tue Jan 3 19:27:49 2012 +0100 Merge branch 'reservation' into cargomap-tmp commit fd4e6fb4b7142a1d90ae3d29456829f635437e07 Merge: c043ce9 dc04da7 Author: fonsinchen Date: Tue Jan 3 19:27:49 2012 +0100 Merge branch 'multimap' into cargomap-tmp commit c043ce9d11f2ab8a812eaf9e22834065f8858b8b Merge: 06bc2ed 4a0fca3 Author: fonsinchen Date: Tue Jan 3 19:27:49 2012 +0100 Merge branch 'texteff' into cargomap-tmp commit 06bc2ed87086e1b1a231cacf0dfb7cc420233c1f Merge: 1d7ad87 a1baffe Author: fonsinchen Date: Tue Jan 3 19:27:49 2012 +0100 Merge branch 'flowmapping-core' into cargomap-tmp commit c229d43f0096dcaec92ca7c5448bee3da3f2d9a4 Merge: be158fe 57148b3 Author: fonsinchen Date: Tue Jan 3 19:27:48 2012 +0100 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit fac0f4b8eeffc644cba1053c72e3fa963f7a4eb9 Merge: 02ce81e 57148b3 Author: fonsinchen Date: Tue Jan 3 19:27:48 2012 +0100 Merge branch 'reservation-tmp' into reservation commit dc04da72b2eb1c91aab89a4e6b71ac0b5d783764 Merge: 69602f2 57148b3 Author: fonsinchen Date: Tue Jan 3 19:27:48 2012 +0100 Merge branch 'multimap-tmp' into multimap commit 4a0fca3eb4699d33df984721e78de3875b0b6af1 Merge: 7a04528 57148b3 Author: fonsinchen Date: Tue Jan 3 19:27:47 2012 +0100 Merge branch 'texteff-tmp' into texteff commit a1baffe39705243c22d14562d46e5f6a1c7915ff Merge: a5b9bf0 a575185 Author: fonsinchen Date: Tue Jan 3 19:27:47 2012 +0100 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit a5751854b871bb8ded6df136642669df07780cc7 Merge: f7e0f61 fcf2150 Author: fonsinchen Date: Tue Jan 3 19:27:46 2012 +0100 Merge branch 'mcf-tmp' into mcf commit fcf2150dc7ffa0009ca5e4ad60c9a29a1de89e36 Merge: 734e6d3 ff1ced0 Author: fonsinchen Date: Tue Jan 3 19:27:46 2012 +0100 Merge branch 'demands-tmp' into demands commit ff1ced0d2c5ad20b3878ab1abf05b7a7cb1e1607 Merge: 7b6eda4 4d29877 Author: fonsinchen Date: Tue Jan 3 19:27:45 2012 +0100 Merge branch 'components-tmp' into components commit 4d298779c91abdc13f312fc8e36ba65df73ace0a Merge: f6ee906 e93b705 Author: fonsinchen Date: Tue Jan 3 19:27:45 2012 +0100 Merge branch 'capacities-tmp' into capacities commit e93b7053dfb9c53570549e23cfba7e164e10200e Merge: 04d0f9e 57148b3 Author: fonsinchen Date: Tue Jan 3 19:27:44 2012 +0100 Merge branch 'moving-average-tmp' into moving-average commit 57148b329e616f324ff61ef022fcc87cf0126402 Merge: 7f78f44 59de5e9 Author: fonsinchen Date: Tue Jan 3 19:27:43 2012 +0100 Merge branch 'master' into gitmake commit a5b9bf0b1b4a864d0f63db7994caea708935f6e4 Author: fonsinchen Date: Tue Jan 3 19:27:23 2012 +0100 don't use inline in .cpp commit 59de5e957041620732f41ae65bbc3e4a924e731b Author: truebrain Date: Tue Jan 3 16:36:24 2012 +0000 (svn r23731) -Add: add GSGoal::Question(), to ask a question to a(ll) company(ies). It can contain random text, and at most 3 buttons from a collection of 17 commit e40e1325d6a43c63b0130927834ca9462661ae74 Author: rubidium Date: Tue Jan 3 16:04:58 2012 +0000 (svn r23730) -Add: Australian translation commit dea311a07e76e12e911455115048abf372a13901 Author: truebrain Date: Tue Jan 3 10:50:06 2012 +0000 (svn r23729) -Fix (r23670) [FS#4941]: if you increase the buffer size, also increase the bytes per pixel commit ff1db1a6c804837f9e749de57bd180b77e2b5427 Author: truebrain Date: Tue Jan 3 10:27:14 2012 +0000 (svn r23728) -Fix [#FS4942-ish]: when cheating into another company, the SignList was not updated commit ee94a7512e4133bb40df19891fc9275f7c3b9402 Author: truebrain Date: Tue Jan 3 09:46:37 2012 +0000 (svn r23727) -Codechange: speedup the 32bpp palette animation by reducing the amount of compares. This is possible because the function is called with only 2 possible conditions: from 0 to 255 (full palette update, 8bpp only) or from PALETTE_ANIM_START to 255 commit 570d2dcbedd898fea0d5a0036b4e905877f49208 Author: peter1138 Date: Tue Jan 3 02:38:35 2012 +0000 (svn r23726) -Fix (r23670): Remove debugging code added accidentally commit efe0fcf48d308874add4f91b46ff956653e72f01 Author: yexo Date: Tue Jan 3 00:47:56 2012 +0000 (svn r23725) -Fix (r23723): compile before commit commit f884be58e5dbcc697d43219004cc2e1c54f9da28 Author: yexo Date: Tue Jan 3 00:45:22 2012 +0000 (svn r23724) -Codechange: split of the check to see if ambient sounds are enabled to a header file allowing compilers to inline that check commit 7975bedc23d30c0dae5ee16b018febb9ed40d282 Author: yexo Date: Tue Jan 3 00:44:23 2012 +0000 (svn r23723) -Codechange: speedup flood checks a bit commit b930e3c8665472d2db9a5770c6dd61863d43fe4e Author: frosch Date: Tue Jan 3 00:22:14 2012 +0000 (svn r23722) -Change: Give the chat query window the same Z priority as the normal text query window. commit f51f65d44620667da63fb085242154ab47d70032 Merge: f8d9b70 49425ec Author: fonsinchen Date: Tue Jan 3 00:07:31 2012 +0100 Merge branch 'station-gui' into cd-tmp commit 49425ecbc2639f71a07d54045828a60d1de83297 Merge: 7938275 a379df1 Author: fonsinchen Date: Tue Jan 3 00:07:30 2012 +0100 Merge branch 'station-gui-tmp' into station-gui commit f8d9b70fd61325da8c4994cf9f6c12e6f5147563 Merge: 25ab44d 966f410 Author: fonsinchen Date: Tue Jan 3 00:07:30 2012 +0100 Merge branch 'ext-rating' into cd-tmp commit 25ab44d394927b53f9d1089a3056ec2eabcd1eb0 Merge: e67ad82 1ee4a74 Author: fonsinchen Date: Tue Jan 3 00:07:30 2012 +0100 Merge branch 'smallmap-overlay' into cd-tmp commit e67ad82ae6d9f9cf49106903a8d3f76c793a822d Merge: 65b8c77 a38507f Author: fonsinchen Date: Tue Jan 3 00:07:30 2012 +0100 Merge branch 'viewport-overlay' into cd-tmp commit 966f41072b1b674f6f01062d3e0c8dcd07a04b74 Merge: 9440a99 a379df1 Author: fonsinchen Date: Tue Jan 3 00:07:29 2012 +0100 Merge branch 'ext-rating-tmp' into ext-rating commit 1ee4a749e88817b4f4d428c8990adc4ac2afc2f4 Merge: d099105 5a5f973 Author: fonsinchen Date: Tue Jan 3 00:07:29 2012 +0100 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 5a5f9736d0811d19656bf0ecb5843e1698bac77b Merge: 8cebb14 3672f78 Author: fonsinchen Date: Tue Jan 3 00:07:28 2012 +0100 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit a38507f295c79beeef04b48be5b6bdd12b9be46f Merge: d18a091 0378f24 Author: fonsinchen Date: Tue Jan 3 00:07:28 2012 +0100 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit 0378f2477bd88373f2cde32d9c481f5518ec611f Merge: ae44b9e 3672f78 Author: fonsinchen Date: Tue Jan 3 00:07:28 2012 +0100 Merge branch 'overlay-legend-tmp' into overlay-legend commit 3672f78ce4b68f248ec86a92ec7f58a5be49f8fa Merge: 7f4d126 a379df1 Author: fonsinchen Date: Tue Jan 3 00:07:28 2012 +0100 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit a379df144bef6f914ad8f4ca9c9dcb8f792a28ef Author: fonsinchen Date: Tue Jan 3 00:07:24 2012 +0100 adapt new MoveTo in CheckCargoCapacity commit 65b8c77e2a4ec533a9174e0329520714567db3fe Merge: 8622f10 7938275 Author: fonsinchen Date: Tue Jan 3 00:01:48 2012 +0100 Merge branch 'station-gui' into cd-tmp commit 8622f100682b070b144749fe2f3524b6eb388756 Merge: 89a0d4c 9440a99 Author: fonsinchen Date: Tue Jan 3 00:01:48 2012 +0100 Merge branch 'ext-rating' into cd-tmp commit 89a0d4cb69d302098748d1bdd9a52760ad00258d Merge: c1203de d18a091 Author: fonsinchen Date: Tue Jan 3 00:01:47 2012 +0100 Merge branch 'viewport-overlay' into cd-tmp commit c1203de8da7aea9b7513d63373b5ee20b2f20f5b Merge: 06183d1 d099105 Author: fonsinchen Date: Tue Jan 3 00:01:45 2012 +0100 Merge branch 'smallmap-overlay' into cd-tmp commit 79382755d2c21a6baaad2012afd1c5f2a963f72a Merge: d17d3df 666fa5a Author: fonsinchen Date: Tue Jan 3 00:01:25 2012 +0100 Merge branch 'station-gui-tmp' into station-gui commit 9440a99402dc3c49863965353b3191b4a294db97 Merge: e664025 666fa5a Author: fonsinchen Date: Tue Jan 3 00:01:23 2012 +0100 Merge branch 'ext-rating-tmp' into ext-rating commit d0991055c4824b2beb7d1433bba36dca519e07a5 Merge: ef3d5ee 8cebb14 Author: fonsinchen Date: Tue Jan 3 00:01:22 2012 +0100 Merge branch 'smallmap-overlay-tmp' into smallmap-overlay commit 8cebb1499cd4454e561ddb7f7bc7f5d06d7e5f51 Merge: a724470 7f4d126 Author: fonsinchen Date: Tue Jan 3 00:01:21 2012 +0100 Merge branch 'linkgraph-overlay' into smallmap-overlay-tmp commit a724470b47b393f2ca81351225e164bacd2b99c2 Merge: 0eb5340 3310fc5 Author: fonsinchen Date: Tue Jan 3 00:01:19 2012 +0100 Merge branch 'smallmap-refactor' into smallmap-overlay-tmp commit 3310fc54292bf74ad4c1192cc73a71d199c198e4 Merge: 1bb5a6e 7f78f44 Author: fonsinchen Date: Tue Jan 3 00:00:51 2012 +0100 Merge branch 'smallmap-refactor-tmp' into smallmap-refactor Conflicts: src/smallmap_gui.cpp commit 6e65e920543884f6e7a2585a6d55d41cbd56f368 Author: yexo Date: Mon Jan 2 22:58:15 2012 +0000 (svn r23721) -Fix (r23070): reading memory of a temporary (already deconstructed) object is invalid commit d18a0917bced9e0ec24a5eb03eacf4313ef5860a Merge: b0f841a ae44b9e Author: fonsinchen Date: Mon Jan 2 23:56:58 2012 +0100 Merge branch 'viewport-overlay-tmp' into viewport-overlay commit ae44b9e86edd5d5bbcbc2dcd7d7ca76c7d033836 Merge: ba783ce 7f4d126 Author: fonsinchen Date: Mon Jan 2 23:56:57 2012 +0100 Merge branch 'overlay-legend-tmp' into overlay-legend commit 7f4d1262bad9426efe0c5185e12485ddd34c4085 Merge: 376ef25 666fa5a Author: fonsinchen Date: Mon Jan 2 23:56:55 2012 +0100 Merge branch 'linkgraph-overlay-tmp' into linkgraph-overlay commit 666fa5acb3cfe81c807cb72b568898b4a5f12d7d Merge: 02bfb92 1d7ad87 Author: fonsinchen Date: Mon Jan 2 23:56:54 2012 +0100 Merge branch 'cargomap-tmp' into cargomap commit 1d7ad8701ae87ade9c43fbc6780e7b91d4014c63 Merge: 12c1ceb be158fe Author: fonsinchen Date: Mon Jan 2 23:56:53 2012 +0100 Merge branch 'selfaware-stationcargo' into cargomap-tmp commit 12c1ceb7bcb7f35e6483fa2fa53a80133bdfbc0d Merge: 01f691f 02ce81e Author: fonsinchen Date: Mon Jan 2 23:56:53 2012 +0100 Merge branch 'reservation' into cargomap-tmp commit 01f691f160aa99e3509bd26ba9acb250d65012b9 Merge: 58bfb2a 69602f2 Author: fonsinchen Date: Mon Jan 2 23:56:52 2012 +0100 Merge branch 'multimap' into cargomap-tmp commit 58bfb2ac051fab7468921a5eabd748dd32afd8de Merge: 9aed5db 7a04528 Author: fonsinchen Date: Mon Jan 2 23:56:52 2012 +0100 Merge branch 'texteff' into cargomap-tmp commit 9aed5db6eba561fdfe81f5c029a24d51c12e6528 Merge: 9108db9 72efea7 Author: fonsinchen Date: Mon Jan 2 23:56:52 2012 +0100 Merge branch 'flowmapping-core' into cargomap-tmp commit be158fedff0626b869fe74ee6844643396797875 Merge: 74909e9 7f78f44 Author: fonsinchen Date: Mon Jan 2 23:56:51 2012 +0100 Merge branch 'selfaware-stationcargo-tmp' into selfaware-stationcargo commit 02ce81ea957ba1852d90985c139f3dc33dbeab6a Merge: 52ed868 7f78f44 Author: fonsinchen Date: Mon Jan 2 23:56:49 2012 +0100 Merge branch 'reservation-tmp' into reservation commit 69602f2d279b950e6b0ee4e77f1edd876860910c Merge: 06c9726 7f78f44 Author: fonsinchen Date: Mon Jan 2 23:56:48 2012 +0100 Merge branch 'multimap-tmp' into multimap commit 7a04528da5223e5309adbfff34d97183aefc78e8 Merge: b81ee1c 7f78f44 Author: fonsinchen Date: Mon Jan 2 23:56:46 2012 +0100 Merge branch 'texteff-tmp' into texteff commit 72efea77a06d2f004ac319c5ba995fbcf8030fb1 Merge: 34783e3 f7e0f61 Author: fonsinchen Date: Mon Jan 2 23:56:45 2012 +0100 Merge branch 'flowmapping-core-tmp' into flowmapping-core commit f7e0f615bcea0939bf2193884da5048f961e6e7d Merge: 28db876 734e6d3 Author: fonsinchen Date: Mon Jan 2 23:56:43 2012 +0100 Merge branch 'mcf-tmp' into mcf commit 734e6d3c991073df92e1633deb53834092851f7e Merge: 7f74fd5 7b6eda4 Author: fonsinchen Date: Mon Jan 2 23:56:41 2012 +0100 Merge branch 'demands-tmp' into demands commit 7b6eda4f44cfc243cd4afebf504ce6b2fbff9eff Merge: b944fac f6ee906 Author: fonsinchen Date: Mon Jan 2 23:56:40 2012 +0100 Merge branch 'components-tmp' into components commit f6ee906fcaef4b498bc04cf3f0bdc333d0e7ddef Merge: e832efd 04d0f9e Author: fonsinchen Date: Mon Jan 2 23:56:38 2012 +0100 Merge branch 'capacities-tmp' into capacities commit 04d0f9eebffce51cc01007fdc6632cac183afe6e Merge: 1f597e9 7f78f44 Author: fonsinchen Date: Mon Jan 2 23:56:36 2012 +0100 Merge branch 'moving-average-tmp' into moving-average commit 7f78f4424e815f4cb7c41fb607b44afa012c66a1 Merge: ea50bba 6e65e92 Author: fonsinchen Date: Mon Jan 2 23:56:35 2012 +0100 Merge branch 'master' into gitmake commit d242f154f924ce2c1b7b8159e25c8a490fe7e6f1 Author: rubidium Date: Mon Jan 2 22:44:28 2012 +0000 (svn r23720) -Fix/Feature [FS#4935]: show the script debug window also when the game script crashes commit e371c26025feabd06f3ee191d02aa6f5f7984bcf Author: rubidium Date: Mon Jan 2 21:57:29 2012 +0000 (svn r23719) -Fix [FS#4930]: extraction of music packs failed commit 761223bcdfa83b37a4a217d2ba218d0af656478f Author: rubidium Date: Mon Jan 2 20:39:50 2012 +0000 (svn r23718) -Fix [FS#4936]: rescanai caused crash when the AI settings of an AI was opened commit b9c4114f30fcd990b38d57238c8b6dea3738b90c Author: rubidium Date: Mon Jan 2 20:39:18 2012 +0000 (svn r23717) -Fix [FS#4927]: ships going to wrong dock location when moving the dock while the game is paused commit f6d9fbe35c78a34959b439ec82d28f6e96ace095 Author: smatz Date: Mon Jan 2 19:47:52 2012 +0000 (svn r23716) -Revert (r23705)[FS#4937]: unforeseen consequences commit 3ac2631ec8c91593b262493595fb0051e367ae1c Author: translators Date: Mon Jan 2 18:45:26 2012 +0000 (svn r23715) -Update from WebTranslator v3.0: luxembourgish - 48 changes by Phreeze portuguese - 7 changes by SupSuper turkish - 100 changes by niw3 ukrainian - 11 changes by Fixer welsh - 1 changes by kazzie commit d9f717dcfa6e4aa7aaa99ef9b074633fb059c2a6 Author: truebrain Date: Mon Jan 2 13:44:37 2012 +0000 (svn r23714) -Codechange: don't mix Viewport with non-viewport code commit 92c60447dc4efdea985888098a5e3fc3c828e0d3 Author: truebrain Date: Mon Jan 2 13:44:30 2012 +0000 (svn r23713) -Codechange: split VehicleMove() into two functions, to minimalize the work done where possible commit 5f65e056e1908eb8f7c733e05d9541fcac921bfc Author: truebrain Date: Mon Jan 2 12:07:50 2012 +0000 (svn r23712) -Codechange: rename the two vehicle hashes we have to names that make clear where they differ in commit 5dbac2f2ae41c74d117c6d1fed00822ee0b97976 Author: truebrain Date: Mon Jan 2 12:07:42 2012 +0000 (svn r23711) -Codechange: don't chain the two vehicle hashes, but call them one by one commit 2b32ddf24f79907bae21d791aa43756e484cf9c1 Author: rubidium Date: Sun Jan 1 22:35:19 2012 +0000 (svn r23710) -Change: make the default secondary sort method for the server list the number of clients instead of the name commit 37a81f01cfd2e95c4ab265a9f760cf0eb82e3607 Author: rubidium Date: Sun Jan 1 22:32:26 2012 +0000 (svn r23709) -Feature-ish: try harder to sort text instead of fancy characters in the server names commit 1d9f3bf00318022c28fa4610dde4811766cc6c79 Author: truebrain Date: Sun Jan 1 19:20:08 2012 +0000 (svn r23708) -Codechange: apply the same trick as r23701 to GetTileSlope(), gaining similar benefits commit 3b42f6ee64c207b22ceacabda57e441faeb6a021 Author: translators Date: Sun Jan 1 18:45:38 2012 +0000 (svn r23707) -Update from WebTranslator v3.0: catalan - 22 changes by arnau indonesian - 19 changes by rusydan italian - 2 changes by lorenzodv russian - 2 changes by Lone_Wolf serbian - 2 changes by etran commit cf54bc425fc58ae77fe8a8ce86cd5c52600f961b Author: smatz Date: Sun Jan 1 17:36:19 2012 +0000 (svn r23706) -Codechange: prevent 'unknown command' doxygen errors commit 441a22977ab3a1c205fa57b4bde011bf55be763b Author: smatz Date: Sun Jan 1 17:32:45 2012 +0000 (svn r23705) -Codechange: cache the last processed station in FindStationsAroundTiles() in order to make the code a bit faster commit 06597e684c551499d86d7d20b14dec916e7ba2d5 Author: alberth Date: Sun Jan 1 17:22:32 2012 +0000 (svn r23704) -Doc: Doxygen comment fixes and additions. commit 8ca67aae5d643bbe6787917e12a872033bf34b9d Author: truebrain Date: Sun Jan 1 16:38:38 2012 +0000 (svn r23703) -Codechange: allow a compiler to inline a wrapper function, avoiding creation of a function stack, massively increasing its speed, for a function that is called often commit b4464e8076944b3394b05bf404f2f17c5f3a9cac Author: truebrain Date: Sun Jan 1 16:23:05 2012 +0000 (svn r23702) -Codechange: avoid using TileAddWrap() in FindStationsAroundTiles() by finding out where the border is in advance, speeding up the function with a factor 3 (you got to love random statistics which has no real meaning in the grand scheme of it all :D) commit 8ff6c2da52024e4ef86c357361fbb6f5e1d1f0f1 Author: truebrain Date: Sun Jan 1 16:01:51 2012 +0000 (svn r23701) -Codechange: give TileAddWrap() a 27% speed-up, by swapping entries in an if() statement, and reusing already calculated values (tnx to SmatZ for the ideas) commit c2d045f862361df14e5fbb1a13af0fd0bda75cc4 Author: truebrain Date: Sun Jan 1 10:50:46 2012 +0000 (svn r23700) -Fix: the size of the Subsidies pool used a random macro, which didn't really make sense in the grand scheme of things commit af6a2b3a658eccac12a274a167189d16f6ab91f3 Author: truebrain Date: Sun Jan 1 10:50:38 2012 +0000 (svn r23699) -Fix [FS#4928] (r23630): too much copy/pasting only allowed a silly low amount of goals to be created. commit 94f72b7ad4f3d048e4dba62e0a3f34134f3cd7da Author: rubidium Date: Sun Jan 1 00:05:02 2012 +0000 (svn r23698) -Fix (r21685): small, apparantly yearly reoccuring, typo commit 11ee22efabf7db98da01653cb2c865853dd23e27 Author: translators Date: Sat Dec 31 18:45:53 2011 +0000 (svn r23697) -Update from WebTranslator v3.0: belarusian - 1 changes by Wowanxm czech - 2 changes by SmatZ dutch - 1 changes by Yexo english_US - 13 changes by Rubidium french - 2 changes by glx german - 1 changes by planetmaker hebrew - 1 changes by rril indonesian - 85 changes by rusydan norwegian_bokmal - 116 changes by mantaray romanian - 1 changes by tonny spanish - 2 changes by Terkhen commit b49906fa9d1b56017a9afbe0ac12e491c22aaaca Author: rubidium Date: Sat Dec 31 15:02:14 2011 +0000 (svn r23696) -Fix (r23695): 5 <-> 6... today is not my day commit 7dc6e5b5fc70cd9f92423e10d955a70b080de3e8 Author: rubidium Date: Sat Dec 31 14:56:39 2011 +0000 (svn r23695) -Fix/Feature [FS#4916]: make a distinction between fully zoomed in and default zoomed in screenshots commit e1757cb9a578f506655815515820cf00a620134e Author: rubidium Date: Sat Dec 31 13:57:09 2011 +0000 (svn r23694) -Fix (rprev): somehow compilers didn't understand what I meant... commit 9f4b0eedde715509cd9d52f6cda388ba520dc7a7 Author: rubidium Date: Sat Dec 31 13:52:54 2011 +0000 (svn r23693) -Fix [FS#4859]: hardcode the original defaults for loading old savegames if they could totally mess with the game's behaviour commit 7e8fc153282b03709180a36139fd548d2292601a Author: rubidium Date: Sat Dec 31 11:14:03 2011 +0000 (svn r23692) -Fix: use smallest_x of your children only when you let the children update it commit c967d260bc0222b34e053800f1c914d48b0b46d1 Author: truebrain Date: Sat Dec 31 10:55:00 2011 +0000 (svn r23691) -Fix: signed/unsigned issues, causing asserts for some languages in relation to the serverlist commit b1e95c9bd74c34aa02ee0b8e30ff7ae8fe2326d4 Author: rubidium Date: Sat Dec 31 10:08:18 2011 +0000 (svn r23690) -Fix: massive typo ;) commit 8f0b8b0fe9cbc07c59eff1c106b61971b1ef3b0b Author: translators Date: Fri Dec 30 18:45:18 2011 +0000 (svn r23689) -Update from WebTranslator v3.0: simplified_chinese - 23 changes by chenwt0315 norwegian_bokmal - 236 changes by mantaray swedish - 9 changes by tobjork commit bc65c373279f34dbe5bb8bf29c4a97f5c5f00851 Author: michi_cc Date: Fri Dec 30 17:56:37 2011 +0000 (svn r23688) -Codechange: No need to check if a train needs servicing if we only extend a train's path without actually calling the pathfinder. The path extension will stop when hitting a junction tile, so it is impossible to miss a depot this way. commit c966e7bfacf03ea5bcc17dcc8cbc942133d12184 Author: rubidium Date: Fri Dec 30 12:07:28 2011 +0000 (svn r23687) -Fix [FS#4922]: document where the game script directory is