Skip to content

Conversation

@twpol
Copy link
Member

@twpol twpol commented Sep 26, 2022

No description provided.

@twpol twpol self-assigned this Sep 26, 2022
@twpol
Copy link
Member Author

twpol commented Sep 26, 2022

@cjakeman This PR should fix the conflicts in #704 (which is the automatic 1.5 -> master merge)

twpol pushed a commit that referenced this pull request Sep 27, 2022
- Pull request #570 at 824f96f: Experimental glTF 2.0 support with PBR lighting
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #688 at 7b6b608: adds Help Icons to Video tab
- Pull request #692 at 20de7da: Italian translation for OR 1.5
- Pull request #693 at 453ac3d: French locales
- Pull request #699 at 6baf43d: Bug fix for https://bugs.launchpad.net/or/+bug/1987453. Web: HUD/Force Information, some labels not visible.
- Pull request #706 at 265d33d: TCS Extensions
- Pull request #712 at 68cd8ab: Search for NORMAL signals if no argument is provided
- Pull request #713 at 39fb6c2: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #714 at d289d28: Feature/1.5 merge fix 1
- Pull request #715 at 447143b: Bug fix for //bugs.launchpad.net/or/+bug/1990930 Default snow terrtex not appearing
twpol pushed a commit that referenced this pull request Oct 2, 2022
- Pull request #570 at 824f96f: Experimental glTF 2.0 support with PBR lighting
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #677 at c1c417f: Correct double heading bug
- Pull request #692 at 20de7da: Italian translation for OR 1.5
- Pull request #693 at 453ac3d: French locales
- Pull request #699 at 6baf43d: Bug fix for https://bugs.launchpad.net/or/+bug/1987453. Web: HUD/Force Information, some labels not visible.
- Pull request #706 at 265d33d: TCS Extensions
- Pull request #712 at 68cd8ab: Search for NORMAL signals if no argument is provided
- Pull request #713 at 2478066: https://blueprints.launchpad.net/or/+spec/cruise-control 
- Pull request #714 at d289d28: Feature/1.5 merge fix 1
- Pull request #715 at 447143b: Bug fix for //bugs.launchpad.net/or/+bug/1990930 Default snow terrtex not appearing
- Pull request #716 at 23c491e: Bug fix for https://bugs.launchpad.net/or/+bug/1990553 Typo in GenericItem2 command
@Sharpe49 Sharpe49 merged commit e27379c into openrails:master Oct 3, 2022
@twpol twpol deleted the feature/1.5-merge-fix-1 branch April 7, 2023 11:44
@twpol twpol added the infrastructure Improvements or additions to building, hosting, and other project infrastructure label Jul 3, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

infrastructure Improvements or additions to building, hosting, and other project infrastructure

Development

Successfully merging this pull request may close these issues.

3 participants