Skip to content

Commit c3919ca

Browse files
StarkkuStarkku
committed
Merge branch 'release/v0.3'
2 parents 7a13cdc + e21a4ae commit c3919ca

File tree

273 files changed

+31277
-3474
lines changed

Some content is hidden

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

273 files changed

+31277
-3474
lines changed

‎.editorconfig

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,65 @@
11
# Visual Studio generated .editorconfig file with C++ settings.
22
root = true
33

4+
# Default Code Style settings
5+
[*]
6+
charset = utf-8
7+
end_of_line = crlf
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[.gitattributes]
12+
charset = utf-8
13+
end_of_line = unset
14+
insert_final_newline = unset
15+
trim_trailing_whitespace = true
16+
17+
# Makefile Code Style settings
18+
[Makefile]
19+
indent_style = tab
20+
indent_size = 4
21+
22+
# Json Code Style settings
23+
[*.{json,vsconfig}]
24+
indent_style = space
25+
indent_size = 2
26+
27+
# yml Code Style settings
28+
[*.yml]
29+
indent_style = space
30+
indent_size = 2
31+
32+
# xml Code Style settings
33+
[*.{xml,html}]
34+
indent_style = space
35+
indent_size = 2
36+
37+
# vcxproj Code Style settings
38+
[*.vcxproj]
39+
indent_style = space
40+
indent_size = 2
41+
insert_final_newline = false
42+
43+
# Ignore scripts/vswhere.exe
44+
[vswhere.exe]
45+
charset = unset
46+
end_of_line = unset
47+
insert_final_newline = unset
48+
trim_trailing_whitespace = unset
49+
indent_style = unset
50+
indent_size = unset
51+
52+
# C++ Code Style settings
453
[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli}]
554

655
# Vanilla EditorConfig settings
7-
8-
charset = utf-8
956
indent_style = tab
1057
indent_size = 4
1158

1259
# Visual C++ Code Style settings
13-
1460
cpp_generate_documentation_comments = xml
1561

1662
# Visual C++ Formatting settings
17-
1863
cpp_indent_braces = false
1964
cpp_indent_multi_line_relative_to = innermost_parenthesis
2065
cpp_indent_within_parentheses = indent

‎.gitattributes

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
* text eol=crlf
2+
3+
*.vcproj text eol=crlf
4+
*.c++ text eol=crlf
5+
*.cc text eol=crlf
6+
*.cpp text eol=crlf
7+
*.cppm text eol=crlf
8+
*.cxx text eol=crlf
9+
*.h text eol=crlf
10+
*.h++ text eol=crlf
11+
*.hh text eol=crlf
12+
*.hpp text eol=crlf
13+
*.hxx text eol=crlf
14+
*.inl text eol=crlf
15+
*.ipp text eol=crlf
16+
*.ixx text eol=crlf
17+
*.tlh text eol=crlf
18+
*.tli text eol=crlf
19+
20+
*.sh text eol=lf
21+
22+
*.gif -text
23+
*.jpg -text
24+
*.png -text
25+
*.exe -text

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Official channels on C&C Mod Haven
4+
url: https://discord.gg/an3bDxtksM
5+
about: If you want to discuss something with us without filing an issue.

‎.github/ISSUE_TEMPLATE/feature_enhancement.md

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

