Automatic merge of T1.5.1-919-gf19642ebc and 15 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 753cba5: 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 e0f3c55: Add curve squeal to route
- Pull request #924 at 6c2c3cd: Default Asset Improvements
- Pull request #925 at e3b1688: Fix brakeshoe force bug
- Pull request #926 at b20ca94: Lights Bugfixes

Author: openrails-bot

Source/Menu/Notifications/NotificationManager.cs

@@ -229,7 +229,6 @@ private void AddItemToPage(NotificationPage page, Item item)
 
         /// <summary>
         /// Returns any check that fails.
-        /// (Could be extended to include other SystemInfo values.)
         /// </summary>
         /// <param name="check"></param>
         /// <returns></returns>
@@ -240,20 +239,26 @@ private Check CheckExcludes(Check check)
 
             foreach (var c in check.ExcludesAllOf)
             {
-                var lowerName = c.Name.ToLower();
-                var lowerValue = c.Value.ToLower();
                 if (c is Contains)
                 {
-                    switch (lowerName)
+                    switch (c.Name)
                     {
+                        case "direct3d":
+                            if (SystemInfo.Direct3DFeatureLevels.Contains(c.Value, StringComparer.OrdinalIgnoreCase))
+                                return check;
+                            break;
                         case "installed_version":
-                            if (SystemInfo.Application.Version.Contains(lowerValue))
+                            if (SystemInfo.Application.Version.IndexOf(c.Value, StringComparison.OrdinalIgnoreCase) > 0)
                                 return check;
                             break;
-                        default: // generic exclusion
-                            if (lowerName == lowerValue)
+                        case "system":
+                            var os = SystemInfo.OperatingSystem;
+                            var system = $"{os.Name} {os.Version} {os.Architecture} {os.Language} {os.Languages ?? new string[0]}";
+                            if (system.IndexOf(c.Value, StringComparison.OrdinalIgnoreCase) > 0)
                                 return check;
                             break;
+                        default: // Any check that is not recognised fails.
+                            return check;
                     }
                 }
             }
@@ -262,7 +267,6 @@ private Check CheckExcludes(Check check)
 
         /// <summary>
         /// Returns any check that succeeds.
-        /// (Could be extended to include other SystemInfo values.)
         /// </summary>
         /// <param name="check"></param>
         /// <returns></returns>
@@ -273,20 +277,26 @@ private Check CheckIncludes(Check check)
 
             foreach (var c in check.IncludesAnyOf)
             {
-                var lowerName = c.Name.ToLower();
-                var lowerValue = c.Value.ToLower();
                 if (c is Contains)
                 {
-                    switch (lowerName)
+                    switch (c.Name)
                     {
                         case "direct3d":
-                            if (SystemInfo.Direct3DFeatureLevels.Contains(lowerValue))
+                            if (SystemInfo.Direct3DFeatureLevels.Contains(c.Value, StringComparer.OrdinalIgnoreCase))
+                                return check;
+                            break;
+                        case "installed_version":
+                            if (SystemInfo.Application.Version.IndexOf(c.Value, StringComparison.OrdinalIgnoreCase) > 0)
                                 return check;
                             break;
-                        default: // generic inclusion
-                            if (lowerName == lowerValue)
+                        case "system":
+                            var os = SystemInfo.OperatingSystem;
+                            var system = $"{os.Name} {os.Version} {os.Architecture} {os.Language} {os.Languages ?? new string[0]}";
+                            if (system.IndexOf(c.Value, StringComparison.OrdinalIgnoreCase) > 0)
                                 return check;
                             break;
+                        default: // Any check that is not recognised fails.
+                            return null;
                     }
                 }
             }