Commit Graph

666 Commits (0b2b28959c3a959e77c896934c36fee8d9dfa95e)

Author SHA1 Message Date
Jonathan G Rennison c60bc7be1a Fix refresh/validity issues for cargo type orders GUI.
Handle case where the order disappears/moves, fixes crash if
order list is now too short.
Refresh drop-down when running as a multiplayer client, or
when another player updates the cargo options.
8 years ago
Jonathan G Rennison 5c7f36ef4b Merge branch 'enhanced_viewport_overlay' into jgrpp
Further fixes for viewport lines/marker for multiplayer clients.

# Conflicts:
#	src/lang/russian.txt
8 years ago
Jonathan G Rennison 509da024cc Fix viewport order lines/markers for multiplayer clients. 8 years ago
Jonathan G Rennison 675b88b391 Merge branch 'cargo_type_order' into jgrpp 8 years ago
Jonathan G Rennison 08fb60d314 Fix cargo drop-down boxes being too narrow, resulting in variable sizing. 8 years ago
Jonathan G Rennison 2dba3aff72 Add override annotations to classes in order_gui.cpp 8 years ago
Jonathan G Rennison 16ce37ad14 Show vehicle route markers when cargo load by type window focused. 8 years ago
Jonathan G Rennison 9ea018abc5 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison ed99dd2583 Change name of Order cargo-typed get load/unload type accessors.
Move helper functions to get cargo-specific type in cargo-specific
mode, into Order class.
8 years ago
Jonathan G Rennison c1c983ea16 Import cargo type orders patch
https://www.tt-forums.net/viewtopic.php?p=1047749#p1047749

Port to current trunk, resolve various conflicts, etc.
Adjust bit allocations for CmdModifyOrder.
Use save_ext framework for added order flags.
8 years ago
Jonathan G Rennison e29da8323c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 8 years ago
Jonathan G Rennison c6d9a49a73 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 8 years ago
Jonathan G Rennison 8c4904a9e4 Update route markers/lines when drag/dropping vehicle orders. 8 years ago
Jonathan G Rennison 04b188bd7d Add client setting to show leftover ticks in timetable. 8 years ago
Jonathan G Rennison 0ab20d7f5c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 8 years ago
Jonathan G Rennison 83c2103895 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 8 years ago
Jonathan G Rennison dd7f5dca71 Fix route step lines not being updated when cloning a vehicle's orders. 8 years ago
Jonathan G Rennison 5149912498 Merge branch 'master' into more_cond_orders 9 years ago
Jonathan G Rennison 9826c2481e Merge branch 'order_occupancy-sx' into jgrpp 9 years ago
Jonathan G Rennison 2955610575 Add order occupancy average.
Show overall average instead of % char in toggle button.
Add a sort mode.
9 years ago
Jonathan G Rennison ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 9 years ago
Jonathan G Rennison 8d19727c93 Merge branch 'save_ext' into jgrpp
Conflicts:
	src/pathfinder/follow_track.hpp
