dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,470 Commits 1 Branch 0 Tags
ec302b85310bcecefb054cd79d96badb2981f97c
Commit Graph

636 Commits

Author SHA1 Message Date
Jonathan G Rennison
32dffceaa0 Merge branch 'order_occupancy-sx' into jgrpp 2015-08-31 16:36:02 +01:00
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.
 2015-08-31 16:35:24 +01:00
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
 2015-08-26 23:24:41 +01:00
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
 2015-08-26 22:51:47 +01:00
Jonathan G Rennison
ea5c33029b Fix various whitespace and style issues. 2015-08-26 22:49:08 +01:00
patch-import
c757a97214 Import more conditional orders patch 
http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
 2015-08-26 22:28:20 +01:00
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
 2015-08-09 23:45:21 +01:00
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.
 2015-08-09 23:39:55 +01:00
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
 2015-08-06 23:11:49 +01:00
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
 2015-08-06 22:55:09 +01:00
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
 2015-08-06 22:24:28 +01:00
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
 2015-08-05 21:54:11 +01:00
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
 2015-08-05 21:24:30 +01:00
patch-import
d8c5de188f Import timetabling wait time in depots patch 
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
 2015-08-03 01:06:12 +01: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