Jonathan G Rennison
|
f7dcd66f08
|
Fix unnecessary braking when leaving station with order without non-stop flag
|
4 years ago |
Jonathan G Rennison
|
8a814bbfe3
|
Add release slot train order
|
4 years ago |
Jonathan G Rennison
|
6c3e5642f8
|
Merge branch 'master' into jgrpp
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
|
4 years ago |
Jonathan G Rennison
|
ed0ffb6220
|
Add feature: realistic train braking
Add setting to select train braking model.
|
4 years ago |
glx22
|
d8605ad18d
|
Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops
|
4 years ago |
Jonathan G Rennison
|
e1aca1ab34
|
Extend Order::flags to 16 bits, fixes conditional order target field size
Adjust order packing and CmdInsertOrder
See: #198
|
4 years ago |
Jonathan G Rennison
|
b9f7db9c7e
|
Jump counter is no longer a separate field
|
4 years ago |
Jonathan G Rennison
|
1e0005d7a0
|
Fix order lookahead changing percent of times conditional order state
|
4 years ago |
Jonathan G Rennison
|
ca79a32890
|
Scheduled dispatch: Fixup start dates when changing game date
|
4 years ago |
Jonathan G Rennison
|
7960db35f2
|
Merge branch 'master' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
|
5 years ago |
Charles Pigott
|
d1cead7f25
|
Fix: When loading old timetabled saves, also reset cached timetable duration
|
5 years ago |
glx
|
9892d90b26
|
Codechange: Replace order related FOR_ALL with range-based for loops
|
5 years ago |
Jonathan G Rennison
|
a682d330c7
|
Silence narrowing cast warning in OrderList::GetNumOrders() in MSVC
|
5 years ago |
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
|
0472327ef1
|
Scheduled dispatch: Simplify schedule copying
|
5 years ago |
Jonathan G Rennison
|
ef4055a7dc
|
Scheduled dispatch: Mark read accessers as const
|
5 years ago |
Jonathan G Rennison
|
b8820ded59
|
Fix static asserts in OrderDestinationRefcountMapKey
|
5 years ago |
Jonathan G Rennison
|
8196789eeb
|
Maintain map of vehicle order destinations refcounts, by type
|
5 years ago |
Jonathan G Rennison
|
0e5dfa42c3
|
Check order indexing and consistency in cache check
|
5 years ago |
Jonathan G Rennison
|
674732cd68
|
Merge: Codechange: Use null pointer literal instead of the NULL macro
|
6 years ago |
Henry Wilson
|
7c8e7c6b6e
|
Codechange: Use null pointer literal instead of the NULL macro
|
6 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
|
6 years ago |
Charles Pigott
|
e453572b6a
|
Codechange: Initialise a few variables that -flto seems to think could possibly be uninitialised
|
6 years ago |
Jonathan G Rennison
|
36ac643749
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/afrikaans.txt
# src/lang/basque.txt
# src/lang/belarusian.txt
# src/lang/brazilian_portuguese.txt
# src/lang/bulgarian.txt
# src/lang/catalan.txt
# src/lang/croatian.txt
# src/lang/czech.txt
# src/lang/danish.txt
# src/lang/dutch.txt
# src/lang/english.txt
# src/lang/english_AU.txt
# src/lang/english_US.txt
# src/lang/estonian.txt
# src/lang/finnish.txt
# src/lang/french.txt
# src/lang/gaelic.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/lang/greek.txt
# src/lang/hebrew.txt
# src/lang/hungarian.txt
# src/lang/icelandic.txt
# src/lang/indonesian.txt
# src/lang/irish.txt
# src/lang/italian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/latin.txt
# src/lang/latvian.txt
# src/lang/lithuanian.txt
# src/lang/luxembourgish.txt
# src/lang/norwegian_bokmal.txt
# src/lang/norwegian_nynorsk.txt
# src/lang/polish.txt
# src/lang/portuguese.txt
# src/lang/romanian.txt
# src/lang/russian.txt
# src/lang/serbian.txt
# src/lang/simplified_chinese.txt
# src/lang/slovak.txt
# src/lang/slovenian.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/swedish.txt
# src/lang/tamil.txt
# src/lang/thai.txt
# src/lang/traditional_chinese.txt
# src/lang/turkish.txt
# src/lang/ukrainian.txt
# src/lang/unfinished/persian.txt
# src/lang/vietnamese.txt
# src/lang/welsh.txt
# src/rail_cmd.cpp
# src/station_cmd.cpp
|
6 years ago |
PeterN
|
84961034e4
|
Change: Increase maximum number of orders from 64000 to ~16.7m. (#7220)
|
6 years ago |
Jonathan G Rennison
|
47b8f9b286
|
Fix order list corruption when drag-moving towards end of list
Fixes regression in 0bb9207f4d
|
6 years ago |
Jonathan G Rennison
|
0bb9207f4d
|
Index OrderList contents in a flat vector
|
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
|
3ed5d8f09f
|
Add mechanism to lock wait times in timetable against autofill/automate changes
|
6 years ago |
Jonathan G Rennison
|
3330e4cef8
|
Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
|
6 years ago |
Jonathan G Rennison
|
00b1fe6246
|
Cargo type orders: Add support for 64 cargo types
|
6 years ago |
Jonathan G Rennison
|
2e4ac325e2
|
Add extra data fields to Order extended data
|
7 years ago |
Jonathan G Rennison
|
78838ee2a2
|
Add freight train load/unload mode: through load
|
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 |
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
|
55e98d1182
|
Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
# src/saveload/extended_ver_sl.cpp
|
8 years ago |
Jonathan G Rennison
|
4c74bda0af
|
Fix extended order info not being saved for vehicle current order.
This fixes desync and related issues when loading savegames where
extended order info is used.
|
8 years ago |
Jonathan G Rennison
|
9ea018abc5
|
Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
# src/order_base.h
# src/order_gui.cpp
# src/order_type.h
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/vehicle_base.h
|
8 years ago |
Jonathan G Rennison
|
bc04b07f2b
|
Fix double-use of bits 3 and 7 in Order::flags.
Use a different encoding for the cargo type load/unload bit in flags.
|
8 years ago |
Jonathan G Rennison
|
6031cca2d7
|
Refactor Link Refresher cargo mask handling.
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
|
8 years ago |
Jonathan G Rennison
|
f8f8e642dc
|
Use unique_ptr and initialiser init for OrderExtraInfo.
|
8 years ago |
Jonathan G Rennison
|
e90b266af1
|
De-duplicate cargo masking boilerplate using C++11.
|
8 years ago |
Jonathan G Rennison
|
871d26098e
|
Move Order::cargo_type_flags into a separately allocated object.
Change savegame format, add a new chunk for cargo_type_flags.
|
8 years ago |
Jonathan G Rennison
|
3507b51d9e
|
Initial LinkRefresher support for cargo-specific links.
|
8 years ago |
Jonathan G Rennison
|
a670966acf
|
Change GetNextStoppingStation to return per-cargo result(s).
|
8 years ago |
Jonathan G Rennison
|
ed99dd2583
|
Change name of Order cargo-typed get load/unload type accessors.
Move helper functions to get cargo-specific type in cargo-specific
mode, into Order class.
|
8 years ago |