Skip to content

Commit 42ed7e7

Browse files
committed
Merge branch 'master' of github.com:ddnet/ddnet into tater
2 parents 1f4cde8 + 80560c1 commit 42ed7e7

File tree

128 files changed

+796
-798
lines changed

Some content is hidden

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

128 files changed

+796
-798
lines changed

.clang-tidy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ CheckOptions:
146146
- key: readability-identifier-naming.ParameterCase
147147
value: CamelCase
148148
- key: readability-identifier-naming.ParameterIgnoredRegexp
149-
value: '^(p|a|v|[a-z]$|[xy][0123]$).*'
149+
value: '^((a|v|p|pfn)+[A-Z][a-zA-Z0-9]*|[a-z]|[pxy][0-3]|p[xy])$'
150150
- key: readability-identifier-naming.ClassMethodIgnoredRegexp
151151
value: '^(Con_).*'
152152
- key: readability-identifier-naming.ClassMemberIgnoredRegexp
153153
value: '^(ms?_(a|v|p|pfn)*[A-Z][a-zA-Z0-9]*|[abfghlrsuvwxyz])$'
154154
- key: readability-identifier-naming.LocalConstantIgnoredRegexp
155-
value: '^(p|a|v|MAX_ANIM_SPEED$|DATA_OFFSET$|HEADER_LEN$|MIN_ANIM_SPEED$|[hwdcbqstf]$|[xt][0123]$|result$|sub$|it$|len$|d[xy]$).*'
155+
value: '^((a|v|p|pfn)+[A-Z][a-zA-Z0-9]*|[abcdfhpqstvw]|[aptvx][0-3]|d[xy])$'
156156
- key: readability-identifier-naming.LocalVariableIgnoredRegexp
157-
value: '^(p|a|FT_|TB_|ul_|v|[xy]i$|[zijklxyhmrgbacwestnduvqf]$|[dmpwsitcf][xy]$|(ch|skel)[0-2]?$|it$|tw$|dt$|th$|ls$|func$|res$|shader$|len$|maxLength$|length$|offset$|offpos$|result$|bg$|sp$|url$|index$|ctxt$|key$|null$|logger$|LAST_MODIFIED$|teleNr$|target$|id$|hit$|hsl[0-2]?$|rgb[0-2]?$|dir$|tmp$|sub$|ret$|rendered$|size$|isWeaponCollide$|zerochar$|dist$|sound$|matches$|nohook$|btn$|savedLayers$|l[hw]$|evilz$|sec$|min$|to2$|delay$|[xy]Fract$|[xy]Int$|imgg[xy]$|skip$|localPlayer$|fdratio$|[rgbat][0-2]$|[xy][0-3]$|x[rl]$).*'
157+
value: '^((a|v|p|pfn)+[A-Z][a-zA-Z0-9]*|[abcdefghijklmnpqrstuvwxyz]|[aptvxy][0-3]|[cdfimpstw][xy])$'
158158

.github/workflows/clang-tidy.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,5 @@ jobs:
4545
-DCMAKE_CXX_CLANG_TIDY="clang-tidy-20;-warnings-as-errors=*" \
4646
-DCMAKE_C_CLANG_TIDY="clang-tidy-20;-warnings-as-errors=*" \
4747
-DCMAKE_BUILD_TYPE=Debug \
48-
-Werror=dev \
49-
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. ..
48+
-Werror=dev ..
5049
cmake --build . --config Debug --target everything -- -k 0

data/languages/arabic.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2212,7 +2212,7 @@ Show friend icon in name plates
22122212
Show client IDs in name plates
22132213
==
22142214

2215-
Show client IDs on a seperate line
2215+
Show client IDs on a separate line
22162216
==
22172217

22182218
Client IDs size

data/languages/azerbaijani.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2445,7 +2445,7 @@ Name plates offset
24452445
Show friend icon in name plates
24462446
==
24472447

2448-
Show client IDs on a seperate line
2448+
Show client IDs on a separate line
24492449
==
24502450

24512451
Client IDs size

data/languages/belarusian.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2070,7 +2070,7 @@ Show friend icon in name plates
20702070
Show client IDs in name plates
20712071
== Паказваць ID кліента ў таблічках імёнаў
20722072

2073-
Show client IDs on a seperate line
2073+
Show client IDs on a separate line
20742074
== Паказваць ID кліента ў асобным радку
20752075

20762076
Client IDs size

data/languages/bosnian.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ Show friend icon in name plates
21592159
Show client IDs in name plates
21602160
==
21612161

2162-
Show client IDs on a seperate line
2162+
Show client IDs on a separate line
21632163
==
21642164

21652165
Client IDs size

data/languages/brazilian_portuguese.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2142,7 +2142,7 @@ Name plates offset
21422142
Show friend icon in name plates
21432143
== Mostrar ícone de amigo em placas de nome
21442144

2145-
Show client IDs on a seperate line
2145+
Show client IDs on a separate line
21462146
== Mostrar IDs de clientes em uma linha separada
21472147

21482148
Client IDs size

data/languages/bulgarian.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ Show friend icon in name plates
20512051
Show client IDs in name plates
20522052
==
20532053

2054-
Show client IDs on a seperate line
2054+
Show client IDs on a separate line
20552055
==
20562056

20572057
Client IDs size

data/languages/catalan.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@ Show friend icon in name plates
22352235
Show client IDs in name plates
22362236
==
22372237

2238-
Show client IDs on a seperate line
2238+
Show client IDs on a separate line
22392239
==
22402240

22412241
Client IDs size

data/languages/chuvash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2051,7 +2051,7 @@ Show friend icon in name plates
20512051
Show client IDs in name plates
20522052
==
20532053

2054-
Show client IDs on a seperate line
2054+
Show client IDs on a separate line
20552055
==
20562056

20572057
Client IDs size

0 commit comments

Comments
 (0)