Jonathan G Rennison
|
18a42664fc
|
Merge branch 'master' into jgrpp
Remove 'byte' typedef
|
2 weeks ago |
Patric Stout
|
a3cfd23cf9
|
Codechange: rename byte to uint8_t (#12308)
|
2 months ago |
|
Jonathan G Rennison
|
fdd666f66a
|
Merge tag '14.0-beta1' into jgrpp
# Conflicts:
# src/3rdparty/squirrel/squirrel/sqcompiler.cpp
# src/aircraft.h
# src/animated_tile.h
# src/base_consist.h
# src/cargotype.h
# src/company_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/engine_gui.cpp
# src/industry_gui.cpp
# src/lang/english.txt
# src/music/extmidi.cpp
# src/network/core/network_game_info.cpp
# src/network/network_server.cpp
# src/newgrf.cpp
# src/newgrf_industries.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/order_gui.cpp
# src/order_type.h
# src/os/macosx/misc_osx.cpp
# src/os/windows/crashlog_win.cpp
# src/rail_gui.cpp
# src/rail_gui.h
# src/roadveh.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/saveload_error.hpp
# src/script/api/script_town.cpp
# src/settingsgen/settingsgen.cpp
# src/ship.h
# src/ship_cmd.cpp
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/strgen/strgen.cpp
# src/strgen/strgen.h
# src/table/settings/script_settings.ini
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/town.h
# src/town_cmd.cpp
# src/town_cmd.h
# src/town_gui.cpp
# src/train.h
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/waypoint_base.h
# src/widget.cpp
|
3 months ago |
Tyler Trahan
|
f6dd5053a3
|
Feature: Order flag to unbunch vehicles at depot (#11945)
|
4 months ago |
|
Jonathan G Rennison
|
9bea1e3cc3
|
Scheduled dispatch: Allow tagging departure slots, add to conditional order
|
4 months ago |
|
Jonathan G Rennison
|
9be3dfa69c
|
Scheduled dispatch: Use an invalid value for no last dispatch, not 0
|
4 months ago |
|
Jonathan G Rennison
|
041f36d565
|
Add try to acquire slot order subtype
|
4 months ago |
|
Jonathan G Rennison
|
2fc631b15b
|
Rename OT_RELEASE_SLOT to OT_SLOT, use a subtype field
|
4 months ago |
|
Jonathan G Rennison
|
97e6f3062e
|
Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
|
4 months ago |
|
Jonathan G Rennison
|
02aecca5ae
|
Conditional order: Replace "next station" with manually set station
|
9 months ago |
Rubidium
|
eaae0bb5e7
|
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
|
10 months ago |
|
Jonathan G Rennison
|
3cbd1a5a76
|
Add conditional order test for whether slot is empty/not empty
|
1 year ago |
|
Jonathan G Rennison
|
b089b561a5
|
Add departure board via order subtype to remove via for prior terminus
|
1 year ago |
PeterN
|
9910240f0e
|
Cleanup: Remove obsolete (Make)EnumPropsT. (#10697)
This was used by the command system to help extract p1/p2 parameters, which no longer happens.
|
1 year ago |
|
Jonathan G Rennison
|
06e0f39aff
|
Add text label and departure board via orders
|
1 year ago |
|
Jonathan G Rennison
|
3b6f7c09ad
|
Allow changing colour of orders in order list and timetable windows
|
1 year ago |
|
Jonathan G Rennison
|
38c2fa3b66
|
Add a change counter value special order type
|
2 years ago |
|
Jonathan G Rennison
|
91af0c82d3
|
Adjust CmdModifyOrder p2 bit allocation
|
2 years ago |
|
Jonathan G Rennison
|
4e8a8a5e0a
|
Add conditional order to test if last/next dispatch slot is first/last
|
2 years ago |
|
Jonathan G Rennison
|
c69ed1711d
|
Allow road vehicle go to station/waypoint orders to have a direction
|
2 years ago |
|
Jonathan G Rennison
|
904ff6757d
|
Add slot support to road vehicles, ships and aircraft
|
2 years ago |
|
Jonathan G Rennison
|
ff3473fe6a
|
Add support for multiple scheduled dispatch schedules per order list
|
2 years ago |
Michael Lutz
|
2637c06f88
|
Codechange: Un-bitstuff timetable commands.
|
2 years ago |
|
Michael Lutz
|
211c630cbe
|
Codechange: Un-bitstuff order commands.
|
2 years ago |
|
Jonathan G Rennison
|
71dfd2900a
|
Add depot order flag for specific depot
Use upper half of order flags for extra depot flags
See: #302
|
3 years ago |
|
Jonathan G Rennison
|
912c62d749
|
Add timetable lateness/earliness conditional order
|
3 years ago |
|
Jonathan G Rennison
|
8a814bbfe3
|
Add release slot train order
|
3 years ago |
|
Jonathan G Rennison
|
d42ad99688
|
Add conditional order for current time/date
|
3 years ago |
|
Jonathan G Rennison
|
6dd7b2869c
|
Increase per-vehicle order limit to 64k
See: #110
|
4 years ago |
|
Jonathan G Rennison
|
9ee8091ecc
|
Add conditional order which tests counter value
|
4 years ago |
|
Jonathan G Rennison
|
2b9c633d50
|
Add leave early if any/all cargoes fully loaded timetable modes
|
4 years ago |
|
Jonathan G Rennison
|
0100ea4e32
|
Conditional orders: Add mode to check waiting station cargo via next node
|
4 years ago |
|
Jonathan G Rennison
|
09b13dd484
|
Add conditional orders for cargo load percentage and waiting cargo amount
See: #90
|
4 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
|
36eb4165b8
|
Merge branch 'master' into jgrpp
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
|
5 years ago |
Charles Pigott
|
60e31c7cfa
|
Codechange: Remove OrderTypeByte
|
5 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
|
5 years ago |
PeterN
|
84961034e4
|
Change: Increase maximum number of orders from 64000 to ~16.7m. (#7220)
|
5 years ago |
|
Jonathan G Rennison
|
0e7519f33e
|
Merge branch 'more_cond_orders-sx' into jgrpp
# Conflicts:
# config.lib
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# src/order_gui.cpp
# src/order_type.h
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
|
5 years ago |
|
Jonathan G Rennison
|
635c7ca2d5
|
Merge branch 'save_ext' into more_cond_orders-sx
# Conflicts:
# src/lang/english.txt
# src/order_type.h
|
5 years ago |
Niels Martin Hansen
|
15a7f9da9d
|
Fix 13056ae: PR #7017 added new enum value in bad position, move it
|
5 years ago |
Eddi-z
|
13056aedbc
|
Add: Conditional order for max. reliability (patch by Cirdan, #6360) (#7017)
|
5 years ago |
|
Jonathan G Rennison
|
83a063f51c
|
Add train is in slot conditional order
|
6 years ago |
|
Jonathan G Rennison
|
0e3986c39c
|
Extend timetable wait/travel times from 16 to 32 bits wide
|
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
|
ef0a458ab6
|
Add go to depot and sell vehicle orders
Controlled by a setting (default off)
|
6 years ago |
keldorkatarn
|
78588d8ce5
|
First implementation of conditional order checking slot occupancy
(cherry picked from commit 524e3e56cb4a357ba60335f91dce1e00cb8d22f2)
Some code adjustments: serialisation/storage, formatting
See: #40
|
6 years ago |