Skip to content

Automatic PR with changes from the template repo #22

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.

Sign up for GitHub

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

Open
ccpgames-carbon wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Automatic PR with changes from the template repo #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0223f68
Merge commit 49910ec9943f481f33687880cccf064f88b85883 from carbon-tem…
ccpgames-carbon May 12, 2026
5870a2c
Merge commit 9f0a73dad8c0a2916d65b7a8b2e82e087b9903d5 from carbon-tem…
ccpgames-carbon May 27, 2026
2687e8f
Merge commit 320ddd3d5736b4dfe0579bea1537f5d1183e6743 from carbon-tem…
ccpgames-carbon May 27, 2026
5e09574
Merge remote-tracking branch 'origin/main' into template-updates
ccpgames-carbon Jul 21, 2026
efb3c02
Merge commit 6105f3a8ee156045d11dc986017c23a2fce72ca4 from carbon-tem…
ccpgames-carbon Jul 21, 2026
39226cb
Merge commit 64e4db12e89b70ebd08a81bccfd5c2e7a3b4c59f from carbon-tem…
ccpgames-carbon Aug 11, 2026
2229843
Merge commit 1b204c086bd5b0dd43ece40d21d1952f13ebd3c0 from carbon-tem…
ccpgames-carbon Aug 11, 2026
5ce9ef8
Merge remote-tracking branch 'origin/main' into template-updates
ccpgames-carbon Sep 25, 2026
af7611d
Merge commit 273275de7d546dcaced8f6e52e0f7ea4082a9065 from carbon-tem…
ccpgames-carbon Sep 25, 2026
a635f29
Merge commit 89063a618f4f44146f9a805457e8cc3f5e2774c0 from carbon-tem…
ccpgames-carbon Sep 25, 2026
60ea146
Merge commit ccfad9156c2bdfbeed1eb35c10cb38ce6c3247ba from carbon-tem…
ccpgames-carbon Sep 25, 2026
66a600f
Merge commit 54c18b7d6a8459a68b1e07b46ee37386d3a4bc81 from carbon-tem…
ccpgames-carbon Sep 25, 2026
efa3d93
Merge commit 5c6d9ce9165c417bef43a64d423791423ff3f80c from carbon-tem…
ccpgames-carbon Sep 26, 2026
7129cb2
Merge commit 39b92209b3de49a6f1acd531a58f21e047995a64 from carbon-tem…
ccpgames-carbon Sep 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 132 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,55 @@ SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: true
SpacesInSquareBrackets: false
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Standard: Cpp11
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
>>>>>>> template/carbonengine/resources-updates
TabWidth: 4
UseTab: ForContinuationAndIndentation
---
Expand Down Expand Up @@ -146,7 +194,91 @@ SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: false
SpacesInParentheses: true
SpacesInSquareBrackets: false
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
Standard: Cpp11
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
=======
Standard: Cpp17
TabWidth: 4
UseTab: ForContinuationAndIndentation
...
>>>>>>> template/carbonengine/resources-updates
137 changes: 137 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,71 @@
[*]
charset = utf-8
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
end_of_line = crlf
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
=======
end_of_line = lf
>>>>>>> template/carbonengine/resources-updates
indent_size = 4
indent_style = space
insert_final_newline = false
max_line_length = 120
tab_width = 4
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
ij_continuation_indent_size = 8
ij_formatter_off_tag = @formatter:off
ij_formatter_on_tag = @formatter:on
Expand Down Expand Up @@ -946,3 +1006,80 @@ ij_python_wrap_long_lines = false

[{*.toml,Cargo.lock,Cargo.toml.orig,Gopkg.lock,Pipfile,poetry.lock}]
ij_toml_keep_indents_on_empty_lines = false
=======
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
trim_trailing_whitespace = true

[{*.yaml,*.yml,.clang-format,.clang-tidy,_clang-format}]
# In yaml, a two-space indent is used by default in many of the solutions we integrate with.
# Examples are GitHub Actions and Kubernetes
indent_size = 2

[{*.h,*.hpp,*.hxx,*.c,*.cpp,*.cxx}]
# .clang-format should take precedence, but for editors which do not do that we're adding those settings here, too.
indent_style = tab

[*.red]
# Those are yaml files, but do use a 4 space indent
indent_size = 4

[{*.markdown,*.md}]
# In markdown a [double whitespace at the end of a line acts as a line break](https://www.markdownguide.org/basic-syntax/#line-breaks).
# Even though it's controversial to use it for that purpose (there are alternatives like using the `<br />` html tag),
# let's not break it accidentally in files that already use the double whitespace.
trim_trailing_whitespace = false
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
=======
>>>>>>> template/carbonengine/resources-updates
6 changes: 6 additions & 0 deletions .github/dependabot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "vcpkg"
directory: "/" # The location of vcpkg.json
schedule:
interval: "monthly"
Loading
Loading