Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 95dc498

Browse files
committed
Automatic merge of T1.5.1-225-g17af6ffa8 and 12 pull requests
- Pull request #717 at 98221c0: Allow unlimited number of TCS cabview controls - Pull request #719 at 0f4d975: Upgraded to MonoGame 3.8.0 (+ small update for other libraries) - Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor - Pull request #732 at 83002d7: Improvements for air brakes - Pull request #735 at b9a0ea3: Added new parameter for battery switch - Pull request #753 at ab8fe32: Extends CabControls for user input - Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration - Pull request #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416 - Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly - Pull request #766 at 3d5d238: Control Car additional functionality - Pull request #767 at 9317f8c: Refine sunrise and sunset - Pull request #768 at bc8aea4: OpenRailway Map enhancements
14 parents fc74085 + 17af6ff + 98221c0 + 0f4d975 + fb9079e + 83002d7 + b9a0ea3 + ab8fe32 + 113dd63 + 5f9a01b + 083467b + 3d5d238 + 9317f8c + bc8aea4 commit 95dc498

39 files changed

+88
-25528
lines changed

.config/dotnet-tools.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-mgfxc": {
6+
"version": "3.8.0.1641",
7+
"commands": [
8+
"mgfxc"
9+
]
10+
}
11+
}
12+
}

.gitattributes

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,6 @@
3535
*.svg text
3636
*.eps binary
3737

38-
39-
# https://github.com/Danimoth/gitattributes/blob/master/VisualStudio.gitattributes
40-
# Custom for Visual Studio
41-
*.sln text eol=crlf merge=union
42-
*.csproj merge=union
43-
*.vbproj merge=union
44-
*.fsproj merge=union
45-
*.dbproj merge=union
46-
47-
4838
# https://github.com/Danimoth/gitattributes/blob/master/CSharp.gitattributes
4939
# Custom for C#
5040
*.cs diff=csharp
-58.5 KB
Binary file not shown.
-488 KB
Binary file not shown.

Source/3rdPartyLibs/MonoGame/MonoGame.Framework.Content.Pipeline.xml

Lines changed: 0 additions & 7294 deletions
This file was deleted.
-905 KB
Binary file not shown.

Source/3rdPartyLibs/MonoGame/MonoGame.Framework.xml

Lines changed: 0 additions & 18061 deletions
This file was deleted.
-57.5 KB
Binary file not shown.
-137 KB
Binary file not shown.
-279 KB
Binary file not shown.

0 commit comments

Comments
 (0)