Skip to content

Commit 7394c75

Browse files
authored
Merge branch 'Jay-Jay-OPL:master' into master
2 parents 60bd162 + ece82c6 commit 7394c75

File tree

598 files changed

+31282
-23354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

598 files changed

+31282
-23354
lines changed

.clang-format

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,70 @@ Language: Cpp
33
AccessModifierOffset: -4
44
AlignAfterOpenBracket: Align
55
AlignConsecutiveAssignments: false
6+
AlignConsecutiveBitFields: AcrossEmptyLinesAndComments
67
AlignConsecutiveDeclarations: false
7-
AlignEscapedNewlinesLeft: false
8-
AlignOperands: true
8+
AlignConsecutiveMacros: AcrossComments
9+
AlignEscapedNewlines: Left
10+
AlignOperands: Align
911
AlignTrailingComments: true
12+
AllowAllArgumentsOnNextLine: false
13+
AllowAllConstructorInitializersOnNextLine: true
1014
AllowAllParametersOfDeclarationOnNextLine: true
11-
AllowShortBlocksOnASingleLine: false
15+
AllowShortBlocksOnASingleLine: Empty
1216
AllowShortCaseLabelsOnASingleLine: false
17+
AllowShortEnumsOnASingleLine: true
1318
AllowShortFunctionsOnASingleLine: All
14-
AllowShortIfStatementsOnASingleLine: false
19+
AllowShortIfStatementsOnASingleLine: Never
20+
AllowShortLambdasOnASingleLine: Empty
1521
AllowShortLoopsOnASingleLine: false
16-
AlwaysBreakAfterDefinitionReturnType: None
1722
AlwaysBreakAfterReturnType: None
1823
AlwaysBreakBeforeMultilineStrings: false
1924
AlwaysBreakTemplateDeclarations: true
2025
BinPackArguments: true
2126
BinPackParameters: true
27+
BitFieldColonSpacing : Both
28+
BreakBeforeBraces: Custom
2229
BraceWrapping:
23-
AfterClass: true
30+
AfterCaseLabel: false
31+
AfterClass: true
2432
AfterControlStatement: false
25-
AfterEnum: false
26-
AfterFunction: true
27-
AfterNamespace: true
28-
AfterObjCDeclaration: false
29-
AfterStruct: true
30-
AfterUnion: true
31-
BeforeCatch: false
32-
BeforeElse: false
33-
IndentBraces: false
33+
AfterEnum: false
34+
AfterFunction: true
35+
AfterNamespace: true
36+
AfterObjCDeclaration: false
37+
AfterStruct: true
38+
AfterUnion: true
39+
AfterExternBlock: false
40+
BeforeCatch: false
41+
BeforeElse: false
42+
BeforeLambdaBody: false
43+
BeforeWhile: false
44+
IndentBraces: false
45+
SplitEmptyFunction: true
46+
SplitEmptyRecord: true
47+
SplitEmptyNamespace: true
3448
BreakBeforeBinaryOperators: None
35-
BreakBeforeBraces: Custom
49+
BreakBeforeConceptDeclarations: true
3650
BreakBeforeTernaryOperators: false
37-
BreakConstructorInitializersBeforeComma: true
51+
BreakConstructorInitializers: BeforeComma
52+
BreakStringLiterals: true
3853
ColumnLimit: 0
3954
CommentPragmas: '^ (IWYU pragma:|NOLINT)'
4055
ConstructorInitializerAllOnOneLineOrOnePerLine: false
4156
ConstructorInitializerIndentWidth: 4
4257
ContinuationIndentWidth: 4
4358
Cpp11BracedListStyle: true
59+
DeriveLineEnding: true
4460
DerivePointerAlignment: false
4561
DisableFormat: false
62+
EmptyLineBeforeAccessModifier: LogicalBlock
63+
FixNamespaceComments: true
4664
ForEachMacros: []
65+
IncludeBlocks: Preserve
66+
IndentExternBlock: NoIndent
67+
IndentCaseBlocks: false
4768
IndentCaseLabels: true
69+
IndentGotoLabels: true
4870
IndentWidth: 4
4971
IndentWrappedFunctionNames: false
5072
KeepEmptyLinesAtTheStartOfBlocks: true
@@ -55,21 +77,36 @@ NamespaceIndentation: None
5577
ObjCBlockIndentWidth: 2
5678
ObjCSpaceAfterProperty: false
5779
ObjCSpaceBeforeProtocolList: true
80+
PenaltyBreakAssignment: 80
5881
PenaltyBreakBeforeFirstCallParameter: 19
5982
PenaltyBreakComment: 300
6083
PenaltyBreakFirstLessLess: 120
6184
PenaltyBreakString: 1000
85+
PenaltyBreakTemplateDeclaration: 80
6286
PenaltyExcessCharacter: 1000000
87+
PenaltyIndentedWhitespace: 80
6388
PenaltyReturnTypeOnItsOwnLine: 60
6489
PointerAlignment: Right
90+
# uncomment below when clang >13 will be out
91+
# IndentPPDirectives: AfterHash
92+
# PPIndentWidth: 1
6593
ReflowComments: true
6694
SortIncludes: false
6795
SpaceAfterCStyleCast: false
96+
SpaceAfterLogicalNot: false
97+
SpaceAroundPointerQualifiers: Default
6898
SpaceBeforeAssignmentOperators: true
99+
SpaceBeforeCaseColon: false
100+
SpaceBeforeCpp11BracedList: true
101+
SpaceBeforeInheritanceColon: false
69102
SpaceBeforeParens: ControlStatements
103+
SpaceBeforeRangeBasedForLoopColon: true
104+
SpaceBeforeSquareBrackets: false
105+
SpaceInEmptyBlock: false
70106
SpaceInEmptyParentheses: false
71107
SpacesBeforeTrailingComments: 1
72108
SpacesInAngles: false
109+
SpacesInConditionalStatement: false
73110
SpacesInContainerLiterals: true
74111
SpacesInCStyleCastParentheses: false
75112
SpacesInParentheses: false

