Commit Graph

364 Commits (479a9e31e9de8f8a1b899ed1f73ae86c0b7507b6)

Author SHA1 Message Date
Jonathan G Rennison e735c1a51a Merge branch 'master' into jgrpp
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/autoreplace_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_rail.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/script/api/ai/ai_station.hpp.sq
#	src/script/api/game/game_station.hpp.sq
#	src/script/api/script_station.hpp
#	src/track_func.h
#	src/vehicle_base.h
6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison 0e3986c39c Extend timetable wait/travel times from 16 to 32 bits wide 6 years ago
Jonathan G Rennison 6578d94e63 Add support for timetabled wait times at waypoints 6 years ago
Jonathan G Rennison e55a327c09 Enable locking timetable travel times 6 years ago
Jonathan G Rennison 5344ec1931 Add a "leave early" order timetable flag
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
Jonathan G Rennison 59c396cc3b Fix wrong line height in click to select order in timetable GUI 6 years ago
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).
6 years ago
Jonathan G Rennison 3ed5d8f09f Add mechanism to lock wait times in timetable against autofill/automate changes 6 years ago
Jonathan G Rennison 71852c3f37 Fix timetable auto-separation with go via station orders 6 years ago
Jonathan G Rennison 78838ee2a2 Add freight train load/unload mode: through load 6 years ago
Jonathan G Rennison c4897f92df Timetable GUI: Add warnings for conditional order timetabling. 7 years ago
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.
7 years ago
Jonathan G Rennison 3d629b0dea Fix timetabled full-load order warning being shown for non station orders 7 years ago
Jonathan G Rennison 414d5b2c8a Add warning/info messages to timetable GUI 7 years ago
Jonathan G Rennison 2e7e712f06 Ctrl+click on shared list button in order/timetable window to add veh to group 7 years ago
Jonathan G Rennison ac016eae5e Add client setting to enable shared order group window for single vehicles 7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp
# Conflicts:
#	src/vehiclelist.cpp
7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison 965938c0f5 Merge branch 'scheduled-dispatch-sx' into jgrpp 7 years ago
innocenat 0a6ddf31a2 Double-clicking order in timetable change wait time
This makes the process of setting up timetable manually easier.
7 years ago
Jonathan G Rennison d68b2809a3 Merge branch 'departure-boards' into jgrpp 7 years ago
Jonathan G Rennison 7d5f277a96 Fix not being able to enter 00:00 as a timetable start time. 7 years ago
innocenat 0b8f0e64ec Scheduled Dispatch feature
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
Jonathan G Rennison 2ee66e9b24 Merge branch 'departure-boards' into jgrpp
# Conflicts:
#	src/timetable_gui.cpp
7 years ago
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.
7 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 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.
8 years ago
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.
8 years ago
Jonathan G Rennison f82673bed8 Merge branch 'auto_timetables-sx' into jgrpp 8 years ago
Jonathan G Rennison c042a6de9c Fix disable state of buttons in timetable window.
Fixes crash when using buttons which should be disabled.
8 years ago
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
8 years ago
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.
8 years ago
Jonathan G Rennison efcdd6c36f Remove global automated timetable setting. 8 years ago
Jonathan G Rennison 04b188bd7d Add client setting to show leftover ticks in timetable. 8 years ago
Jonathan G Rennison 9f82f00f7a Enable bulk timetable change actions for clear time, and set/clear speed. 8 years ago
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
8 years ago
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.
9 years ago
Jonathan G Rennison cd23d17745 Merge branch 'auto_timetables-sx' into jgrpp
Conflicts:
	src/vehicle.cpp
9 years ago
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.
9 years ago
Jonathan G Rennison 0b22a8e5c6 Changes to timetable GUI to handle minutes change.
Use scaled date ticks internally.
Update date entry GUI.
9 years ago
Jonathan G Rennison 3caa662c77 Timetable GUI: Scale dates/times by day length factor. 9 years ago
Jonathan G Rennison 365f1c237f Merge branch 'auto_timetables-sx' into jgrpp 9 years ago
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.
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
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
9 years ago
patch-import 80deb3c01d Import auto timetable separation patch
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago