Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Metadorius committed Jul 9, 2021
2 parents d7dade1 + b6f822f commit 76fb96a
Show file tree
Hide file tree
Showing 196 changed files with 14,473 additions and 1,395 deletions.
75 changes: 75 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Visual Studio generated .editorconfig file with C++ settings.
root = true

[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]

# Vanilla EditorConfig settings

charset = utf-8
indent_style = tab
indent_size = 4

# Visual C++ Code Style settings

cpp_generate_documentation_comments = xml

# Visual C++ Formatting settings

cpp_indent_braces = false
cpp_indent_multi_line_relative_to = innermost_parenthesis
cpp_indent_within_parentheses = indent
cpp_indent_preserve_within_parentheses = true
cpp_indent_case_contents = true
cpp_indent_case_labels = false
cpp_indent_case_contents_when_block = false
cpp_indent_lambda_braces_when_parameter = true
cpp_indent_goto_labels = one_left
cpp_indent_preprocessor = leftmost_column
cpp_indent_access_specifiers = false
cpp_indent_namespace_contents = true
cpp_indent_preserve_comments = false
cpp_new_line_before_open_brace_namespace = new_line
cpp_new_line_before_open_brace_type = new_line
cpp_new_line_before_open_brace_function = new_line
cpp_new_line_before_open_brace_block = new_line
cpp_new_line_before_open_brace_lambda = new_line
cpp_new_line_scope_braces_on_separate_lines = true
cpp_new_line_close_brace_same_line_empty_type = true
cpp_new_line_close_brace_same_line_empty_function = true
cpp_new_line_before_catch = true
cpp_new_line_before_else = true
cpp_new_line_before_while_in_do_while = true
cpp_space_before_function_open_parenthesis = remove
cpp_space_within_parameter_list_parentheses = false
cpp_space_between_empty_parameter_list_parentheses = false
cpp_space_after_keywords_in_control_flow_statements = true
cpp_space_within_control_flow_statement_parentheses = false
cpp_space_before_lambda_open_parenthesis = false
cpp_space_within_cast_parentheses = false
cpp_space_after_cast_close_parenthesis = false
cpp_space_within_expression_parentheses = false
cpp_space_before_block_open_brace = true
cpp_space_between_empty_braces = true
cpp_space_before_initializer_list_open_brace = true
cpp_space_within_initializer_list_braces = true
cpp_space_preserve_in_initializer_list = true
cpp_space_before_open_square_bracket = false
cpp_space_within_square_brackets = false
cpp_space_before_empty_square_brackets = false
cpp_space_between_empty_square_brackets = false
cpp_space_group_square_brackets = true
cpp_space_within_lambda_brackets = false
cpp_space_between_empty_lambda_brackets = false
cpp_space_before_comma = false
cpp_space_after_comma = true
cpp_space_remove_around_member_operators = true
cpp_space_before_inheritance_colon = true
cpp_space_before_constructor_colon = true
cpp_space_remove_before_semicolon = true
cpp_space_after_semicolon = true
cpp_space_remove_around_unary_operator = true
cpp_space_around_binary_operator = insert
cpp_space_around_assignment_operator = insert
cpp_space_pointer_reference_alignment = left
cpp_space_around_ternary_operator = insert
cpp_wrap_preserve_blocks = all_one_line_scopes
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: [patreon.com/belonit, patreon.com/kerbiter]
custom: [github.com/Phobos-developers/Phobos#developers]
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_enhancement.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Feature or Enhancement
about: Open an issue to give some suggestion on a feature.
title: "[New Feature] Your new feature title here"
labels: Feature / Enhancement
assignees: ''
---
<!--
Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
-->
### Description:
<!-- Describe your feature request here. -->

### Possible Implementation:
<!-- Tell us how this could be implemented, example INI code, etc. -->
```ini
[SomeSection]
SomeKey=SomeValue
```

### Additional Files / Links:
<!-- Attach additional files or links to content related to the feature report here (images/gifs/videos etc). -->
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/phobos_bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: Phobos Bug Report
about: Open an issue to ask for a Phobos bug to be fixed.
title: "[Phobos Bug] Your bug report title here"
labels: Phobos bug
assignees: ''
---
<!--
Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
-->
### Description:
<!-- Detailed summary of what the bug is. -->

### Phobos Build:
<!-- Link to the exact Phobos build used (must include a PDB). -->

### Conditions:
<!-- For example, other engine extensions, Syringe version, mod, INI code or external changes that are used to reproduce the bug. -->

### Steps To Reproduce:
<!-- Tell us how to reproduce this issue so the developer(s) can reproduce the bug. -->
1.
2.
3.

### Expected Behaviour:
<!-- Tell us what should happen. -->

### Actual Behaviour:
<!-- Tell us what happens instead. -->

### Additional Files / Links:
<!--
Attach additional files or links to content related to the bug report here, like:
- images/gifs/videos to illustrate the bug;
- files that are needed to reproduce the bug;
- a savegame file with used mod to reproduce the exact conditions;
- a debug log, crash dump and exception file (mandatory if you're submitting a crash report);
- sync logs, crash dumps for all the players (mandatory in case you're submitting a desync report).
-->


38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/vanilla_bugfix_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Vanilla Bugfix Request
about: Open an issue to ask for a vanilla bug to be fixed.
title: "[Vanilla Bug] Your bug report title here"
labels: Vanilla bug
assignees: ''
---
<!--
Fill in the placeholders below. Delete any headings and placeholders that you do not fill in.
-->
### Description:
<!-- Detailed summary of what the bug is. -->

### Conditions:
<!-- For example, mod, INI code or external changes that are used to reproduce the bug. -->

### Steps To Reproduce:
<!-- Tell us how to reproduce this issue so the developer(s) can reproduce the bug. -->
1.
2.
3.

### Expected Behaviour:
<!-- Tell us what should happen. -->

### Actual Behaviour:
<!-- Tell us what happens instead. -->

### Additional Files / Links:
<!--
Attach additional files or links to content related to the bug report here, like:
- images/gifs/videos to illustrate the bug;
- files that are needed to reproduce the bug;
- a savegame file with used mod to reproduce the exact conditions;
- a debug log, crash dump and exception file (mandatory if you're submitting a crash report);
- sync logs, crash dumps for all the players (mandatory in case you're submitting a desync report).
-->

5 changes: 4 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
working-directory: ${{env.GITHUB_WORKSPACE}}
run: nuget restore ${{env.SOLUTION_FILE_PATH}}

- uses: ammaraskar/msvc-problem-matcher@master
- name: Build
working-directory: ${{env.GITHUB_WORKSPACE}}
# Add additional options to the MSBuild command line here (like platform or verbosity level).
Expand All @@ -41,4 +42,6 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: compiled-dll-${{github.sha}}
path: ${{env.SOLUTION_FILE_PATH}}/${{env.BUILD_CONFIGURATION}}/Phobos.dll
path: |
${{env.SOLUTION_FILE_PATH}}/${{env.BUILD_CONFIGURATION}}/Phobos.dll
${{env.SOLUTION_FILE_PATH}}/${{env.BUILD_CONFIGURATION}}/IntDir/Phobos.pdb
56 changes: 56 additions & 0 deletions .github/workflows/pr-nightly-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Nightly Build comment on pull request
on:
workflow_run:
workflows: ['Nightly Build']
types: [completed]
jobs:
pr_comment:
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v3
with:
# This snippet is public-domain, taken from
# https://github.com/oprypin/nightly.link/blob/master/.github/workflows/pr-comment.yml
script: |
const {owner, repo} = context.repo;
const run_id = ${{github.event.workflow_run.id}};
const pull_head_sha = '${{github.event.workflow_run.head_sha}}';
const pull_user_id = ${{github.event.sender.id}};
const issue_number = await (async () => {
const pulls = await github.pulls.list({owner, repo});
for await (const {data} of github.paginate.iterator(pulls)) {
for (const pull of data) {
if (pull.head.sha === pull_head_sha && pull.user.id === pull_user_id) {
return pull.number;
}
}
}
})();
if (issue_number) {
core.info(`Using pull request ${issue_number}`);
} else {
return core.error(`No matching pull request found`);
}
const {data: {artifacts}} = await github.actions.listWorkflowRunArtifacts({owner, repo, run_id});
if (!artifacts.length) {
return core.error(`No artifacts found`);
}
let body = `Nightly build for this pull request:\n`;
for (const art of artifacts) {
body += `\n* [${art.name}.zip](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`;
}
body += `\nThis comment is automatic and is meant to allow guests to get latest nightly builds without registering. It is updated on every successful build.`;
const {data: comments} = await github.issues.listComments({repo, owner, issue_number});
const existing_comment = comments.find((c) => c.user.login === 'github-actions[bot]');
if (existing_comment) {
core.info(`Updating comment ${existing_comment.id}`);
await github.issues.updateComment({repo, owner, comment_id: existing_comment.id, body});
} else {
core.info(`Creating a comment`);
await github.issues.createComment({repo, owner, issue_number, body});
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ Nightly/
DevBuild/

docs/_build/

.vscode/c_cpp_properties.json
/.vscode/cspell.json
56 changes: 56 additions & 0 deletions .vscode/c_cpp_properties.example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
// This is a Phobos project-specific config file for VSCode official C++ extension.
// https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools

// Change those variables to match the installation paths
// of the described items in your system.
"env": {
// Path to Windows SDK v7.1A which was installed with legacy WinXP v141 toolkit.
// Edit this if you have a different installation location.
"windowsSdk71APath": "${env:ProgramFiles(x86)}/Microsoft SDKs/Windows/v7.1A",

// Path to Visual Studio or VS Build Tools installation folder.
"vsPath": "${env:ProgramFiles(x86)}/Microsoft Visual Studio/2019/Community",

// Windows Universal CRT runtime installation location.
// For some reason VSCode doesn't want to properly find stuff sometimes
// so edit this if UCRT is located at a different path.
"ucrtPath": "${env:ProgramFiles(x86)}/Windows Kits/10/Include/10.0.10240.0/ucrt"
},

// Don't change below this line unless you know what you're doing.
"configurations": [
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/src",
"${workspaceFolder}/src/**",
"${workspaceFolder}/src/ExtraHeaders",
"${workspaceFolder}/src/ExtraHeaders/**",
"${workspaceFolder}/YRpp",
"${workspaceFolder}/YRpp/**",
"${ucrtPath}",
"${ucrtPath}/**",
"${windowsSdk71APath}/Include",
"${windowsSdk71APath}/Include/**"
],
"defines": [
"SYR_VER=2",
"HAS_EXCEPTIONS=0",
"NOMINMAX",
"_CRT_SECURE_NO_WARNINGS",
"_USING_V110_SDK71_",
"_WINDLL"
],
"compilerPath": "${vsPath}/VC/Tools/MSVC/14.16.27023/bin/HostX86/x86/cl.exe",
"windowsSdkVersion": "10.0.10240.0",
"cStandard": "c17",
"cppStandard": "c++20",
"intelliSenseMode": "windows-msvc-x86",
"browse": {
"limitSymbolsToIncludedHeaders": false
}
}
],
"version": 4
}
22 changes: 22 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp

// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"ms-vscode.cpptools",
"executablebookproject.myst-highlight",
"visualstudioexptteam.vscodeintellicode",
"fernandoescolar.vscode-solution-explorer",
"editorconfig.editorconfig",
"michelemelluso.gitignore",
"spmeesseman.vscode-taskexplorer",
"streetsidesoftware.code-spell-checker",
"gruntfuggly.todo-tree",
"shardulm94.trailing-spaces"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": [
"llvm-vs-code-extensions.vscode-clangd"
]
}
Loading

0 comments on commit 76fb96a

Please sign in to comment.