Commit Graph

1118 Commits (957cff34dc30bdf51943e6810f8c0d449d70c75a)

Author SHA1 Message Date
frosch ba955956cb (svn r27428) -Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable. 9 years ago
frosch 0974f5489b (svn r27428) -Fix: When selecting a refit cargo for orders, do not check whether the vehicle is in a depot or station, and do not ask whether the vehicle currently allows station-refitting. Also hide the refit cost for orders, it is not predictable. 9 years ago
Jonathan G Rennison 5d7ad2ba7b Merge branch 'vehicle_details_gui_additions' into jgrpp
Conflicts:
	src/table/settings.ini
9 years ago
Jonathan G Rennison 5a07315405 Add train length and group name to vehicle details window.
Add settings to control each, default on.
Re-init window whenever presence of group name line changes.
9 years ago
Jonathan G Rennison 4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
9 years ago
Jonathan G Rennison a4ad4130a6 Merge branch 'master' into infrastructure_sharing
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
9 years ago
patch-import ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
Jonathan G Rennison 7ed93f9211 Merge branch 'enhanced_viewport_overlay-sx' into jgrpp
town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h
9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison 80d52eb20e Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
9 years ago
patch-import 9f5164b403 Import Improved Breakdowns patch
Fix trailing whitespace

http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
9 years ago
frosch 8767a11d60 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
frosch a8080b6256 (svn r27134) -Codechange: Simplify GUI scaling by adding UnScaleGUI() and ScaleGUITrad(). 10 years ago
peter1138 0889145dc5 (svn r27024) -Codechange: Adjust spacing on small order list. 10 years ago
peter1138 f5d964bdbd (svn r27024) -Codechange: Adjust spacing on small order list. 10 years ago
rubidium 890f50d491 (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 10 years ago
rubidium a72dd0480c (svn r27013) -Codechange: extract the functionality to determine the number of digits to make space for when drawing an unit number into a separate function 10 years ago
peter1138 6872b647f1 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 10 years ago
peter1138 0877f892c5 (svn r26960) -Codechange: Draw sort button symbols as sprites, and pad sort buttons with non-static width. 10 years ago
peter1138 f7f49c15a3 (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 10 years ago
peter1138 ce9fab58bc (svn r26951) -Codechange: Do the GUI-scale dance for vehicle, depot, and purchase lists. 10 years ago
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 10 years ago
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 10 years ago
rubidium 201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 11 years ago
rubidium 83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 11 years ago
rubidium 1f067c8529 (svn r25965) -Fix [FS#5800]: the wrong vehicle would be taken in a shared order vehicle list window when the ID >= 65536, causing assertions triggering later on 11 years ago
rubidium be4355edd3 (svn r25965) -Fix [FS#5800]: the wrong vehicle would be taken in a shared order vehicle list window when the ID >= 65536, causing assertions triggering later on 11 years ago
alberth 0df874d18d (svn r25805) -Fix[FS#5740]: Ensure the vehicle bar is high enough for the start/stop vehicle graphics (adf88). 11 years ago
alberth 999e76d305 (svn r25805) -Fix[FS#5740]: Ensure the vehicle bar is high enough for the start/stop vehicle graphics (adf88). 11 years ago
alberth 03f2d5ded7 (svn r25804) -Fix[FS#5739]: Lower sprite and text at the vehicle bar if it is pressed (adf88). 11 years ago
alberth 26dbdafeed (svn r25804) -Fix[FS#5739]: Lower sprite and text at the vehicle bar if it is pressed (adf88). 11 years ago
alberth 736359623b (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 11 years ago
alberth 5437a588a0 (svn r25803) -Fix[FS#5738]: Draw start/stop graphics of the vehicle bar at the right place in rtl mode (adf88). 11 years ago
frosch de8a325d6e (svn r25542) -Fix: Do not just add 65 pixels to the width of the train vehicle list whenever it is opened, but remember the width of the train list separately from other vehicle types. 11 years ago
frosch f128c61595 (svn r25542) -Fix: Do not just add 65 pixels to the width of the train vehicle list whenever it is opened, but remember the width of the train list separately from other vehicle types. 11 years ago
frosch 2967eb8749 (svn r25541) -Cleanup: No need to clear a bit which is never set. 11 years ago
frosch c640289d7f (svn r25541) -Cleanup: No need to clear a bit which is never set. 11 years ago
frosch 538159cb1d (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 11 years ago
frosch 43ec0bf0c1 (svn r25537) -Codechange: Optionally make WWT_MATRIX compute the number of rows and columns from the resize step size. 11 years ago
frosch f6d27acb51 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 11 years ago
frosch 98fdd20f84 (svn r25531) -Codechange: Use separate function to set data of WWT_MATRIX widgets. 11 years ago
frosch 5ede413531 (svn r25456) -Fix [FS#5560]: Assertion when opening the refit GUI for a not refittable vehicle. 11 years ago
frosch abb5a13f1e (svn r25456) -Fix [FS#5560]: Assertion when opening the refit GUI for a not refittable vehicle. 11 years ago
frosch 13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
frosch 1876078983 (svn r25058) -Add: tree nodes in the refit GUI for subtype refits. 11 years ago
frosch 591cab43b9 (svn r25058) -Add: tree nodes in the refit GUI for subtype refits. 11 years ago
frosch dacb82695b (svn r25044) -Change: Collapse subtypes in the refit GUI and only expand them after selecting the cargo type. 12 years ago
frosch 2f3fdbf837 (svn r25044) -Change: Collapse subtypes in the refit GUI and only expand them after selecting the cargo type. 12 years ago
frosch f81b2246fc (svn r25043) -Change [FS#3764]: Only display subtypes in the refit GUI which are available for all selected vehicles. Also add a generic list item to refit while keeping the subtypes of individual vehicles. 12 years ago
frosch 5cd5aca98c (svn r25043) -Change [FS#3764]: Only display subtypes in the refit GUI which are available for all selected vehicles. Also add a generic list item to refit while keeping the subtypes of individual vehicles. 12 years ago
frosch ddfbe086ed (svn r25042) -Codechange/Fix: Simplify accumulation of refit options; also don't compare GRF local IDs from different GRFs. 12 years ago
frosch b9aeb050e1 (svn r25042) -Codechange/Fix: Simplify accumulation of refit options; also don't compare GRF local IDs from different GRFs. 12 years ago
frosch 972c4560dc (svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case. 12 years ago
frosch 22bb015f3d (svn r25041) -Remove [FS#3764-ish]: ordered refit with subtypes, since the cases where it worked were corner cases rather than the general case. 12 years ago
rubidium e5411e5ec3 (svn r24997) -Change: Use dropdown list to select between Default/Days/Percentage (peter1138) 12 years ago
rubidium 3d7860e0a5 (svn r24997) -Change: Use dropdown list to select between Default/Days/Percentage (peter1138) 12 years ago
rubidium 8539c04192 (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 12 years ago
rubidium 369a6f9d1b (svn r24995) -Codechange: Add flags to vehicle service interval for custom & ispercent (peter1138) 12 years ago
rubidium 2c67dc3d9f (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 12 years ago
rubidium c77cd1f409 (svn r24994) -Codechange: Replace access to service_interval with accessors (peter1138) 12 years ago
frosch 1d177f0984 (svn r24938) -Fix [FS#5447-ish]: Never put a space between cargo name and subtype. 12 years ago
frosch f563250c0b (svn r24938) -Fix [FS#5447-ish]: Never put a space between cargo name and subtype. 12 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
michi_cc 37da99ab90 (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
michi_cc c75962e04c (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
frosch 3d695ab97c (svn r24808) -Feature(ette) [FS#4458]: When share-cloning vehicles don't open the vehicle window of the new vehicle. The only reasonable thing to do with the new vehicle is to start it, which can also be done via the depot GUI. 12 years ago
frosch 8872ed12ff (svn r24808) -Feature(ette) [FS#4458]: When share-cloning vehicles don't open the vehicle window of the new vehicle. The only reasonable thing to do with the new vehicle is to start it, which can also be done via the depot GUI. 12 years ago
frosch eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch 3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
frosch ade35f40f6 (svn r24553) -Add: Separate the 'available vehicles' from the other buttons in the vehicle list. 12 years ago
frosch 13666b1520 (svn r24553) -Add: Separate the 'available vehicles' from the other buttons in the vehicle list. 12 years ago
terkhen d7b301117d (svn r24544) -Fix [FS#5297]: Do not show profit from refits as cost in the refit window. 12 years ago
terkhen 139c3470f8 (svn r24544) -Fix [FS#5297]: Do not show profit from refits as cost in the refit window. 12 years ago
alberth 164333067d (svn r24392) -Fix [FS#5239]: Use the 'all vehicles' group for the autoreplace window from the vehicle list. 12 years ago
alberth a9b1a36656 (svn r24392) -Fix [FS#5239]: Use the 'all vehicles' group for the autoreplace window from the vehicle list. 12 years ago
frosch 358a2bd6ed (svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked. 12 years ago
frosch 08a8c3a773 (svn r24384) -Fix [FS#5188-ish]: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked. 12 years ago
frosch 279bfa8482 (svn r24260) -Change [FS#5126]: Make the oilrig-vehicle list accessible to specators and colour it's caption neutrally grey. 12 years ago
frosch db09f67674 (svn r24260) -Change [FS#5126]: Make the oilrig-vehicle list accessible to specators and colour it's caption neutrally grey. 12 years ago
rubidium c4c8b44ab5 (svn r24023) -Fix [FS#5090]: pass cases down into the list of cargos 12 years ago
rubidium bf6434abaf (svn r24023) -Fix [FS#5090]: pass cases down into the list of cargos 12 years ago
rubidium d5eeab43b7 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
rubidium 6d6be50ae0 (svn r23740) -Codechange: remove some 300 unneeded includes from the .cpp files 13 years ago
smatz cf54bc425f (svn r23706) -Codechange: prevent 'unknown command' doxygen errors 13 years ago
smatz bcd3f2bb59 (svn r23706) -Codechange: prevent 'unknown command' doxygen errors 13 years ago
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) 13 years ago
truebrain 1c9bec1999 (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) 13 years ago
rubidium 6b404d35b8 (svn r23540) -Codechange: unify and document vehicle widgets 13 years ago
rubidium 4de1f3be88 (svn r23540) -Codechange: unify and document vehicle widgets 13 years ago
truebrain 49e88dcbf0 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
truebrain 2aa774e831 (svn r23528) -Codechange: move widget enums to widgets/NNN_type.h 13 years ago
rubidium 24263638bf (svn r23526) -Codechange: unify cargos vs cargoes 13 years ago
rubidium 3d88c74389 (svn r23526) -Codechange: unify cargos vs cargoes 13 years ago
michi_cc 957b643ae6 (svn r23504) -Feature: Aircraft range. 13 years ago
michi_cc def8e7215b (svn r23504) -Feature: Aircraft range. 13 years ago
frosch e83fa1da5b (svn r23487) -Change/Fix: Make autoreplace, autorenew, cloning and autorefit check all articulated parts of a vehicle to find a shared cargo subtype. 13 years ago
frosch 2fe8e89a45 (svn r23487) -Change/Fix: Make autoreplace, autorenew, cloning and autorefit check all articulated parts of a vehicle to find a shared cargo subtype. 13 years ago
rubidium 7abb74d4a2 (svn r23484) -Fix [FS#4770]: in case you already have orders, ignore the vehicles when adding an extra order 13 years ago
rubidium b5a2183214 (svn r23484) -Fix [FS#4770]: in case you already have orders, ignore the vehicles when adding an extra order 13 years ago
peter1138 b84174fd4d (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 13 years ago
peter1138 81598273e9 (svn r23316) -Feature: Add ability to zoom in to 2x and 4x level. 13 years ago
frosch 6365d92776 (svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts. 13 years ago
frosch d8f8909f85 (svn r23142) -Change: [NewGRF v8] Unify the return values of callbacks returning D0xx texts. 13 years ago
michi_cc 2b64009657 (svn r23111) -Fix: Keep subtype when automatically choosing the cargo for auto-refitting. 13 years ago
michi_cc ad2fdd8d6f (svn r23111) -Fix: Keep subtype when automatically choosing the cargo for auto-refitting. 13 years ago
michi_cc a50877bef7 (svn r23089) -Add: Allow specifying refits for go-to station orders. 13 years ago
michi_cc 3f853e7a56 (svn r23089) -Add: Allow specifying refits for go-to station orders. 13 years ago
frosch 6e61fee028 (svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs. 13 years ago
frosch bbc3409942 (svn r23080) -Feature: [NewGRF] Use variable 10 to enable vehicle GRFs to draw different sprites on the map and in various GUIs. 13 years ago
frosch ad38f27242 (svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code. 13 years ago
frosch acc3c75951 (svn r23075) -Codechange: Add GetGRF() and GetGRFID() methods to Engine and Vehicle to simplify code. 13 years ago
frosch e57ba5d0ae (svn r23074) -Codechange: Add Vehicle::GetEngine() to simplify code. 13 years ago
frosch 72cd855978 (svn r23074) -Codechange: Add Vehicle::GetEngine() to simplify code. 13 years ago
frosch f9f257ce4a (svn r22984) -Feature: Display profit icons for groups in the group GUI. 13 years ago
frosch 23a2f23eb3 (svn r22984) -Feature: Display profit icons for groups in the group GUI. 13 years ago
terkhen bc1fc20e9c (svn r22941) -Fix: Calculate the size of the start/stop vehicle button correctly. 13 years ago
terkhen 7d0811d08e (svn r22941) -Fix: Calculate the size of the start/stop vehicle button correctly. 13 years ago
yexo 996f10b775 (svn r22373) -Fix (r19955) (r20041) [FS#4592]: crash when clicking a removed company in the vehiclelist dropdowns 13 years ago
yexo d30a9ea6a2 (svn r22373) -Fix (r19955) (r20041) [FS#4592]: crash when clicking a removed company in the vehiclelist dropdowns 13 years ago
terkhen a88fe7c2aa (svn r22343) -Change: Remove pixel limiter for query strings. 13 years ago
terkhen 10caf391a1 (svn r22343) -Change: Remove pixel limiter for query strings. 13 years ago
frosch db3a8d1abf (svn r22247) -Codechange: Update comments wrt. ForceRebuild() in command-scope. 13 years ago
frosch 652c9cb663 (svn r22247) -Codechange: Update comments wrt. ForceRebuild() in command-scope. 13 years ago
frosch 071957f593 (svn r22245) -Codechange: Make vehicle lists handle command-/GUI-scope invalidations themself. 13 years ago
frosch dd20823277 (svn r22245) -Codechange: Make vehicle lists handle command-/GUI-scope invalidations themself. 13 years ago
frosch afd2e51936 (svn r22244) -Codechange: Make vehicle windows handle command-/GUI-scope invalidations themself (from autoreplace and refitting). 13 years ago
frosch f051a81b4e (svn r22244) -Codechange: Make vehicle windows handle command-/GUI-scope invalidations themself (from autoreplace and refitting). 13 years ago
frosch 4b4a40a72e (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
frosch ec9540a12a (svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData(). 13 years ago
frosch 1a14c133c6 (svn r22228) -Fix (r22135)[FS#4546]: Do not resort town, industry and signs list directly in OnInvalidateData(). There might be a scheduled rebuild which needs execution first. So, only set a trigger for resorting. 14 years ago
frosch 77d1dcb926 (svn r22228) -Fix (r22135)[FS#4546]: Do not resort town, industry and signs list directly in OnInvalidateData(). There might be a scheduled rebuild which needs execution first. So, only set a trigger for resorting. 14 years ago
frosch 0a28d212f4 (svn r22226) -Codechange: When autoreplace invalidates vehicle windows because the Vehicle index changed, use a better eye-catcher-'data' than 0 to identify them. 14 years ago
frosch 9cf92e2bd2 (svn r22226) -Codechange: When autoreplace invalidates vehicle windows because the Vehicle index changed, use a better eye-catcher-'data' than 0 to identify them. 14 years ago
frosch 04f56cf6ed (svn r22140) -Fix (r22135): I like the letter 'l' nevertheless. (Alberth) 14 years ago
frosch f34e9ff074 (svn r22140) -Fix (r22135): I like the letter 'l' nevertheless. (Alberth) 14 years ago
frosch 074548f8f3 (svn r22135) -Fix [FS#4523]: When commands need to invalidate windows, process these events asynchronously before the next redraw. Calling window code directly from command scope uses wrong _current_company and might issue nested DoCommands() which interfer with the running command. 14 years ago
frosch 19b7249ade (svn r22135) -Fix [FS#4523]: When commands need to invalidate windows, process these events asynchronously before the next redraw. Calling window code directly from command scope uses wrong _current_company and might issue nested DoCommands() which interfer with the running command. 14 years ago
terkhen f0dbdf1544 (svn r22118) -Fix [FS#4525]: The refit window was not correctly updated after selecting with Ctrl+Click (Regiovogel). 14 years ago
terkhen dcd158b03e (svn r22118) -Fix [FS#4525]: The refit window was not correctly updated after selecting with Ctrl+Click (Regiovogel). 14 years ago
rubidium 561b9b899f (svn r22034) -Fix [FS#4488]: crash when watching the vehicle view of a vehicle that has multiple sequential nearest depot orders (or consists of a single nearest depot order) when there is no depot with index 0 14 years ago
rubidium 7c254110c0 (svn r22034) -Fix [FS#4488]: crash when watching the vehicle view of a vehicle that has multiple sequential nearest depot orders (or consists of a single nearest depot order) when there is no depot with index 0 14 years ago