Commit Graph

53211 Commits

Author SHA1 Message Date
Jonathan G Rennison
8c8dcb0002 Version: Committing version data for tag: jgrpp-0.48.0 2022-07-03 18:26:18 +01:00
Jonathan G Rennison
752e46dfcb Merge branch 'master' into jgrpp
# Conflicts:
#	src/station_cmd.cpp
2022-07-03 17:42:54 +01:00
glx22
44e3b05c50 Fix: Use more selectivity when building SSE specific code
See: https://github.com/OpenTTD/OpenTTD/issues/9935

(cherry picked from commit c3f55d53405af04bfe928d9e1a815e06c187ca50)
2022-07-03 17:38:16 +01:00
Jonathan G Rennison
432717b21d Enabled shared orders and occupancy buttons for competitor order windows 2022-07-03 17:32:03 +01:00
Jonathan G Rennison
4e8a8a5e0a Add conditional order to test if last/next dispatch slot is first/last 2022-07-03 15:49:29 +01:00
Jonathan G Rennison
116ddf4b35 Fix timetable automation with conditional order sequences 2022-07-03 14:44:38 +01:00
Jonathan G Rennison
da57d75165 Debug: Print lookahead approach speeds for stations (using current order) 2022-07-01 23:39:44 +01:00
Jonathan G Rennison
c6ae82b611 Fix 9ff161e4 boosting lookahead braking stats but not actual brake forces 2022-07-01 23:39:02 +01:00
Jonathan G Rennison
bd28d5a239 Use order state at reservation time for signal mode tracerestrict eval 2022-07-01 00:33:59 +01:00
Jonathan G Rennison
12566f05ca Add tracerestrict actions used flags for order conditionals present 2022-07-01 00:16:26 +01:00
Jonathan G Rennison
a5fb39b388 Use shunt for combined shunt/normal for routes into a bay with shunt exit 2022-06-30 22:19:36 +01:00
Jonathan G Rennison
f98f5fd291 Fix not being able to build waypoints when custom types no longer present
And a custom type was previously selected
2022-06-30 21:53:36 +01:00
Jonathan G Rennison
c19bd4473f Add signal style flag to require realistic braking 2022-06-30 21:20:43 +01:00
Jonathan G Rennison
bdd97f1aea Add debug build console command to run tile loop handler on tile 2022-06-30 00:28:41 +01:00
Jonathan G Rennison
e399853f2c Fix aspect propagation issues with combined shunt/normal signals 2022-06-29 23:28:53 +01:00
Jonathan G Rennison
05c7c528f5 Fix a6e3467d: Don't do cargo consistency checks after overriding cargo
This falsely triggers warning messages
2022-06-29 22:43:56 +01:00
Jonathan G Rennison
19af139631 Fix #9937: Station industries_near incorrect after removing part moved sign
RecomputeCatchment was being called before moving the sign tile
instead of afterwards
2022-06-29 12:49:55 +02:00
Jonathan G Rennison
6150edd3b4 Fix Station industries_near incorrect after removing part moved sign
RecomputeCatchment was being called before moving the sign tile
instead of afterwards

