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

2787 Commits

Author SHA1 Message Date
Charles Pigott
8aea13a85b Codechange: Use fmt for SlErrorCorruptFmt 2023-04-10 18:58:48 +01:00
Jonathan G Rennison
82803b98e0 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/game/game_gui.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/newgrf.cpp
#	src/order_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_text.cpp
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/strings.cpp
#	src/table/settings/economy_settings.ini
#	src/table/settings/locale_settings.ini
#	src/timetable_gui.cpp
 2023-04-10 15:11:53 +01:00
dP
e2f1cd44dc Change: Increase max cargo age and let min cargo payment approach zero. (#10596) 
Co-authored-by: Michael Lutz <michi@icosahedron.de>
 2023-04-10 12:34:28 +02:00
PeterN
078e27bd84 Fix #10619: Crash loading linkgraph for older savegames. (#10620) 2023-04-09 19:28:55 +01:00
Rubidium
9d2a0f3d0b Change: make GetPartialZ consistent, meaning Z of adjacent slopes continue 
Previously, on a straight line of a one corner up slope with the adjacent
steep sloop the Z would increase one step every two sub pixels, except for one
case where one sub pixel is skipped. Similarly, a steep slope with two
adjacent one corner up slopes, would have a bump in the height line along the
diagonal whenever it enters/leaves the steep slope tile.
 2023-04-09 19:00:26 +02:00
Rubidium
e8af8daa68 Codechange: pass "ground vehicle" to GetTileSlopeZ since for tunnel/bridges there are two states 
Previously it checked the position in non-driving direction to "guess" whether
a ground vehicle was using the function, so on tunnels/bridges it could either
return the Z of the (virtual) ground compared to the Z of the path the vehicle
would take.
 2023-04-09 19:00:26 +02:00
Jonathan G Rennison
06e0f39aff Add text label and departure board via orders 2023-04-09 12:48:50 +01:00
Jonathan G Rennison
3b6f7c09ad Allow changing colour of orders in order list and timetable windows 2023-04-08 18:13:35 +01:00
PeterN
f1144de509 Feature: Separate rail/road and sea/air velocity units, and add knots. (#10594) 
This is achieved by packing vehicle type along with the velocity so that
the string system can decode and pick the appropriate unit.
 2023-04-08 12:26:13 -04:00
Peter Nelson
65e0b0dcb7 Codechange: Be consistent with how company masks are set to all. 2023-04-07 22:09:55 +01:00
Jonathan G Rennison
c9c0436e58 Add company setting for remain at station if next order for same station 
Set value on load for whether the save version had this enabled for trains
 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
1d05637d45 Add setting for rail depot maximum speed 2023-04-06 01:30:14 +01:00
Jonathan G Rennison
1707f74d60 TBTR: Refactor template replacement code 
Adjust conditions for re-using existing engines in depot
Reduce cost of searching for existing engines in depot
Reduce cost of vehicle chain membership tests
Improve replacement command error handling
Tidy up code in general
 2023-03-22 22:19:01 +00:00
Jonathan G Rennison
f3841e29c8 Saveload: Adjust formatting of _sl_xv_sub_chunk_infos 2023-03-21 20:19:40 +00:00
Jonathan G Rennison
2028472253 Saveload: Skip VENC/TNNC chunks entirely on non network server saves 2023-03-21 19:18:10 +00:00
Jonathan G Rennison
c2752b31e6 Saveload: Use traditional map chunks for scenario saves 2023-03-21 18:59:11 +00:00
Jonathan G Rennison
a57a909deb Saveload: Add special proc op for whether to save chunk 2023-03-21 18:57:50 +00:00
Jonathan G Rennison
b4f32e44d9 Saveload: Change result type of ChunkSaveLoadSpecialProc 2023-03-21 18:11:11 +00:00
Jonathan G Rennison
6cdf67f38a Saveload: Add save flag for if this is a scenario save 2023-03-21 18:00:30 +00:00
Jonathan G Rennison
b7cb4099a6 Add missing cast in Save_TNNC() 2023-03-19 22:23:50 +00:00
Jonathan G Rennison
2716217775 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/saveload/saveload.h
 2023-03-19 22:23:31 +00:00
Tyler Trahan
e5438891e2 Cleanup: Keep spacing saveload versions by groups of five (#10576) 2023-03-19 11:02:54 -04:00
Jonathan G Rennison
5dd285b0d9 Don't save TNNC chunk if there are no town zone callback handlers 2023-03-16 20:52:44 +00:00
Jonathan G Rennison
4dc846949c Bump savegame version for multi-cargo ships 2023-03-16 00:35:37 +00:00
Jonathan G Rennison
211fdd62b2 Initial support for multi-part (pseudo-articulated) ships 2023-03-15 19:44:26 +00:00
Jonathan G Rennison
2e77754c04 Fix comment for XSCF_EXTRA_DATA_PRESENT flag 2023-03-12 12:41:06 +00:00
Jonathan G Rennison
f44d455adc Send town zone radii to network clients in new TNNC chunk 2023-03-11 22:23:40 +00:00
Jonathan G Rennison
f13f8cd740 Tracerestrict: Improve program validator 
Check all instruction subtypes and valid enum values
Return failure instead of asserting for invalid instruction subtypes
Identify which instruction triggered validation failure
 2023-03-09 03:01:20 +00:00
Jonathan G Rennison
57437e7068 Saveload: Fix upstream version handling of league table chunks 2023-03-07 18:41:23 +00:00
Jonathan G Rennison
6aa8997eee Saveload: Add corresponding upstream version to SLXI chunk 2023-03-07 18:40:53 +00:00
Jonathan G Rennison
2acc00ab13 Saveload: Fix upstream chunk load state not be cleared before load 2023-03-07 18:12:11 +00:00
Jonathan G Rennison
8dca681c8c Use btree_multimap for pending speed restrictions 
Avoid unnecessary iteration when saving VESR chunk
 2023-03-07 00:31:14 +00:00
Jonathan G Rennison
2ea1766677 Merge branch 'master' into jgrpp 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/league_sl.cpp
#	src/saveload/saveload.h
#	src/script/api/script_object.hpp
#	src/script/squirrel_helper.hpp
#	src/settings_table.cpp
#	src/station_cmd.cpp
#	src/table/settings.h.preamble
#	src/tree_cmd.cpp
#	src/tree_map.h
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
 2023-03-04 16:45:05 +00:00
Jonathan G Rennison
4ec6a99dd8 Add GetTileTrackStatus wrapper for when red signals part is not needed 2023-03-04 02:01:40 +00:00
Rubidium
580d0a6343 Codechange: make use of Tile in for all direct map accesses 2023-02-28 07:11:48 +01:00
Rubidium
0fb0469e47 Codechange: introduce iterator to iterate over the Tiles of a Map 
Note: this version is using TileIndex, but that changes later
 2023-02-28 07:11:48 +01:00
Jonathan G Rennison
88d7a8ea13 Formatting: Fix indentation of public/private specifiers 2023-02-28 01:44:28 +00:00
dP
b0542c8c49 Codechange: Don't store tree counter in the map array (#10018) 2023-02-26 16:39:44 -05:00
SamuXarick
6eabbaa751 Fix #10469, 5e14a20: [Script] League Table rating element is a int64 everywhere else 2023-02-26 22:25:13 +01:00
Michael Lutz
aab580e0ac Codechange: [Linkgraph] Drop node/edge wrappers from LinkGraph. 2023-02-26 21:41:24 +01:00
Michael Lutz
7352f812e6 Codechange: [Linkgraph] Only store present link graph edges and not all possible edges. 2023-02-26 21:41:24 +01:00
Michael Lutz
178249e7cc Codechange: Saveload macros for entries with a custom table name. 2023-02-26 21:41:24 +01:00
Michael Lutz
fe27db3dfd Codechange: [Linkgraph] Store edges in each node and not in a global matrix. 2023-02-26 21:41:24 +01:00
Jonathan G Rennison
4c1406a4b5 Add: NewGRF road stops 2023-02-26 21:28:30 +01:00
Loïc Guilloux
8b36b2cbf3 Fix #10486: [Script] Debug window requires AIs to be started before GS (#10487) 
(cherry picked from commit 4072dcff49)
 2023-02-20 17:32:19 +00:00
Jonathan G Rennison
f7d62a1767 Add road/tram type flag to disallow collisions with trains 2023-02-19 18:05:11 +00:00
Jonathan G Rennison
3497d0dcdb Add road/tram type properties to set road vehicle collision mode 2023-02-19 14:30:21 +00:00
Loïc Guilloux
4072dcff49 Fix #10486: [Script] Debug window requires AIs to be started before GS (#10487) 2023-02-17 12:24:51 +01:00
Jonathan G Rennison
796924ec32 Change type of extended feature versions arrays 2023-02-15 23:49:40 +00:00
Jonathan G Rennison
8d6e57799c Fix various possible integer type conversion issues 2023-02-15 23:05:03 +00:00