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
6 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 years ago
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
6 years ago
317f69c152
Codechange: Use override specifier in Window-derived classes.
6 years ago
32353fdf03
Fix handling, display and input of hhmm times in timetables
...
With high ticks/min and day length values
6 years ago
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
e55a327c09
Enable locking timetable travel times
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
59c396cc3b
Fix wrong line height in click to select order in timetable GUI
6 years ago
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
3ed5d8f09f
Add mechanism to lock wait times in timetable against autofill/automate changes
6 years ago
71852c3f37
Fix timetable auto-separation with go via station orders
7 years ago
78838ee2a2
Add freight train load/unload mode: through load
7 years ago
c4897f92df
Timetable GUI: Add warnings for conditional order timetabling.
7 years ago
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
3d629b0dea
Fix timetabled full-load order warning being shown for non station orders
7 years ago
414d5b2c8a
Add warning/info messages to timetable GUI
7 years ago
2e7e712f06
Ctrl+click on shared list button in order/timetable window to add veh to group
7 years ago
ac016eae5e
Add client setting to enable shared order group window for single vehicles
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
965938c0f5
Merge branch 'scheduled-dispatch-sx' into jgrpp
7 years ago
0a6ddf31a2
Double-clicking order in timetable change wait time
...
This makes the process of setting up timetable manually easier.
7 years ago
d68b2809a3
Merge branch 'departure-boards' into jgrpp
7 years ago
7d5f277a96
Fix not being able to enter 00:00 as a timetable start time.
7 years ago
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
2ee66e9b24
Merge branch 'departure-boards' into jgrpp
...
# Conflicts:
# src/timetable_gui.cpp
8 years ago
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.
8 years ago
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
509da024cc
Fix viewport order lines/markers for multiplayer clients.
8 years ago
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
d8a083b666
Allow timetable start dates to be set with full precision.
...
This avoids rounding of start dates when using minutes and
day length > 1.
9 years ago
f82673bed8
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
c042a6de9c
Fix disable state of buttons in timetable window.
...
Fixes crash when using buttons which should be disabled.
9 years ago
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
9 years ago
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.
9 years ago
efcdd6c36f
Remove global automated timetable setting.
9 years ago
04b188bd7d
Add client setting to show leftover ticks in timetable.
9 years ago
9f82f00f7a
Enable bulk timetable change actions for clear time, and set/clear speed.
9 years ago
c0cc72ad96
Implement change timetable waiting time for all stations.
...
Loosely based on http://www.tt-forums.net/viewtopic.php?f=32&t=50274
9 years ago
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
cd23d17745
Merge branch 'auto_timetables-sx' into jgrpp
...
Conflicts:
src/vehicle.cpp
9 years ago
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
0b22a8e5c6
Changes to timetable GUI to handle minutes change.
...
Use scaled date ticks internally.
Update date entry GUI.
9 years ago
3caa662c77
Timetable GUI: Scale dates/times by day length factor.
9 years ago
365f1c237f
Merge branch 'auto_timetables-sx' into jgrpp
9 years ago
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
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
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
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
80deb3c01d
Import auto timetable separation patch
...
http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899
9 years ago
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
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
9 years ago
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
9 years ago
79138de1b9
Import departure boards patch
9 years ago
ef0bff5ac3
(svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI.
10 years ago
4d2107bd61
(svn r26639) -Codechange: Simplify drawing early/late dates in timetable GUI.
10 years ago
d4aae15fa5
(svn r26550) -Change: Show measured order times in timetable GUI
11 years ago
64e4e52c33
(svn r26550) -Change: Show measured order times in timetable GUI
11 years ago
c81a6070cb
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
11 years ago
3ee31a8f89
(svn r26547) -Codechange: Collect order travel and wait times independent of timetables
11 years ago
d49dad9f9c
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
11 years ago
c915d9fa55
(svn r26546) -Codechange: Make order wait_time, travel_time and max_speed private
11 years ago
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
11 years ago
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
11 years ago
9b9acbbe2c
(svn r25617) -Fix [FS#5655] (r25377): crash when Ctrl+clicking the start date button in timetable window without any orders
11 years ago
fb1d479a51
(svn r25617) -Fix [FS#5655] (r25377): crash when Ctrl+clicking the start date button in timetable window without any orders
11 years ago
7c4b623d7d
(svn r25377) -Feature: timetable spreading of vehicles by Ctrl+Click when setting a start date
11 years ago
a2af1f69af
(svn r25377) -Feature: timetable spreading of vehicles by Ctrl+Click when setting a start date
11 years ago
ddf817e8f3
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
12 years ago
ce110eed32
(svn r25313) -Fix: Do not assume '8' to be the broadest digit, but test all of them.
12 years ago
13badddd75
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
12 years ago
4e4e635916
(svn r25294) -Feature: Add another button to window title bars to resize the window to its default size.
12 years ago
16feb5c4e9
(svn r25290) -Add: Assign string names to notable windows.
12 years ago
8157a8afd8
(svn r25290) -Add: Assign string names to notable windows.
12 years ago
25adefca23
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
12 years ago
56e4a8c4d6
(svn r25287) -Codechange: Keep a reference to the WindowDesc in the Window after construction.
12 years ago
37da99ab90
(svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum.
12 years ago
c75962e04c
(svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum.
12 years ago
eb20798aae
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
12 years ago
b533523258
(svn r24801) -Codechange: Add functions to set integral DParams to suitable values for size computations.
12 years ago
3a58d60e9f
(svn r24800) -Fix [FS#5327] (r21933): Glitch in timetable GUI. (sbr)
12 years ago
18a5ba4ad7
(svn r24800) -Fix [FS#5327] (r21933): Glitch in timetable GUI. (sbr)
12 years ago
3b06409153
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
03736af2ae
(svn r24700) -Cleanup: Remove WDF_UNCLICK_BUTTONS and make it the default.
12 years ago
64c5299b4d
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
13 years ago
f2c694c8fb
(svn r23947) -Feature: Timetabled maximum travel speeds for non-flying vehicles.
13 years ago
8161459cfe
(svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change.
13 years ago
347157cb8c
(svn r23946) -Codechange: Pass a proper enum instead of a bit flag to CmdChangeTimetable for indicating what to change.
13 years ago
74a9412141
(svn r23553) -Fix: avoid naming conflict in widget enums
13 years ago
bcf00dbb8f
(svn r23553) -Fix: avoid naming conflict in widget enums
13 years ago
e054cd36b9
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
e2726ca3f1
(svn r23547) -Codechange: document and rename widgets to be consistent and understandable
13 years ago
49e88dcbf0
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
2aa774e831
(svn r23528) -Codechange: move widget enums to widgets/NNN_type.h
13 years ago
7aa57e4acd
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
14 years ago
43c8cd1d5e
(svn r22473) -Codechange: Automatic orders are better called implicit orders as no real order influencing path finding is added
14 years ago
87272273b5
(svn r22405) -Document: some more "random-ish" tidbits
14 years ago
1a515e6344
(svn r22405) -Document: some more "random-ish" tidbits
14 years ago
a88fe7c2aa
(svn r22343) -Change: Remove pixel limiter for query strings.
14 years ago
10caf391a1
(svn r22343) -Change: Remove pixel limiter for query strings.
14 years ago
307eeb3c46
(svn r22246) -Fix: Process order window invalidations for specific orders in command-scope.
14 years ago
5689b3dbda
(svn r22246) -Fix: Process order window invalidations for specific orders in command-scope.
14 years ago
afd2e51936
(svn r22244) -Codechange: Make vehicle windows handle command-/GUI-scope invalidations themself (from autoreplace and refitting).
14 years ago
f051a81b4e
(svn r22244) -Codechange: Make vehicle windows handle command-/GUI-scope invalidations themself (from autoreplace and refitting).
14 years ago
4b4a40a72e
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
14 years ago
ec9540a12a
(svn r22241) -Codechange: Add additional to-be-used parameter to OnInvalidateData().
14 years ago
0a28d212f4
(svn r22226) -Codechange: When autoreplace invalidates vehicle windows because the Vehicle index changed, use a better eye-catcher-'data' than 0 to identify them.
14 years ago
9cf92e2bd2
(svn r22226) -Codechange: When autoreplace invalidates vehicle windows because the Vehicle index changed, use a better eye-catcher-'data' than 0 to identify them.
14 years ago
7c04ea586d
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
...
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
14 years ago
a97d52a29a
(svn r21933) -Codechange: Split cur_order_index into cur_auto_order_index and cur_real_order_index to keep track of the current real order in an unambiguous way.
...
-Fix [FS#4440]: Automatic orders behave now stable wrt. service orders and are not added or removed depending on the need of servicing.
-Fix: Various other issues with automatic orders, e.g. vehicles getting stuck with "no orders" when there are automatic orders at the end of the order list.
14 years ago
54c0dec6aa
(svn r21909) -Fix: some missing spaces
14 years ago
8017c2a3d7
(svn r21909) -Fix: some missing spaces
14 years ago
4d6841b553
(svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen
14 years ago
64f04c3a74
(svn r21642) -Feature: concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations. Based on patch by fonsinchen
14 years ago
5ec2bcc0d9
(svn r21157) -Codechange: remove information about the text direction out of the language "list"
14 years ago
30637a8340
(svn r21157) -Codechange: remove information about the text direction out of the language "list"
14 years ago
30e5d74e6d
(svn r20570) -Codechange: free/reserve some bits in the timetable commands to increase the vehicle pool limit
14 years ago
983883a2b9
(svn r20570) -Codechange: free/reserve some bits in the timetable commands to increase the vehicle pool limit
14 years ago
0dfdfbffe4
(svn r20467) -Fix (r20453): Remove personal note.
14 years ago
c808e5c30f
(svn r20467) -Fix (r20453): Remove personal note.
14 years ago
2d5ef5e5a8
(svn r20461) -Codechange: Replace WWT_HSCROLLBAR, WWT_SCROLLBAR and WWT_SCROLL2BAR with NWID_HSCROLLBAR and NWID_VSCROLLBAR.
14 years ago
9e538acc03
(svn r20461) -Codechange: Replace WWT_HSCROLLBAR, WWT_SCROLLBAR and WWT_SCROLL2BAR with NWID_HSCROLLBAR and NWID_VSCROLLBAR.
14 years ago
4817d5dcd6
(svn r20453) -Codechange: Remove direct accesses to Window::hscroll, vscroll and vscroll2.
...
Note: All windows get individual members with the same names, which are initialised via Window::GetScrollbar(). This caching is not required at all, but simplifies conversion.
14 years ago
71ca58c2bb
(svn r20453) -Codechange: Remove direct accesses to Window::hscroll, vscroll and vscroll2.
...
Note: All windows get individual members with the same names, which are initialised via Window::GetScrollbar(). This caching is not required at all, but simplifies conversion.
14 years ago
341f41e347
(svn r20452) -Codechange: Remove NWidgetCore::FindScrollbar() and associate scrollbar explicitly using a NWidgetPart via SetScrollbar().
14 years ago
10339c60c0
(svn r20452) -Codechange: Remove NWidgetCore::FindScrollbar() and associate scrollbar explicitly using a NWidgetPart via SetScrollbar().
14 years ago
8c85b4ce3d
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
e356cb9405
(svn r20281) -Codechange: unify case scope closure + break coding style
14 years ago
c92b2e9d3c
(svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH).
14 years ago
88ca183191
(svn r20239) -Doc: Give a common name to all fall throughs (FALL THROUGH).
14 years ago
ebc4438950
(svn r18980) -Codechange: preceeding -> preceding (spelling)
15 years ago
06e80d0a1f
(svn r18980) -Codechange: preceeding -> preceding (spelling)
15 years ago
94a5c917a5
(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().
15 years ago
88019e64e1
(svn r18966) -Codechange: Remove Window::OnDoubleClick() in favour of a parameter for OnClick().
15 years ago
5a3bdd8c23
(svn r18928) -Fix (r18304): The date in case of 'early arrival' was misaligned in the timetable GUI.
15 years ago
9a1dddd137
(svn r18928) -Fix (r18304): The date in case of 'early arrival' was misaligned in the timetable GUI.
15 years ago
9467b7c6d6
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
82fc28f77f
(svn r18809) -Codechange/Cleanup: remove unneeded headers from some files, if a header require a header make it include that header
15 years ago
e967f04123
(svn r18606) -Codechange: Introduce several forms of zero-size stacked display planes.
15 years ago
3323d64f28
(svn r18606) -Codechange: Introduce several forms of zero-size stacked display planes.
15 years ago
0e9dac92d2
(svn r18588) -Feature [FS#2943]: Add shading and unshading of windows.
15 years ago
91872aca48
(svn r18588) -Feature [FS#2943]: Add shading and unshading of windows.
15 years ago
f20e477a02
(svn r18580) -Codechange: Use widget information only for setting scrollbar capacity.
15 years ago
5a083f183e
(svn r18580) -Codechange: Use widget information only for setting scrollbar capacity.
15 years ago
fa5920025c
(svn r18530) -Fix (r18304): Width property set on window instead of width.
15 years ago
Jonathan G Rennison
Henry Wilson
peter1138
Charles Pigott
frosch
innocenat
patch-import
fonsinchen
rubidium
michi_cc
truebrain
planetmaker
terkhen
alberth