dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,281 Commits 1 Branch 0 Tags
e1d629dba369f4ba4353fc80096cbdbfa357b75c
Commit Graph

325 Commits

Author SHA1 Message Date
Jonathan G Rennison
6c329871f1 Scheduled dispatch: Add per dispatch slot flags field 
Add flag for slot re-use
 2024-01-28 01:48:54 +00:00
Jonathan G Rennison
822ecae85d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/cargotype.h
#	src/core/CMakeLists.txt
#	src/core/span_type.hpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/misc/endian_buffer.hpp
#	src/misc_gui.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/stdafx.h
#	src/string_func.h
#	src/strings.cpp
#	src/strings_func.h
#	src/strings_internal.h
 2024-01-25 18:37:23 +00:00
Jonathan G Rennison
5b7689a0aa Scheduled dispatch: Add flag to re-use all dispatch slots 2024-01-22 01:35:04 +00:00
Jonathan G Rennison
606d7cd814 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/airport_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/direction_type.h
#	src/gfx_type.h
#	src/group_gui.cpp
#	src/misc_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/signs_gui.cpp
#	src/slope_func.h
#	src/smallmap_gui.cpp
#	src/terraform_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/town_type.h
#	src/vehicle_type.h
#	src/widget_type.h
 2024-01-21 23:03:08 +00:00
Jonathan G Rennison
97e6f3062e Adding of _t to (u)int types, and WChar to char32_t 
See: eaae0bb5e
 2024-01-07 17:20:41 +00:00
Jonathan G Rennison
f034714559 Use StringBuilder for GetString/GetStringWithArgs, as per upstream 
Update dependent code as required
 2024-01-05 21:12:54 +00:00
Jonathan G Rennison
59ea48c541 Scheduled dispatch: Allow moving dispatch schedules in schedule list 2023-09-23 12:05:05 +01:00
Michael Lutz
4c6ed36b6a Add: [Script] Game script control of industry production level. 
(cherry picked from commit 1c56991213)
 2023-09-02 19:26:54 +01:00
