Commit Graph

671 Commits

Author SHA1 Message Date
PeterN
4cebebcf68 Change: Add CargoTypes type for cargo masks. (#6790) 2018-05-21 22:08:39 +01:00
Jonathan G Rennison
ad1c402ad8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp
2018-05-03 23:54:51 +01:00
J0anJosep
79a551a83c Codechange: Use TileAddBy(Diag)Dir when possible. 2018-04-30 18:55:04 +02:00
Jonathan G Rennison
f77a368268 Merge branch 'crashlog_improvements' into jgrpp 2017-09-04 01:23:08 +01:00
alberth
a3f30a30df (svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01) 2017-08-20 07:11:08 +00:00
alberth
2eae80bbfe (svn r27894) -Fix [FS#6608]: Typo fix in STATIOV_* string names (Wolf01) 2017-08-20 07:11:08 +00:00
Jonathan G Rennison
95aad35774 Instead of list use deque in FlowRiver, vector in StationViewWindow. 2016-09-13 22:58:00 +01:00
Jonathan G Rennison
b9091a0f6c Merge branch 'zoning' into jgrpp
Conflicts:
	src/station_gui.cpp
	src/zoning_cmd.cpp
2016-01-01 13:09:11 +00:00
Jonathan G Rennison
7f84a1c501 Zoning: Add mode to show station catchment only where station window open. 2016-01-01 12:17:11 +00:00
Jonathan G Rennison
19764bb4fb Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2015-08-11 21:41:58 +01:00
michi_cc
44918010df (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
michi_cc
2b8bb12d62 (svn r27381) -Fix: Warnings due to C++11 requirements for explicit narrowing conversions in initializer lists. 2015-08-10 20:24:13 +00:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
frosch
8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch
a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 2015-02-01 20:54:24 +00:00
frosch
e4063cb6d4 (svn r27063) -Fix [FS#6172]: Some lists did not use natural string sorting. 2014-11-18 20:12:42 +00:00
frosch
861b9bc85e (svn r27063) -Fix [FS#6172]: Some lists did not use natural string sorting. 2014-11-18 20:12:42 +00:00
rubidium
09f6c46d0b (svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed) 2014-10-21 19:16:47 +00:00
rubidium
e811fa1718 (svn r27030) -Fix: crash when having the vehicle list opened from a buoy or oil rig while the buoy/oil rig gets its final removal (i.e. the sign gets removed) 2014-10-21 19:16:47 +00:00
peter1138
6872b647f1 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138
0877f892c5 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 2014-10-05 11:20:02 +00:00
peter1138
79e124cf2b (svn r26957) -Codechange: Spread the station cargo icons out by GUI scale. 2014-10-04 20:18:25 +00:00
peter1138
d6ac7d6fda (svn r26957) -Codechange: Spread the station cargo icons out by GUI scale. 2014-10-04 20:18:25 +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
rubidium
89c25b955e (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
rubidium
2be4215f43 (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
rubidium
0463dbdc9e (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
rubidium
e55aae44eb (svn r26083) -Codechange: pass the CommandContainer for the station joiner around using a reference instead of by-value 2013-11-24 14:29:32 +00:00
rubidium
58c356e935 (svn r26083) -Codechange: pass the CommandContainer for the station joiner around using a reference instead of by-value 2013-11-24 14:29:32 +00:00
frosch
0284db1a31 (svn r25731) -Fix [FS#5692]: Minor RTL alignment issues. (sbr) 2013-08-18 19:30:25 +00:00
frosch
f89375aa44 (svn r25731) -Fix [FS#5692]: Minor RTL alignment issues. (sbr) 2013-08-18 19:30:25 +00:00
rubidium
729a6a0acc (svn r25432) -Fix [FS#5608]: clang compiler error; sometimes it's more strict than others 2013-06-22 07:44:59 +00:00
rubidium
e797f53c33 (svn r25432) -Fix [FS#5608]: clang compiler error; sometimes it's more strict than others 2013-06-22 07:44:59 +00:00
fonsinchen
caf5ef9aea (svn r25426) -Fix: highlight the right entry in the sorting selector in station view window 2013-06-18 19:32:58 +00:00
fonsinchen
1584c8f733 (svn r25426) -Fix: highlight the right entry in the sorting selector in station view window 2013-06-18 19:32:58 +00:00
rubidium
18d8db683d (svn r25405) -Feature-ish: differentiate between total waiting cargo count and available (not reserved) cargo count in the station list
-Change: sort based on the cargo count, not the cargo value
2013-06-15 15:26:24 +00:00
rubidium
420f95a6e9 (svn r25405) -Feature-ish: differentiate between total waiting cargo count and available (not reserved) cargo count in the station list
-Change: sort based on the cargo count, not the cargo value
2013-06-15 15:26:24 +00:00
fonsinchen
7b2f8a885e (svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI 2013-06-09 13:08:52 +00:00
fonsinchen
0fc198cb00 (svn r25365) -Feature: show cargo by next hops and final destinations in the station GUI 2013-06-09 13:08:52 +00:00
fonsinchen
f022550df9 (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 2013-06-09 13:03:48 +00:00
fonsinchen
04e3eb6fab (svn r25361) -Feature: distribute cargo according to plan given by linkgraph 2013-06-09 13:03:48 +00:00
frosch
13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch
4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 2013-05-26 19:30:07 +00:00
frosch
16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +00:00
frosch
8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 2013-05-26 19:25:01 +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
d7751326c5 (svn r25272) -Feature: show the approximate monthly supply to a station of the different cargoes (fonsinchen) 2013-05-20 19:57:38 +00:00
rubidium
15b67dbafa (svn r25272) -Feature: show the approximate monthly supply to a station of the different cargoes (fonsinchen) 2013-05-20 19:57:38 +00:00
frosch
c5d7445704 (svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen) 2013-04-13 13:42:08 +00:00