Commit Graph

583 Commits

Author SHA1 Message Date
Sergii Pylypenko
3ba683874b Merge remote-tracking branch 'origin/master' into HEAD 2019-04-23 18:16:24 +03:00
Eddi-z
13056aedbc Add: Conditional order for max. reliability (patch by Cirdan, #6360) (#7017) 2019-01-05 22:10:37 +01:00
Sergii Pylypenko
66e3334f0e Merge upstream branch 1.8 2018-05-31 22:59:50 +03:00
pelya
af216cc4ef Fixed more non-hideable window titles 2018-05-31 21:55:28 +03:00
frosch
b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Sergii Pylypenko
c8f3f3c4a0 Bigger list items in vehicle orders dialog 2016-04-08 21:45:29 +03:00
pelya
3ef1c1baff Merge commit 'a8b575671894ffe1329ef37dca4989c0e60d70f5'
These merges are becoming more awful every time

Conflicts:
	src/ai/ai_gui.cpp
	src/build_vehicle_gui.cpp
	src/cheat_gui.cpp
	src/company_gui.cpp
	src/depot_gui.cpp
	src/dock_gui.cpp
	src/error_gui.cpp
	src/genworld_gui.cpp
	src/misc_gui.cpp
	src/network/network_content_gui.cpp
	src/network/network_gui.cpp
	src/newgrf_gui.cpp
	src/news_gui.cpp
	src/rail_gui.cpp
	src/rev.cpp.in
	src/road_gui.cpp
	src/settings_gui.cpp
	src/settings_gui.h
	src/signs_gui.cpp
	src/station_gui.cpp
	src/table/settings.ini
	src/terraform_gui.cpp
	src/toolbar_gui.cpp
	src/toolbar_gui.h
	src/vehicle_gui.cpp
	src/video/sdl_v.cpp
	src/viewport.cpp
	src/widget.cpp
	src/widgets/settings_widget.h
2016-03-27 22:33:11 +03:00
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. 2015-10-30 17:23:16 +00:00
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. 2015-10-30 17:23:16 +00:00
pelya
8f7e444f4f Allow scrolling when selecting destination station or building single-tile objects 2015-03-29 20:22:19 +03:00
pelya
0d3412d064 Hide all windows when selecting vehicle destination station 2015-03-29 20:22:18 +03:00
frosch
d563ff20e6 (svn r26693) -Codechange: Simplify GetOrderCmdFromTile (Juanjo) 2014-07-16 21:06:45 +00:00
frosch
8701514172 (svn r26693) -Codechange: Simplify GetOrderCmdFromTile (Juanjo) 2014-07-16 21:06:45 +00:00
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) 2014-07-16 20:56:39 +00:00
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) 2014-07-16 20:56:39 +00:00
fonsinchen
d4aae15fa5 (svn r26550) -Change: Show measured order times in timetable GUI 2014-05-01 14:53:06 +00:00
fonsinchen
64e4e52c33 (svn r26550) -Change: Show measured order times in timetable GUI 2014-05-01 14:53:06 +00:00
fonsinchen
c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +00:00
fonsinchen
3ee31a8f89 (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 2014-05-01 14:49:16 +00:00
fonsinchen
d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +00:00
fonsinchen
c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 2014-05-01 14:48:44 +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
201b3d8aa2 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
83eeba28b7 (svn r26086) -Codechange: use AutoDeleteSmallVector instead std::list for dropdowns 2013-11-24 14:46:26 +00:00
rubidium
73474728e3 (svn r26057) -Fix: a number of possibly uninitialised variables 2013-11-23 13:12:19 +00:00
rubidium
b3e93d6520 (svn r26057) -Fix: a number of possibly uninitialised variables 2013-11-23 13:12:19 +00:00
rubidium
aec32ecac1 (svn r26049) -Codechange: remove some dead code as order can't be NULL there 2013-11-22 21:42:47 +00:00
rubidium
1b924f194f (svn r26049) -Codechange: remove some dead code as order can't be NULL there 2013-11-22 21:42:47 +00:00
planetmaker
a3bde40187 (svn r25894) -Change: Unify behaviour when clicking on different items in the goto dropdown list when giving orders (adf88) 2013-10-20 19:45:27 +00:00
planetmaker
dc10b6c167 (svn r25894) -Change: Unify behaviour when clicking on different items in the goto dropdown list when giving orders (adf88) 2013-10-20 19:45:27 +00:00
planetmaker
9923a09ae9 (svn r25859) -Add [FS#5784]: Hightlight active goto item in order list dropdown (adf88) 2013-10-13 11:06:58 +00:00
planetmaker
122158b4d8 (svn r25859) -Add [FS#5784]: Hightlight active goto item in order list dropdown (adf88) 2013-10-13 11:06:58 +00:00
planetmaker
54b69cbe0d (svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88) 2013-10-13 11:06:05 +00:00
planetmaker
2609693fe8 (svn r25858) -Fix [FS#5783]: Goto button in order window was not always lowered when it should (adf88) 2013-10-13 11:06:05 +00:00
planetmaker
95bc464062 (svn r25857) -Codechange [FS#5783]: Add void goto type to indicate inactivity in order window (adf88) 2013-10-13 11:05:20 +00:00
planetmaker
7ed5f6edf9 (svn r25857) -Codechange [FS#5783]: Add void goto type to indicate inactivity in order window (adf88) 2013-10-13 11:05:20 +00:00
frosch
d20db312e6 (svn r25459) -Fix: Disable the depot-refit button in the order GUI, if the consist is not refittable. 2013-06-24 21:02:26 +00:00
frosch
e158383118 (svn r25459) -Fix: Disable the depot-refit button in the order GUI, if the consist is not refittable. 2013-06-24 21:02:26 +00:00
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. 2013-06-24 21:01:05 +00:00
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. 2013-06-24 21:01:05 +00:00
frosch
1077d2738e (svn r25457) -Fix: Do not test EF_AUTO_REFIT for the mail apartment or rotor of aircraft. 2013-06-24 20:58:25 +00:00
frosch
bfbdbe688e (svn r25457) -Fix: Do not test EF_AUTO_REFIT for the mail apartment or rotor of aircraft. 2013-06-24 20:58:25 +00:00
frosch
303aa2f473 (svn r25412) -Codechange: Make use of Window::OnHotkey 2013-06-15 15:30:44 +00:00
frosch
5cb174c6b8 (svn r25412) -Codechange: Make use of Window::OnHotkey 2013-06-15 15:30:44 +00:00
frosch
1565bb32a0 (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 2013-06-15 15:28:09 +00:00
frosch
1b8b1f3f6c (svn r25410) -Codechange: Put all hotkeys of a window into a static HotkeyList member. 2013-06-15 15:28:09 +00:00
frosch
55154f91b6 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 2013-06-15 15:27:33 +00:00
frosch
d9e9710cb3 (svn r25408) -Codechange: Simplify hotkeys by removing unused stuff. 2013-06-15 15:27:33 +00:00
frosch
25a54b58e8 (svn r25407) -Codechange: Use order hotkey enum instead of function pointers. 2013-06-15 15:27:08 +00:00