Commit Graph

423 Commits (88d7a8ea1378236df054ef2521ede0d627e6a43c)

Author SHA1 Message Date
Jonathan G Rennison cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison 24458e9990 Add various missing override specifiers 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison f5747bf753 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/group_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison ba34ec7ade Merge branch 'master' into jgrpp
Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h
5 years ago
peter1138 317f69c152 Codechange: Use override specifier in Window-derived classes. 5 years ago
Jonathan G Rennison 32353fdf03 Fix handling, display and input of hhmm times in timetables
With high ticks/min and day length values
5 years ago
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
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
9 years ago
Jonathan G Rennison 4d1c4d18be Timetable wait in depot: minor whitespace/style changes. 9 years ago
patch-import d8c5de188f Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
patch-import 79138de1b9 Import departure boards patch 9 years ago
frosch ef0bff5ac3 (svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI. 10 years ago
frosch 4d2107bd61 (svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI. 10 years ago
fonsinchen d4aae15fa5 (svn r26550) -Change: Show measured order times in timetable GUI 10 years ago
fonsinchen 64e4e52c33 (svn r26550) -Change: Show measured order times in timetable GUI 10 years ago
fonsinchen c81a6070cb (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 10 years ago
fonsinchen 3ee31a8f89 (svn r26547) -Codechange: Collect order travel and wait times independent of timetables 10 years ago
fonsinchen d49dad9f9c (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
fonsinchen c915d9fa55 (svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private 10 years ago
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 10 years ago
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 10 years ago
rubidium 9b9acbbe2c (svn r25617) -Fix [FS#5655] (r25377): crash when Ctrl+clicking the start date button in timetable window without any orders 11 years ago
rubidium fb1d479a51 (svn r25617) -Fix [FS#5655] (r25377): crash when Ctrl+clicking the start date button in timetable window without any orders 11 years ago
rubidium 7c4b623d7d (svn r25377) -Feature: timetable spreading of vehicles by Ctrl+Click when setting a start date 11 years ago
rubidium a2af1f69af (svn r25377) -Feature: timetable spreading of vehicles by Ctrl+Click when setting a start date 11 years ago
frosch ddf817e8f3 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 11 years ago
frosch ce110eed32 (svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them. 11 years ago
frosch 13badddd75 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 4e4e635916 (svn r25294) -Feature: Add another button to window title bars to resize the window to its default size. 11 years ago
frosch 16feb5c4e9 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 8157a8afd8 (svn r25290) -Add: Assign string names to notable windows. 11 years ago
frosch 25adefca23 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
frosch 56e4a8c4d6 (svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction. 11 years ago
michi_cc 37da99ab90 (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
michi_cc c75962e04c (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
frosch eb20798aae (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch b533523258 (svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations. 12 years ago
frosch 3a58d60e9f (svn r24800) -Fix [FS#5327] (r21933): Glitch in timetable GUI. (sbr) 12 years ago
frosch 18a5ba4ad7 (svn r24800) -Fix [FS#5327] (r21933): Glitch in timetable GUI. (sbr) 12 years ago
frosch 3b06409153 (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
frosch 03736af2ae (svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default. 12 years ago
michi_cc 64c5299b4d (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 13 years ago
michi_cc f2c694c8fb (svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles. 13 years ago
michi_cc 8161459cfe (svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change. 13 years ago
michi_cc 347157cb8c (svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change. 13 years ago
truebrain 74a9412141 (svn r23553) -Fix: avoid naming conflict in widget enums 13 years ago
truebrain bcf00dbb8f (svn r23553) -Fix: avoid naming conflict in widget enums 13 years ago
truebrain e054cd36b9 (svn r23547) -Codechange: document and rename widgets to be consistent and understandable 13 years ago