Commit Graph

24 Commits (fe1e0a9d598c6bdeeaed63343ec74a5220a06623)

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
6 years ago
PeterN 4cebebcf68
Change: Add CargoTypes type for cargo masks. (#6790) 6 years ago
Jonathan G Rennison 29470dba23 LinkGraph: Increase caching of link graph lines/point details 7 years ago
Jonathan G Rennison 52dadc9252 Merge branch 'master' into jgrpp 7 years ago
frosch 3eae9aba79 (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 7 years ago
frosch 1e50edd12c (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 7 years ago
Jonathan G Rennison 55057110a5 Linkgraph GUI: Add hover tool-tips to graph legend window. 8 years ago
fonsinchen e2426b22fa (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 8 years ago
fonsinchen 6b2eed0a70 (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 8 years ago
Jonathan G Rennison 3a28be7841 Linkgraph: Replace three uses of std::list with std::deque/vector. 9 years ago
fonsinchen ced1bfa60f (svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid 11 years ago
fonsinchen b158c7d0fa (svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid 11 years ago
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. 11 years ago
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. 11 years ago
frosch ec68541fb8 (svn r25861) -Fix [FS#5760]: Scale linkgraph legend according to text dimensions. 11 years ago
frosch 27a77d2c09 (svn r25861) -Fix [FS#5760]: Scale linkgraph legend according to text dimensions. 11 years ago
fonsinchen 5cd8240544 (svn r25364) -Add: support for flow stats to linkgraph overlay 11 years ago
fonsinchen b4ab43be5f (svn r25364) -Add: support for flow stats to linkgraph overlay 11 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 12 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 12 years ago
rubidium 71ce89c1d0 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 12 years ago
rubidium 50ae992b47 (svn r25263) -Add: legend for linkgraph overlay (fonsinchen) 12 years ago
rubidium 3f2f1c4df7 (svn r25261) -Add: abstract implementation of linkgraph overlay for GUI (fonsinchen) 12 years ago
rubidium 5bca50c466 (svn r25261) -Add: abstract implementation of linkgraph overlay for GUI (fonsinchen) 12 years ago