dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,407 Commits 1 Branch 0 Tags
0cb7e253e9be41dd089c12cc0dc021a582de1f63
Commit Graph

757 Commits

Author SHA1 Message Date
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.
 2016-09-04 23:00:10 +01:00
Jonathan G Rennison
e29da8323c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-07-20 01:54:38 +01:00
Jonathan G Rennison
c6d9a49a73 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-07-20 01:54:30 +01:00
Jonathan G Rennison
8c4904a9e4 Update route markers/lines when drag/dropping vehicle orders. 2016-07-20 01:54:18 +01:00
Jonathan G Rennison
04b188bd7d Add client setting to show leftover ticks in timetable. 2016-05-06 19:47:46 +01:00
Jonathan G Rennison
0ab20d7f5c Merge branch 'enhanced_viewport_overlay-sx' into jgrpp 2016-03-01 21:32:33 +00:00
Jonathan G Rennison
83c2103895 Merge branch 'enhanced_viewport_overlay' into enhanced_viewport_overlay-sx 2016-03-01 21:32:23 +00:00
Jonathan G Rennison
dd7f5dca71 Fix route step lines not being updated when cloning a vehicle's orders. 2016-03-01 21:31:17 +00:00
Jonathan G Rennison
5149912498 Merge branch 'master' into more_cond_orders 2016-01-25 23:14:20 +00:00
Jonathan G Rennison
9826c2481e Merge branch 'order_occupancy-sx' into jgrpp 2016-01-24 02:52:05 +00:00
Jonathan G Rennison
2955610575 Add order occupancy average. 
Show overall average instead of % char in toggle button.
Add a sort mode.
 2016-01-24 02:51:40 +00:00
Jonathan G Rennison
ea3198cc25 Merge branch 'save_ext' into enhanced_viewport_overlay-sx 2015-11-18 23:33:00 +00:00
Jonathan G Rennison
8d19727c93 Merge branch 'save_ext' into jgrpp 
Conflicts:
	src/pathfinder/follow_track.hpp
 2015-10-31 10:53:00 +00:00
Jonathan G Rennison
0dbbd19223 Merge branch 'enhanced_viewport_overlay' into jgrpp 2015-10-30 21:23:11 +00:00
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).
 2015-10-30 21:05:33 +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
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
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
 2015-10-29 00:59:42 +00:00
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.
 2015-10-28 23:50:22 +00:00
Jonathan G Rennison
ef1176cf9f Merge branch 'more_cond_orders-sx' into jgrpp 2015-09-10 18:42:16 +01:00
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.
 2015-09-10 18:41:29 +01:00
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