9 years ago
Jonathan G Rennison 0dbbd19223 Merge branch 'enhanced_viewport_overlay' into jgrpp 9 years ago
Jonathan G Rennison 129e14d817 Fix redrawing/clearing of vehicle route lines.
Fix new route lines not being (fully) added in a timely manner.
Fix old lines not being (fully) removed until a scroll/zoom.
Fix the screen invalidation algorithm assuming that the terrain is
perfectly flat at at near sea level. (Use of MarkTileDirtyByTile to
clear lines which do not follow tile height contours).
9 years ago
frosch 44d1fc4253 (svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows. 9 years ago
frosch c74ffeecd1 (svn r27425) -Fix [FS#5842]: Crash when switching to or taking over companies, when an order window of a vehicle of the new company was opened. Now close those windows. 9 years ago
Jonathan G Rennison 2e6b4cc961 Merge branch 'reverse_at_waypoint' into jgrpp
Conflicts:
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/train_cmd.cpp
9 years ago
Jonathan G Rennison 7bcd090a0f Add reverse at waypoint orders.
The train will reverse when its tail is within the waypoint tile.
This is useful for reversing on train en-route, without creating
dedicated reversing sidings or platforms.
9 years ago
Jonathan G Rennison ef1176cf9f Merge branch 'more_cond_orders-sx' into jgrpp 9 years ago
Jonathan G Rennison 2d47c47a45 Fix new cond. order value widgets not being in the non-train orders window.
Copy the missing widgets from the train orders window.
9 years ago
Jonathan G Rennison 32dffceaa0 Merge branch 'order_occupancy-sx' into jgrpp 9 years ago
Jonathan G Rennison 0cf7428f85 Fix crash in competitor orders GUI.
Fix attempt to set occupancy widget displayed pane in
competitors order GUI, where the occupancy widget is not present.
9 years ago
Jonathan G Rennison 8357b911e5 Merge branch 'more_cond_orders-sx' into jgrpp
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
9 years ago
Jonathan G Rennison ffdd845b1c Merge branch 'master' into more_cond_orders
Conflicts:
	src/order_base.h
	src/order_gui.cpp
	src/saveload/saveload.cpp
	src/saveload/saveload.h
9 years ago
Jonathan G Rennison ea5c33029b Fix various whitespace and style issues. 9 years ago
patch-import c757a97214 Import more conditional orders patch
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
9 years ago
Jonathan G Rennison f0fecda985 Merge branch 'order_occupancy-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
9 years ago
Jonathan G Rennison 117599ec7f Order occupancy: Add column to orders GUI to show occupancy running average.
This is an exponentially weighted moving average of occupancies updated
when any vehicle in the shared order set leaves the station of that order.
The weighting factor is an adv setting.
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
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
patch-import d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
frosch d563ff20e6 (svn r26693) -Codechange: Simplify GetOrderCmdFromTile (Juanjo) 10 years ago
frosch 8701514172 (svn r26693) -Codechange: Simplify GetOrderCmdFromTile (Juanjo) 10 years ago
frosch dbc67efa98 (svn r26692) -Fix [FS#6059]: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff. (Juanjo) 10 years ago
frosch 14c4b24405 (svn r26692) -Fix [FS#6059]: Ordering a vehicle to a competitor's rail waypoint displayed an error message. Ignore the click as is done for the other order types to competitor's stuff. (Juanjo) 10 years ago
fonsinchen d4aae15fa5 (svn r26550) -Change: Show measured order times in timetable GUI 10 years ago
fonsinchen 64e4e52c33 (svn r26550) -Change: Show measured order times in timetable GUI 10 years ago
fonsinchen c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 10 years ago
fonsinchen 3ee31a8f89 (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 10 years ago
fonsinchen d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
fonsinchen c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 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 73474728e3 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
rubidium b3e93d6520 (svn r26057) -Fix: a number of possibly uninitialised variables 11 years ago
rubidium aec32ecac1 (svn r26049) -Codechange: remove some dead code as order can't be NULL there 11 years ago
rubidium 1b924f194f (svn r26049) -Codechange: remove some dead code as order can't be NULL there 11 years ago
planetmaker a3bde40187 (svn r25894) -Change: Unify behaviour when clicking on different items in the goto dropdown list when giving orders (adf88) 11 years ago
planetmaker dc10b6c167 (svn r25894) -Change: Unify behaviour when clicking on different items in the goto dropdown list when giving orders (adf88) 11 years ago
planetmaker 9923a09ae9 (svn r25859) -Add [FS#5784]: Hightlight active goto item in order list dropdown (adf88) 11 years ago
planetmaker 122158b4d8 (svn r25859) -Add [FS#5784]: Hightlight active goto item in order list dropdown (adf88) 11 years ago
planetmaker 54b69cbe0d (svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88) 11 years ago
planetmaker 2609693fe8 (svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88) 11 years ago
planetmaker 95bc464062 (svn r25857) -Codechange [FS#5783]: Add void goto type to indicate inactivity in order window (adf88) 11 years ago
planetmaker 7ed5f6edf9 (svn r25857) -Codechange [FS#5783]: Add void goto type to indicate inactivity in order window (adf88) 11 years ago
frosch d20db312e6 (svn r25459) -Fix: Disable the depot-refit button in the order GUI, if the consist is not refittable. 11 years ago
frosch e158383118 (svn r25459) -Fix: Disable the depot-refit button in the order GUI, if the consist is not refittable. 11 years ago
frosch c1f52d46fe (svn r25458) -Fix-ish: Enable the autorefit-button in the order GUI in case the vehicle is not auto-refittable but already has a autorefit-order set to allow clearing the refit. 11 years ago
frosch 58ae2d5aeb (svn r25458) -Fix-ish: Enable the autorefit-button in the order GUI in case the vehicle is not auto-refittable but already has a autorefit-order set to allow clearing the refit. 11 years ago
frosch 1077d2738e (svn r25457) -Fix: Do not test EF_AUTO_REFIT for the mail apartment or rotor of aircraft. 11 years ago
frosch bfbdbe688e (svn r25457) -Fix: Do not test EF_AUTO_REFIT for the mail apartment or rotor of aircraft. 11 years ago
frosch 303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 11 years ago
frosch 5cb174c6b8 (svn r25412) -Codechange: Make use of Window::OnHotkey 11 years ago
frosch 1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 11 years ago
frosch 1b8b1f3f6c (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 11 years ago
frosch 55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 11 years ago
frosch d9e9710cb3 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 11 years ago
frosch 25a54b58e8 (svn r25407) -Codechange: Use order hotkey enum instead of function pointers. 11 years ago
frosch cd0a57fba3 (svn r25407) -Codechange: Use order hotkey enum instead of function pointers. 11 years ago
frosch ab8fca3900 (svn r25406) -Cleanup: There were two hotkeys to toggle between 'unload' and 'unload if possible'. 11 years ago
frosch 59b71b5666 (svn r25406) -Cleanup: There were two hotkeys to toggle between 'unload' and 'unload if possible'. 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
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 68b078761d (svn r24834) -Fix [FS#5396]: The autorefit dropdown in the order GUI wasn't always updated when modifying vehicle consists. 12 years ago
michi_cc 01566d6816 (svn r24834) -Fix [FS#5396]: The autorefit dropdown in the order GUI wasn't always updated when modifying vehicle consists. 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 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