Skip to content

Commit d98c096

Browse files
committed
Automatic merge of T1.5.1-925-g1c557094e and 16 pull requests
- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #882 at 3ca0eb1: Blueprint/train car operations UI window - Pull request #885 at fb6b812: feat: Add notifications to Menu - Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #903 at 29f3d1a: Downloading route content (Github, zip) - Pull request #912 at f7b85e4: New Triple Valve Features Vol. 2 - Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t… - Pull request #923 at cc1b5b6: Add curve squeal to route - Pull request #924 at 6c2c3cd: Default Asset Improvements - Pull request #925 at e3b1688: Fix brakeshoe force bug - Pull request #927 at cf687d4: AI Train Power Supply/Lights Fix - Pull request #929 at a406a69: Add support for common circuit breaker variants
18 parents 7b74172 + 1c55709 + 3539862 + d00beb9 + f92de76 + 3ca0eb1 + fb6b812 + 6c0785b + 1f5ba4c + 5866028 + 29f3d1a + f7b85e4 + 26cc6a8 + cc1b5b6 + 6c2c3cd + e3b1688 + cf687d4 + a406a69 commit d98c096

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Source/Menu/Notifications/NotificationManager.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ private string GetRemoteJson()
101101
// Helpful to supply server with data for its log file.
102102
client.Headers[HttpRequestHeader.UserAgent] = $"{System.Windows.Forms.Application.ProductName}/{VersionInfo.VersionOrBuild}";
103103

104+
// Trial for glTD and PBR graphics
105+
//return client.DownloadString(new Uri("https://wepp.co.uk/openrails/notifications/menu_testing_direct3d.json"));
104106
return client.DownloadString(new Uri("https://wepp.co.uk/openrails/notifications/menu.json"));
105107
}
106108

@@ -241,7 +243,7 @@ private Check CheckExcludes(Check check)
241243
{
242244
if (c is Contains)
243245
{
244-
CheckContains(check, c);
246+
return CheckContains(check, c);
245247
}
246248
}
247249
return null;
@@ -259,7 +261,7 @@ private Check CheckIncludes(Check check)
259261

260262
foreach (var c in check.IncludesAnyOf)
261263
{
262-
CheckContains(check, c);
264+
return CheckContains(check, c);
263265
}
264266
return null;
265267
}

0 commit comments

Comments
 (0)