Commit Graph

24 Commits

Author SHA1 Message Date
Jonathan G Rennison
56be293107 Merge branch 'master' into jgrpp
# Conflicts:
#	src/blitter/32bpp_anim.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_anim_sse2.cpp
#	src/blitter/32bpp_base.cpp
#	src/blitter/32bpp_base.hpp
#	src/ground_vehicle.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/town_cmd.cpp
#	src/vehicle_base.h
#	src/viewport_gui.cppp
2018-05-25 18:29:17 +01:00
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
Jonathan G Rennison
29470dba23 LinkGraph: Increase caching of link graph lines/point details 2018-01-18 20:59:14 +00:00
Jonathan G Rennison
52dadc9252 Merge branch 'master' into jgrpp 2017-07-27 18:41:43 +01:00
frosch
3eae9aba79 (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 2017-07-11 19:34:21 +00:00
frosch
1e50edd12c (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 2017-07-11 19:34:21 +00:00
Jonathan G Rennison
55057110a5 Linkgraph GUI: Add hover tool-tips to graph legend window. 2016-11-21 22:38:04 +00:00
fonsinchen
e2426b22fa (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 2016-07-10 11:57:16 +00:00
fonsinchen
6b2eed0a70 (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 2016-07-10 11:57:16 +00:00
Jonathan G Rennison
3a28be7841 Linkgraph: Replace three uses of std::list with std::deque/vector. 2015-11-26 01:02:52 +00:00
fonsinchen
ced1bfa60f (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
fonsinchen
b158c7d0fa (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
fonsinchen
532744d9ee (svn r25912) -Fix [FS#5676]: Draw 'shared' links (involving neutral stations) as dashed lines and show them in every company's link graph overlay. 2013-10-23 19:42:17 +00:00
fonsinchen
1237e3c48c (svn r25912) -Fix [FS#5676]: Draw 'shared' links (involving neutral stations) as dashed lines and show them in every company's link graph overlay. 2013-10-23 19:42:17 +00:00
frosch
ec68541fb8 (svn r25861) -Fix [FS#5760]: Scale linkgraph legend according to text dimensions. 2013-10-13 13:44:58 +00:00
frosch
27a77d2c09 (svn r25861) -Fix [FS#5760]: Scale linkgraph legend according to text dimensions. 2013-10-13 13:44:58 +00:00
fonsinchen
5cd8240544 (svn r25364) -Add: support for flow stats to linkgraph overlay 2013-06-09 13:07:53 +00:00
fonsinchen
b4ab43be5f (svn r25364) -Add: support for flow stats to linkgraph overlay 2013-06-09 13:07:53 +00:00
frosch
25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
frosch
56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 2013-05-26 19:23:42 +00:00
rubidium
71ce89c1d0 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 2013-05-19 14:43:23 +00:00
rubidium
50ae992b47 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 2013-05-19 14:43:23 +00:00
rubidium
3f2f1c4df7 (svn r25261) -Add: abstract implementation of linkgraph overlay for GUI (fonsinchen) 2013-05-19 14:30:40 +00:00
rubidium
5bca50c466 (svn r25261) -Add: abstract implementation of linkgraph overlay for GUI (fonsinchen) 2013-05-19 14:30:40 +00:00