mrmbernardi
74c0678015 Feature: [GS] Goal destination can be updated (#10817) 
(cherry picked from commit 35ef6c1723)
 2023-09-02 19:26:54 +01:00
Michael Lutz
1c56991213 Add: [Script] Game script control of industry production level. 2023-09-02 16:20:59 +02:00
Jonathan G Rennison
3b8d8aeb6a TBTR: Adjust config buttons/text in main window 
Clarify refit and depot options
Adjust layout
 2023-08-26 23:59:52 +01:00
Jonathan G Rennison
2b44d3302e CommandCost: Change AllocSummaryMessage to std::string SummaryMessage 2023-08-20 22:30:33 +01:00
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
 2023-07-19 19:30:14 +02:00
mrmbernardi
35ef6c1723 Feature: [GS] Goal destination can be updated (#10817) 2023-06-08 18:00:31 +01:00
Jonathan G Rennison
bc07331056 Remove src/3rdparty/optional 2023-06-05 21:26:41 +01:00
Jonathan G Rennison
13183d3f13 Add command result flag for whether SetResultData was called 
Use for tracerestrict validation result fail offset
 2023-05-30 23:41:19 +01:00
Jonathan G Rennison
bac8f032da Re-add company shares 2023-05-30 18:57:42 +01:00
Jonathan G Rennison
02fe4af934 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
 2023-05-30 00:49:24 +01:00
Jonathan G Rennison
8e2319ad68 Scheduled dispatch: Add button to adjust departure slots 2023-05-09 20:16:36 +01:00
Rubidium
68ff3fd062 Change: include fmt.h C++ headers in stdafx.h 
This to prevent compilation issues between runs with and without precompiled
headers. Also remove the headers from the rest of the code base as they are
not needed there anymore, although they do relatively little harm.
 2023-05-08 16:49:23 +02:00
Jonathan G Rennison
8f92668e22 Scheduled dispatch: Add menu item to append schedules from another vehicle 2023-05-07 20:06:47 +01:00
Jonathan G Rennison
62ecad1b63 Scheduled dispatch: Add menu item to duplicate current schedule 2023-05-07 14:02:37 +01:00
Jonathan G Rennison
31f476220d Allow converting track by individual track pieces instead of whole tiles 
Ctrl-click on convert button

See: #509
 2023-05-06 16:20:23 +01:00
Jonathan G Rennison
211c1ba61d Allow naming scheduled dispatch schedules 2023-04-29 12:19:28 +01:00
Patric Stout
36a0818bc5 Remove: buying/selling/owning company shares (#10709) 2023-04-29 10:16:49 +02:00
Jonathan G Rennison
87fabe99df Allow exchanging a station's name with another station in the same town 2023-04-11 19:22:15 +01:00
Jonathan G Rennison
ae7c86c49d Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/release-linux.yml
#	.github/workflows/release-macos.yml
#	src/industry_cmd.cpp
#	src/industry_cmd.h
#	src/network/core/http_curl.cpp
#	src/network/core/tcp_http.cpp
#	src/network/core/tcp_http.h
#	src/network/network_content.h
#	src/script/api/script_goal.cpp
#	src/script/api/script_industry.cpp
#	src/script/api/script_league.cpp
#	src/script/api/script_story_page.cpp
#	src/script/api/script_town.cpp
#	src/train.h
#	src/train_cmd.cpp
 2023-03-04 01:17:27 +00:00
Tyler Trahan
44848f4edf Add: CommandCost supports an optional second error string 2023-03-03 17:11:14 -05:00
dP
c73b88ddca Fix: Don't send unused tile field over the network (#10507) 2023-02-24 22:50:11 +01:00
dP
fe2c8a1240 Codechange: Decouple INDUSTRY_CTRL into separate commands (#10475) 2023-02-14 11:29:11 +01:00
Jonathan G Rennison
17f1d92072 Template replacement: Allow naming templates 
See: #481
 2023-02-06 23:48:46 +00:00
Rubidium
6dfd2cad69 Fix: comparison result is always the same warnings 2023-01-15 00:24:20 +01:00
Tyler Trahan
8063fcb6e0 Feature: Ctrl-click to bulk edit timetable speeds/waiting times (#10265) 2022-12-25 13:20:31 -05:00
Jonathan G Rennison
3412e43608 Use optional span for return type of CommandAuxiliaryBase::GetDeserialisationSrc 2022-12-11 15:27:48 +00:00
Jonathan G Rennison
6a03e7ba97 Command: Remove unused CMD_STR_SEP flag 2022-12-07 21:14:50 +00:00
Jonathan G Rennison
f32733ef22 Command: Replace binary_length field with auxiliary data 
Use for CMD_ADD_PLAN_LINE
 2022-12-07 21:14:34 +00:00
Jonathan G Rennison
b0329ec77a Add auxiliary data type for extra command data 2022-12-07 21:04:20 +00:00
dP
c91033ac5e Feature: [GS] Scriptable league tables (#10001) 
(cherry picked from commit 5e14a20b3b)
 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
aaf0385dc5 Add command/string helpers for string separator control character 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
a608a2592d Add a CommandCost result data field 
Allow inlining one of extra_message, tile, result without aux allocation
 2022-12-03 22:28:49 +00:00
Jonathan G Rennison
523cf75a7a Change CommandCost success bool to a flags field 2022-12-03 22:28:49 +00:00
dP
5e14a20b3b Feature: [GS] Scriptable league tables (#10001) 2022-11-26 18:03:03 +01:00
Jonathan G Rennison
95a646d09b Fix #449: Town setting override not being allowed for MP admins 
When the setting to enable for clients was not enabled
 2022-10-31 18:59:08 +00:00
Jonathan G Rennison
a8361cd608 Allow overriding town settings on a per-town basis 
Add a setting for whether this is allowed for non-privileged
multiplayer clients
 2022-10-23 22:07:51 +01:00
Jonathan G Rennison
e6e9a0c2f3 Show cost/income float over end tile of rail or road construction 2022-10-22 19:56:41 +01:00
Tyler Trahan
3d45bc4abe Feature: Build objects by area 2022-10-16 18:28:08 +02:00
Jonathan G Rennison
02cb1dc2c4 CommandCost: Add a tile auxiliary field 2022-10-13 20:52:30 +01:00
Jonathan G Rennison
135dc547e2 Split rarely used CommandCost fields into aux struct via unique_ptr 
Move static text ref stack into aux struct
 2022-10-13 20:52:30 +01:00
Jonathan G Rennison
d61fbb977e Add order management dropdown, add duplicate order and move jump target 
Add setting to control if order management button shown

Move order list management to order management dropdown if enabled

See: #439
 2022-10-08 00:46:22 +01:00
Jonathan G Rennison
839746d2bb Fix template train move/sell command category for build while paused 2022-09-16 13:06:08 +01:00