dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,947 Commits 1 Branch 0 Tags
59c396cc3bc9e76f0c80a07d98a45e51858e3e0c
Commit Graph

202 Commits

Author SHA1 Message Date
Jonathan G Rennison
59c396cc3b Fix wrong line height in click to select order in timetable GUI 2018-08-07 07:47:31 +01:00
Jonathan G Rennison
25bfeec048 Fix line height mismatch between columns in timetable window 
This could occur when using small fonts or large icons (e.g. BigGUI
NewGRF).
 2018-07-29 23:42:50 +01:00
Jonathan G Rennison
3ed5d8f09f Add mechanism to lock wait times in timetable against autofill/automate changes 2018-07-19 00:32:24 +01:00
Jonathan G Rennison
71852c3f37 Fix timetable auto-separation with go via station orders 2018-05-04 00:21:43 +01:00
Jonathan G Rennison
78838ee2a2 Add freight train load/unload mode: through load 2018-03-26 20:12:50 +01:00
Jonathan G Rennison
c4897f92df Timetable GUI: Add warnings for conditional order timetabling. 2017-12-18 01:47:22 +00:00
Jonathan G Rennison
218085c535 Timetable: Implement autofill/automate for taken conditional orders. 
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
 2017-12-18 01:26:27 +00:00
Jonathan G Rennison
3d629b0dea Fix timetabled full-load order warning being shown for non station orders 2017-10-01 16:41:36 +01:00
Jonathan G Rennison
414d5b2c8a Add warning/info messages to timetable GUI 2017-09-05 00:35:00 +01:00
Jonathan G Rennison
2e7e712f06 Ctrl+click on shared list button in order/timetable window to add veh to group 2017-08-18 19:17:16 +01:00
Jonathan G Rennison
ac016eae5e Add client setting to enable shared order group window for single vehicles 2017-08-18 01:49:21 +01:00
Jonathan G Rennison
f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 2017-08-15 19:26:26 +01:00
frosch
a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 2017-08-13 18:38:42 +00:00
Jonathan G Rennison
965938c0f5 Merge branch 'scheduled-dispatch-sx' into jgrpp 2017-06-08 23:27:33 +01:00
innocenat
0a6ddf31a2 Double-clicking order in timetable change wait time 
This makes the process of setting up timetable manually easier.
 2017-06-08 13:10:54 +07:00
Jonathan G Rennison
d68b2809a3 Merge branch 'departure-boards' into jgrpp 2017-06-07 21:13:24 +01:00
Jonathan G Rennison
7d5f277a96 Fix not being able to enter 00:00 as a timetable start time. 2017-06-07 21:13:15 +01:00
innocenat
0b8f0e64ec Scheduled Dispatch feature 
Code is tested and run well on small-ish train network. Not tested extensively.
 2017-05-30 01:37:08 +07:00
Jonathan G Rennison
2ee66e9b24 Merge branch 'departure-boards' into jgrpp 
# Conflicts:
#	src/timetable_gui.cpp
 2017-05-07 13:59:41 +01:00
Jonathan G Rennison
0cbb45ec63 Close child query input window when clicking buttons in timetable GUI. 
Fixes assertion failure if unrelated button is clicked between
opening and confirming query input window.
 2017-05-07 13:59:16 +01:00
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
 2016-12-26 15:38:56 +00:00
Jonathan G Rennison
509da024cc Fix viewport order lines/markers for multiplayer clients. 2016-12-26 15:35:11 +00:00
Jonathan G Rennison
375b069f82 Replace day length scaled tick macros with global variables. 
This is to avoid needing to expensively re-calculate them all the time.
Instead update them by incrementing.
 2016-09-10 01:03:48 +01:00
Jonathan G Rennison
d8a083b666 Allow timetable start dates to be set with full precision. 
This avoids rounding of start dates when using minutes and
day length > 1.
 2016-05-11 21:31:31 +01:00
Jonathan G Rennison
f82673bed8 Merge branch 'auto_timetables-sx' into jgrpp 2016-05-09 23:41:11 +01:00
Jonathan G Rennison
c042a6de9c Fix disable state of buttons in timetable window. 
Fixes crash when using buttons which should be disabled.
 2016-05-09 23:41:04 +01:00
Jonathan G Rennison
4c5173b6bf Merge branch 'auto_timetables-sx' into jgrpp 
# Conflicts:
#	src/lang/english.txt
#	src/saveload/afterload.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/table/company_settings.ini
#	src/vehicle.cpp
 2016-05-08 01:13:35 +01:00
Jonathan G Rennison
d59252d15b Timetable auto separation is now per vehicle, with a company default. 
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.

Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
 2016-05-08 01:12:07 +01:00
Jonathan G Rennison
efcdd6c36f Remove global automated timetable setting. 2016-05-06 23:33:12 +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
9f82f00f7a Enable bulk timetable change actions for clear time, and set/clear speed. 2016-03-20 11:54:57 +00:00
Jonathan G Rennison
c0cc72ad96 Implement change timetable waiting time for all stations. 
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
 2016-03-02 22:36:21 +00:00
Jonathan G Rennison
712d5e9c66 Fix set distributed timetable start not working when using minutes. 
Remove WALLCLOCK_NETWORK_COMPATIBLE, it's a pain and not useful.
Whitespace fixes.
 2016-01-30 16:02:05 +00:00
Jonathan G Rennison
cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/vehicle.cpp
 2015-11-30 22:32:29 +00:00
Jonathan G Rennison
d2b87485fb When clearing auto timetables, mark times as undefined rather than 0. 
Fix unautomate timetable having reversed ctrl key behaviour,
update tooltip string with ctrl behaviour.
Minor comment/whitespace fixes.
 2015-11-30 22:28:38 +00:00
Jonathan G Rennison
0b22a8e5c6 Changes to timetable GUI to handle minutes change. 
Use scaled date ticks internally.
Update date entry GUI.
 2015-08-30 19:38:52 +01:00
Jonathan G Rennison
3caa662c77 Timetable GUI: Scale dates/times by day length factor. 2015-08-22 01:21:55 +01:00
Jonathan G Rennison
365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 2015-08-09 17:11:11 +01:00
Jonathan G Rennison
34e41a2e26 Timetable GUI: Allow clearing of timetable time fields which are at 0. 
Allow explicitly setting timetable time fields to 0 without clearing them.
 2015-08-09 17:07:46 +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
Jonathan G Rennison
ba4e5dd62f Merge branch 'auto_timetables-sx' into jgrpp 
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_gui.cpp
	src/vehicle.cpp
 2015-08-04 22:08:59 +01:00
patch-import
80deb3c01d Import auto timetable separation patch 
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
 2015-08-04 21:27:23 +01:00
Jonathan G Rennison
e4ccea350b Merge branch 'wait_in_depot-sx' into jgrpp 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
 2015-08-03 01:12:16 +01:00
Jonathan G Rennison
4d1c4d18be Timetable wait in depot: minor whitespace/style changes. 2015-08-03 01:06:42 +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
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00
frosch
ef0bff5ac3 (svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI. 2014-06-10 16:29:03 +00:00
fonsinchen
d4aae15fa5 (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