pelya
3ef1c1baff
Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
...
These merges are becoming more awful every time
Conflicts:
src/ai/ai_gui.cpp
src/build_vehicle_gui.cpp
src/cheat_gui.cpp
src/company_gui.cpp
src/depot_gui.cpp
src/dock_gui.cpp
src/error_gui.cpp
src/genworld_gui.cpp
src/misc_gui.cpp
src/network/network_content_gui.cpp
src/network/network_gui.cpp
src/newgrf_gui.cpp
src/news_gui.cpp
src/rail_gui.cpp
src/rev.cpp.in
src/road_gui.cpp
src/settings_gui.cpp
src/settings_gui.h
src/signs_gui.cpp
src/station_gui.cpp
src/table/settings.ini
src/terraform_gui.cpp
src/toolbar_gui.cpp
src/toolbar_gui.h
src/vehicle_gui.cpp
src/video/sdl_v.cpp
src/viewport.cpp
src/widget.cpp
src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
frosch
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
2015-03-07 18:27:01 +00:00
fonsinchen
78df68e695
(svn r26891) -Codechange: Add methods to retrieve flows from a FlowStatMap
2014-09-21 16:19:52 +00:00
rubidium
d214ca2c7d
(svn r26753) -Fix: desync due to not always properly restoring game state from the savegame
2014-08-22 17:11:59 +00:00
Sergii Pylypenko
91ebce1a9c
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/console_gui.cpp
src/genworld_gui.cpp
src/group_gui.cpp
src/misc_gui.cpp
src/settings_gui.cpp
src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
rubidium
20f54c2f61
(svn r26590) -Fix: possible desync (big/little endian) due to not writing complete variables upon saveload
2014-05-16 17:39:35 +00:00
rubidium
1b11ea80ee
(svn r26582) -Feature-ish: quickly decay cargo after about 21 months of not having picked any of the cargo, and prevent houses and industries providing more cargo
2014-05-11 18:35:34 +00:00
rubidium
fb9dbf30fa
(svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore)
2014-05-11 18:02:11 +00:00
Juanjo
4f2f3c52c6
Adapt the boxes showing waiting cargo on the Station List:
...
- rtl suport.
- size of the boxes adapted to the height of the normal font.
- draw a shadowed box if there is no cargo waiting but cargo has been accepted in that station.
- also always draw the box for a cargo if cargo has been produced but there are no waiting units.
2014-03-15 21:33:24 +02:00
fonsinchen
fea3a433b2
(svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors.
2013-12-20 14:57:44 +00:00
frosch
6c63c98d7f
(svn r26085) -Codechange: Pass ResolverObjects as reference instead of pointer since they are never NULL.
2013-11-24 14:41:19 +00:00
rubidium
73474728e3
(svn r26057) -Fix: a number of possibly uninitialised variables
2013-11-23 13:12:19 +00:00
fonsinchen
05b50ada5c
(svn r25963) -Fix [FS#5758]: Mixtures of old and new flows could create cycles.
2013-11-10 15:18:49 +00:00
fonsinchen
7025a145e3
(svn r25899) -Change: Restrict flows if links are restricted and don't normally pick them anymore.
2013-10-22 16:13:54 +00:00
fonsinchen
487f7f0473
(svn r25896) -Fix: Remove unused and unimplemented declaration of RunAverages.
2013-10-22 16:11:45 +00:00
fonsinchen
8d53e23b6c
(svn r25892) -Fix: off-by-one error in GetVia prevented certain flows from getting picked
2013-10-20 14:27:36 +00:00
fonsinchen
e3807ed606
(svn r25424) -Fix: keep old flows around in an invalidated state to continue routing cargo if necessary
2013-06-17 20:38:11 +00:00
fonsinchen
1de46050f6
(svn r25362) -Feature: consider cargo waiting at other stations for rating at the origin station
2013-06-09 13:04:32 +00:00
fonsinchen
c45cfa22a6
(svn r25346) -Codechange: Glue between stations and flow stats
2013-06-09 12:49:47 +00:00
fonsinchen
9f54020588
(svn r25345) -Add: implementation of SharesMap and FlowStatMap
2013-06-09 12:48:42 +00:00
rubidium
6b746167e4
(svn r25259) -Codechange: track capacities and usage of links
2013-05-19 14:22:04 +00:00
rubidium
251bf7ddcb
(svn r25257) -Add: basic link graph (fonsinchen)
2013-05-19 14:11:20 +00:00
rubidium
e0d3265546
(svn r25149) -Codechange: replace 'magic' 'has rating' bitcheck by descriptive function
2013-04-06 12:10:16 +00:00
frosch
193ee85c6f
(svn r24718) -Codechange: Rename GoodsEntry::days_since_pickup to GoodsEntry::time_since_pickup.
2012-11-12 21:59:02 +00:00
frosch
39a8ed82f5
(svn r24708) -Codechange: Check magic values of GoodsEntry::last_speed only via wrapper function.
2012-11-12 18:11:26 +00:00
frosch
a64a1a76c1
(svn r24707) -Doc: Improve description of GoodsEntryStatus flags.
2012-11-12 18:11:05 +00:00
alberth
6c6abd87db
(svn r24535) -Doc: Two additions, lots of small spelling fixes, and some Doxygen improvements.
2012-09-21 09:47:21 +00:00
rubidium
0cfe86cead
(svn r23735) -Codechange: remove ~50 includes from headers that weren't needed
2012-01-03 20:26:05 +00:00
truebrain
aa1a0053b0
(svn r23640) -Fix: stop using FORCEINLINE (1/3rd of the instances were, the others were still regular inline), but make sure inline is always a 'forced' inline (I am looking at you MSVC)
2011-12-20 17:57:56 +00:00
smatz
36747f96a6
(svn r23588) -Codechange: use the 'final' keyword so compiler can optimise out some indirect calls
2011-12-18 17:17:18 +00:00
yexo
a8f0dfd5be
(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
2011-12-09 19:30:30 +00:00
alberth
8b4443953f
(svn r22742) -Add: Add function to query exit direction of hangars at airports.
2011-08-13 12:44:42 +00:00
terkhen
7e0daae1ec
(svn r22567) -Codechange: Store persistent storages inside a pool.
2011-06-12 20:47:45 +00:00
terkhen
43de2fa2e8
(svn r22542) -Add: Store cargo acceptance stats for stations.
2011-06-04 21:21:00 +00:00
terkhen
f8400b86b2
(svn r22541) -Document: GoodsEntry struct.
2011-06-04 21:19:00 +00:00
terkhen
55695277c8
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
2011-06-04 21:17:07 +00:00
rubidium
0cf2ef83f0
(svn r21846) -Codechange: move documentation towards the code to make it more likely to be updated [o-s].
2011-01-18 23:09:43 +00:00
rubidium
e567833521
(svn r20857) -Fix [FS#3637]: The station with the second highest rating was doubly penalised when distributing cargo. Now the penalty is completely removed and the granularity/precision of the distribution in increased by using fractional cargo. This should make competing stations less "all-or-nothing".
2010-09-28 22:00:24 +00:00
rubidium
64f3c1e243
(svn r20815) -Revert (r20814): wrong patch at wrong time...
2010-09-16 16:31:38 +00:00
rubidium
dfa550681c
(svn r20814) -Codechange [FS#3835]: make waypoint default names work like depots, stations and vehicles (Krille)
2010-09-16 16:28:40 +00:00
rubidium
360d6daf34
(svn r20632) -Cleanup: remove "a few" unneeded includes, and add them to some headers
2010-08-26 22:01:16 +00:00
yexo
ccccb2c490
(svn r20374) -Codechange: add persistant storage for airports
2010-08-05 12:06:13 +00:00
yexo
2743532ae5
(svn r20366) -Codechange: store the rotation of the airport layout in the station struct and use it to rotate hangar tiles
2010-08-05 12:00:09 +00:00
yexo
7f7e3d4a3a
(svn r20365) -Codechange: allow multiple layouts for one airport statemachine, store the layout number
2010-08-05 11:59:07 +00:00
yexo
d96f73665f
(svn r20324) -Doc: add doxygen comments to the Airport struct belonging to a station
2010-08-02 21:11:52 +00:00
yexo
a2ea0b7b12
(svn r19465) -Codechange: support for multi-tile hangars
2010-03-19 11:17:52 +00:00
yexo
455bb65282
(svn r19464) -Codechange: move GetHangarTile to Airport
2010-03-19 09:58:46 +00:00
yexo
79909cedee
(svn r19463) -Codechange: add helper function to determine if an airport has at least one hangar
2010-03-19 09:48:44 +00:00
yexo
e414e06ab8
(svn r19462) -Codechange: use the AS_GENERIC macro also for the dummy airport
2010-03-19 00:34:38 +00:00
yexo
22a27d3b62
(svn r19455) -Codechange: split all airport information in Station to a seperate class
2010-03-18 21:02:20 +00:00