.editorconfig

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# EditorConfig: http://EditorConfig.org
2+
3+
# Top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
charset = utf-8
12+
13+
# 4 space indentation
14+
[*.{c,h,js,css,html}]
15+
indent_style = space
16+
indent_size = 4
17+
18+
# 2 space indentation
19+
[*.{json,xml,yaml,yml}]
20+
indent_style = space
21+
indent_size = 2
22+
23+
# Tab indentation
24+
[Makefile*]
25+
indent_style = tab

.gitattributes

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
* text=auto
33

44
# Custom for Visual Studio
5-
*.cs diff=csharp
5+
*.cs diff=csharp
66

77
# Standard to msysgit
8-
*.doc diff=astextplain
9-
*.DOC diff=astextplain
8+
*.doc diff=astextplain
9+
*.DOC diff=astextplain
1010
*.docx diff=astextplain
1111
*.DOCX diff=astextplain
1212
*.dot diff=astextplain
1313
*.DOT diff=astextplain
1414
*.pdf diff=astextplain
15-
*.PDF diff=astextplain
16-
*.rtf diff=astextplain
17-
*.RTF diff=astextplain
15+
*.PDF diff=astextplain
16+
*.rtf diff=astextplain
17+
*.RTF diff=astextplain

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 20 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: "[FR]"
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Issue report
3+
about: Create a report to help us improve
4+
title: "[ISSUE]"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Disclaimer**
11+
Issue reports for OPL version which were not downloaded from the official GitHub repo are not accepted.
12+
Before posting the issue confirm that you meet the below requirements.
13+
- [ ] I have checked existing OPL issues for duplicates and found none https://github.com/ps2homebrew/Open-PS2-Loader/issues
14+
- [ ] I am using either OPL beta version from https://github.com/ps2homebrew/open-ps2-loader/actions?query=workflow%3ACI+is%3Asuccess++ or OPL stable version from https://github.com/ps2homebrew/Open-PS2-Loader/releases
15+
16+
**Describe the issue**
17+
A clear and concise description of what the issue is.
18+
19+
**Configuration (please complete the following information):**
20+
- Console Model: [e.g. SCPH-77006]
21+
- Open PS2 Loader revision: [e.g. OPNPS2LD-c5ed52e6, OPL v0.9.3]
22+
- Open PS2 Loader mode: [e.g. USB, SMB, HDD]
23+
- Information about affected games (if any): link to redump.org or game serial: [e.g. http://redump.org/disc/561 or SLES-52798]
24+
25+
**To Reproduce**
26+
Steps to reproduce the behavior:
27+
1. Go to '...'
28+
2. Select '....'
29+
4. See error
30+
31+
**Expected behavior**
32+
A clear and concise description of what you expected to happen.
33+
34+
**Screenshots**
35+
If applicable, add screenshots to help explain your problem.
36+
37+
**Additional context**
38+
Add any other context about the problem here.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/check-format.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
2+
name: CI-format-check
3+
4+
on:
5+
push:
6+
paths:
7+
- '**.h'
8+
- '**.c'
9+
- '.github/workflows/check-format.yml'
10+
- '.clang-format'
11+
pull_request:
12+
paths:
13+
- '**.h'
14+
- '**.c'
15+
- '.github/workflows/check-format.yml'
16+
- '.clang-format'
17+
18+
jobs:
19+
check-format:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- uses: DoozyX/[email protected]
25+
with:
26+
source: '.'
27+
extensions: 'h,c'
28+
clangFormatVersion: 12
29+
inplace: False

0 commit comments

Comments
 (0)