See: https://github.com/OpenTTD/OpenTTD/issues/9937
2022-06-29 00:55:26 +01:00
Jonathan G Rennison
91e0529a39 Fix train variable 0x63 using wrong rail type on dual rail type tiles 2022-06-28 19:56:13 +01:00
translators
f72b9fa767 Update: Translations from eints
italian: 22 changes by Rivarossi
2022-06-28 18:54:28 +00:00
Jonathan G Rennison
e6a6b50675 Include signal combined/normal style mask in aspect cfg hash 2022-06-28 18:18:42 +01:00
Jonathan G Rennison
1422cc871c Fix signal aspect re-calculation in bidi signal blocks with no junctions 2022-06-28 18:18:16 +01:00
Jonathan G Rennison
e747f96c78 Fix signal aspect re-calculation with combined normal/shunt 2022-06-28 18:17:55 +01:00
Jonathan G Rennison
d48912aa15 Add setting to show full group hierarchy in group names 2022-06-28 17:41:09 +01:00
Jonathan G Rennison
d4a813e92e Show group name when grouping vehicles by shared orders
If all vehicles in shared order set are in the same group
2022-06-28 17:11:58 +01:00
Jonathan G Rennison
6a69a5495f Add tracerestrict action to set combined normal/shunt signal mode
Add associated conditional to get reservation end tile
2022-06-28 01:16:57 +01:00
Jonathan G Rennison
52f28eb5c1 Tracerestrict GUI: Refactor string handling for realistic braking warning 2022-06-28 00:52:55 +01:00
Jonathan G Rennison
ae47b1636a Add a set of temporary std::strings which can be referenced by StringID 2022-06-28 00:52:55 +01:00
Jonathan G Rennison
4747e1d1d0 Merge PR #403 into jgrpp 2022-06-27 20:37:41 +01:00
Melvin Vermeeren
d48234c81b
Add GUI setting to show order occupancy by default 2022-06-27 20:06:20 +02:00
Jonathan G Rennison
78ae295dfe Add combined normal and shunt aspect signal style flag 2022-06-27 18:51:26 +01:00
Jonathan G Rennison
a6e3467d58 Fix virtual train consist change callbacks being run before cargotype set
When instantiating virtual train from non-buildable template train

See: #402

Also fixes instantiating virtual train from train not refitting leading
vehicle.
2022-06-27 01:27:35 +01:00
Jonathan G Rennison
759b00262e VarAction2: Allow more than one JZ to end on the same end block adjust 2022-06-26 23:30:14 +01:00
Jonathan G Rennison
9775f468e8 VarAction2: Fix jump insertion moving the end marker for another jump 2022-06-26 22:53:07 +01:00
Jonathan G Rennison
5b5fbaa476 Fix reservation error when a reserve through signal was the last tile
When there were no junctions earlier in the reservation
2022-06-26 16:28:23 +01:00
Jonathan G Rennison
a451b76c45 Remove unused extern declaration 2022-06-26 16:27:33 +01:00
Jonathan G Rennison
fa89036a27 Add function to get maximum signal aspect 2022-06-25 23:45:50 +01:00
Jonathan G Rennison
89f66236ff VarAction2: Fix SHR/SAR mixup in check for merge with prior RST 2022-06-25 20:51:09 +01:00
Jonathan G Rennison
5059054f0a Sending a vehicle to a depot for sale can now sell immediately
If the vehicle is already stopped in a suitable depot
2022-06-25 20:33:21 +01:00
Jonathan G Rennison
85e949a6ba Fix road/tram type check when moving depot orders to another depot 2022-06-25 18:24:32 +01:00
Jonathan G Rennison
21606df9d3 Fix adding second set of signals to tile not setting signal style 2022-06-25 16:43:17 +01:00
Jonathan G Rennison
8249f3d535 Fix land info window not having strings for no-entry signals 2022-06-25 16:37:04 +01:00
Jonathan G Rennison
04da11b668 Store signal style GRF to local map in savegame
Update existing signal style IDs as necessary
2022-06-25 14:33:47 +01:00
Jonathan G Rennison
a73bc141a1 Remove unneeded calls to GetOtherTunnelBridgeEnd in AfterLoadCompanyStats 2022-06-25 14:09:51 +01:00
Jonathan G Rennison
13557d868a Disable uninitialised warnings for MSYS/MinGW CI build 2022-06-25 12:05:41 +01:00
Jonathan G Rennison
0ed30d0200 Avoid maybe unintialised warning in struct UniscribeRun
See: #394
2022-06-25 12:05:41 +01:00
Jonathan G Rennison
18efab1dbb CMake: libbfd on MinGW is now off by default 2022-06-25 12:05:41 +01:00
Jonathan G Rennison
96df13a032
Merge pull request #400 from telk5093/jgrpp
Update: Korean translation up to 10b415b
2022-06-25 10:43:08 +01:00
Jonathan G Rennison
2f7664fc93 Move signal style mask variables into a single struct 2022-06-25 10:18:48 +01:00
Jonathan G Rennison
c1b54f1c31 Fix missing includes in newgrf_newsignals.h
See: #401
2022-06-25 10:05:59 +01:00