pelya 0d868d80bd Merge branch 'master' into 1.5 ...

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/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/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/station_gui.cpp
	src/table/settings.ini
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/widget.cpp
	src/widgets/settings_widget.h

2015-03-29 21:48:14 +03:00

..

demands.cpp

(svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param

2014-10-12 18:26:54 +00:00

demands.h

(svn r25355) -Add: demand handler for link graph

2013-06-09 12:59:51 +00:00

flowmapper.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

flowmapper.h

(svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors.

2013-12-20 14:57:44 +00:00

init.h

(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes

2013-06-09 12:58:37 +00:00

linkgraph_base.h

(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes

2013-06-09 12:58:37 +00:00

linkgraph_gui.cpp

Merge branch 'master' into 1.5

2015-03-29 21:48:14 +03:00

linkgraph_gui.h

(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid

2014-01-19 09:26:56 +00:00

linkgraph_type.h

(svn r26549) -Change: better estimation for link capacities during full load

2014-05-01 14:50:52 +00:00

linkgraph.cpp

(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.

2014-06-14 13:35:39 +00:00

linkgraph.h

(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.

2014-06-14 13:35:39 +00:00

linkgraphjob_base.h

(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes

2013-06-09 12:58:37 +00:00

linkgraphjob.cpp

(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.

2015-03-07 18:27:01 +00:00

linkgraphjob.h

(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.

2015-03-07 18:27:01 +00:00

linkgraphschedule.cpp

(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.

2015-03-07 18:27:01 +00:00

linkgraphschedule.h

(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.

2015-03-07 18:27:01 +00:00

mcf.cpp

(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.

2015-03-07 18:27:01 +00:00

mcf.h

(svn r25356) -Add: Multi-Commodity-Flow solver for link graph

2013-06-09 13:00:41 +00:00

refresh.cpp

(svn r26889) -Feature: Predict links for station-autorefitting vehicles

2014-09-21 14:22:32 +00:00

refresh.h

(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)

2014-10-15 18:31:37 +00:00