‎.github/ISSUE_TEMPLATE/feature_enhancement.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Feature or Enhancement Suggestion
2+
description: Open an issue to suggest a feature or an enhancement.
3+
title: "Your new feature title here"
4+
labels: ["Feature / Enhancement"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
*__NOTE:__ Feature requests are usually low-priority unless it's a feature that's supported by a majority of users or some developer has interest in that particular feature. Please understand that Phobos contributors work on the project for fun and are not obliged to implement every suggestion.*
10+
11+
Thanks for taking the time to submit out this feature suggestion! If you wish to discuss the feature in detail first, join us on the [C&C Mod Haven Discord](https://discord.gg/an3bDxtksM) server in the __#phobos-chat__ channel.
12+
13+
Please make sure you follow these instructions and fill in every question with as much detail as possible.
14+
15+
- type: checkboxes
16+
id: checks
17+
attributes:
18+
label: First check
19+
description: Please confirm and check all the following options;
20+
options:
21+
- label: The suggestion is **NOT** related to functionality of Ares, HAres, Kratos or any other YR engine extension.
22+
required: true
23+
- label: The suggested feature / enhancement is **NOT** implemented in Ares/Phobos yet and the existing possibilites are not viable or good enough to achieve the wanted result.
24+
required: true
25+
- label: I agree to elaborate the details if requested and provide thorough testing if the feature is implemented.
26+
required: true
27+
- label: I added a very descriptive title to this issue.
28+
required: true
29+
- label: I used the GitHub search and read the issue list to find a similar issue and didn't find it.
30+
required: true
31+
- label: I thought out how the feature / enhancement should work and described it in the most detailed and clear way.
32+
required: true
33+
34+
- type: textarea
35+
id: description
36+
attributes:
37+
label: Description
38+
description: |
39+
Write a detailed description of what the feature / enhancement should be and how it should function.
40+
validations:
41+
required: true
42+
43+
- type: textarea
44+
id: ini
45+
attributes:
46+
label: INI code
47+
description: The suggested INI code of the feature, if applicable.
48+
render: ini
49+
value: |
50+
[SomeSection]
51+
SomeKey=SomeValue
52+
validations:
53+
required: false
54+
55+
- type: textarea
56+
id: context
57+
attributes:
58+
label: Additional context
59+
description: |
60+
Attach additional files or links to content related to the feature report here (example images, gifs, videos to illustrate the suggestion etc).

‎.github/ISSUE_TEMPLATE/phobos_bug_report.md

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

‎.github/ISSUE_TEMPLATE/phobos_bug_report.yml

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
name: Phobos Bug Report
2+
description: Open an issue to ask for a Phobos bug to be fixed.
3+
title: "Your bug report title here"
4+
labels: ["Phobos bug"]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Thanks for taking the time to fill out this bug report! If you need real-time help, join us on the [C&C Mod Haven Discord](https://discord.gg/an3bDxtksM) server in the __#phobos-chat__ channel.
10+
11+
Please make sure you follow these instructions and fill in every question with as much detail as possible.
12+
13+
- type: checkboxes
14+
id: checks
15+
attributes:
16+
label: First check
17+
description: Please confirm and check all the following options;
18+
options:
19+
- label: The issue happens on the **latest official** version of Phobos and wasn't fixed yet.
20+
required: true
21+
- label: I agree to elaborate the details if requested and provide thorough testing if the bugfix is implemented.
22+
required: true
23+
- label: I added a very descriptive title to this issue.
24+
required: true
25+
- label: I used the GitHub search and read the issue list to find a similar issue and didn't find it.
26+
required: true
27+
- label: I have attached as much information as possible *(screenshots, gifs, videos, debug and exception logs, etc)*.
28+
required: true
29+
30+
- type: textarea
31+
id: description
32+
attributes:
33+
label: Description
34+
description: |
35+
Write a detailed description telling us what the issue is, and if/when the bug occurs.
36+
validations:
37+
required: true
38+
39+
- type: input
40+
id: phobos-version
41+
attributes:
42+
label: Phobos Version
43+
description: |
44+
What version of Phobos are you using? Please provide a link to the exact Phobos build used, especially if it's not a release build (must include a PDB).
45+
validations:
46+
required: true
47+
48+
- type: textarea
49+
id: conditions
50+
attributes:
51+
label: Conditions to reproduce
52+
description: |
53+
For example, other engine extensions, Syringe version, used mod, external changes that are used to reproduce the bug.
54+
validations:
55+
required: false
56+
57+
- type: textarea
58+
id: ini
59+
attributes:
60+
label: INI code
61+
description: The INI code that is used to reproduce the issue.
62+
render: ini
63+
validations:
64+
required: false
65+
66+
- type: textarea
67+
id: steps
68+
attributes:
69+
label: Steps to reproduce
70+
description: |
71+
Tell us how to reproduce this issue so the developer(s) can reproduce the bug.
72+
value: |
73+
1.
74+
2.
75+
3.
76+
...
77+
validations:
78+
required: true
79+
80+
- type: textarea
81+
id: expected
82+
attributes:
83+
label: Expected behaviour
84+
description: |
85+
Tell us what should happen.
86+
validations:
87+
required: true
88+
89+
- type: textarea
90+
id: actual
91+
attributes:
92+
label: Actual behaviour
93+
description: |
94+
Tell us what actually happens instead.
95+
validations:
96+
required: true
97+
98+
- type: textarea
99+
id: context
100+
attributes:
101+
label: Additional context
102+
description: |
103+
Attach additional files or links to content related to the bug report here, like:
104+
- images/gifs/videos to illustrate the bug;
105+
- files that are needed to reproduce the bug;
106+
- a savegame file with used mod to reproduce the exact conditions;
107+
- a debug log, crash dump and exception file (mandatory if you're submitting a crash report);
108+
- sync logs, crash dumps for all the players (mandatory in case you're submitting a desync report).

‎.github/ISSUE_TEMPLATE/vanilla_bugfix_request.md

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

0 commit comments

Comments
 (0)