Skip to content

Commit

Permalink
Automatic merge of T1.5.1-271-g58e67675dd and 35 pull requests
Browse files Browse the repository at this point in the history
- Pull request #570 at 71b0fee: Experimental glTF 2.0 support with PBR lighting
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 1079783: Improvements for air brakes
- Pull request #751 at 00981a2: Web interface to control cab controls with external hardware
- Pull request #753 at ab8fe32: Extends CabControls for user input
- Pull request #767 at 4cb5c77: Refine sunrise and sunset
- Pull request #769 at 1a99f43: Partial turntables https://blueprints.launchpad.net/or/+spec/partial-turntable
- Pull request #771 at c380043: Action on Hold Signal is no longer invalidated if train is not stoppe…
- Pull request #772 at 36c3662: Update tt train
- Pull request #774 at d3f8c2e: Use variable OrgAINumber for all train to train references
- Pull request #775 at d84c8d8: Update turntable pools
- Pull request #776 at 7b6af67: Update Receivers in Viewer.cs
- Pull request #777 at 7724f2b: Save and restore ClearMovingTable action (for timetables)
- Pull request #778 at 779a819: Correction for player locomotive on turntable
- Pull request #779 at 87c34a7: Remove forced processed ClearSection actions
- Pull request #780 at 5b3f246: Process passing time
- Pull request #781 at 4d9c3fb: Correct update of pending speed limits for timetable mode
- Pull request #782 at 23c41b5: Nu full physics update is required for trains in state AIStatic
- Pull request #783 at 083bc6c: Move CreateInPool from AI to Pools
- Pull request #784 at 1c37be3: Incorrect distance along track
- Pull request #785 at fd121be: Incorrect calculation of distance to train ahead
- Pull request #786 at f2c5d2d: Improve syntax check on timetable files
- Pull request #787 at e0ad658: Improve debug output for turntable pools
- Pull request #788 at 94a73d5: Improve Debug Outputs for TTTrain.cs
- Pull request #789 at 81b11f7: Avoid error on inserting train without start time
- Pull request #790 at 36a9921: Correct crash in TrainCar.cs
- Pull request #791 at 5bc890b: Correct update for Switchstand signalscript function
- Pull request #792 at f6c16fb: Correct required actions
- Pull request #793 at 8897021: Correct errors in Turntables.cs
- Pull request #794 at 6d2bf04: Use reverse path in TT Pool
- Pull request #795 at 79979e2: Accept SpeedMPS as dimension for Approach Control Speed definition
- Pull request #796 at a67ee61: fix: Resume from Save fails - filenames do not match
- Pull request #797 at 7ced1fe: To use enum for ControlGearBoxType
- Pull request #798 at 4b6141d: Temporary bug fix for https://bugs.launchpad.net/or/+bug/2004100 Casting error crash
- Pull request #800 at 3a0946d: Changes to migrate from Launchpad Bugs to GitHub Issues
  • Loading branch information
Show file tree
Hide file tree
Showing 3 changed files with 489 additions and 633 deletions.
2 changes: 1 addition & 1 deletion Source/RunActivity/Content/SceneryShader.fx
Expand Up @@ -288,7 +288,7 @@ struct VERTEX_INPUT_SKINNED
float3 Normal : NORMAL;
float4 Tangent : TANGENT;
float2 TexCoordsPbr: TEXCOORD1;
float4 Joints : BLENDINDICES0;
uint4 Joints : BLENDINDICES0;
float4 Weights : BLENDWEIGHT0;
float4 Color : COLOR0;
float4x4 Instance : TEXCOORD2;
Expand Down

0 comments on commit 1d690e8

Please sign in to comment.