-
Notifications
You must be signed in to change notification settings - Fork 97
fix: Do not allow non-ACE/DDS textures in content #1151
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Do not allow non-ACE/DDS textures in content #1151
Conversation
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 58de4c3: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 58de4c3: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1139 at 03c6f8f: Fix for bug https://bugs.launchpad.net/or/+bug/2117357. - Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 71e57d2: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 1ad59d7: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at b6baa4c: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 278d8ff: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at 87cdd9f: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi James,
I think this is fine to merge.
Thanks,
Chris
Thanks @cjakeman I've just added the logging we discussed |
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 84f72b8: Status in Work Orders popup set too fast - Pull request #1151 at 25d2f29: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi James,
Glad that you were able to find time for this.
Approved, I'll leave the merge to you.
Chris
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 2e06f85: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at ba9e40a: Status in Work Orders popup set too fast - Pull request #1151 at 25d2f29: fix: Do not allow non-ACE/DDS textures in content - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1153 at d2f2a02: Fix TrItems in track viewer (events were over-writing mileposts) - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1081 at 689494b: Brake cuts power unification - Pull request #1124 at fab5457: Built-in PBL2 brake controller - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
Merge pull request #1151 from twpol/feature/ace-dds-content-only
Remove support for non-ACE/DDS textures from content that were unexpectedly added by #981