-
-
Notifications
You must be signed in to change notification settings - Fork 465
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into future_changes_for_coc
- Loading branch information
Showing
2,896 changed files
with
200,783 additions
and
32,509 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
# .git-blame-ignore-revs | ||
|
||
# Style: Replace tabs with 4 spaces | ||
3970dd95199e99fecc50e55868019cd08f21925e | ||
|
||
# Style: Remove trailing whitespaces | ||
331da1b22fb73224d64a09924d96d23414ef4b09 | ||
|
||
# Style: Ensure files end with a new line | ||
2e1bd658355e94e5205aa0c1064ecf5ee7281488 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- | ||
name: Vanilla bug report | ||
about: Create a report to help us fix original S.T.A.L.K.E.R. bugs. | ||
title: '' | ||
labels: Vanilla Bug | ||
assignees: '' | ||
|
||
--- | ||
|
||
**Describe the bug** | ||
A clear and concise description of what the bug is. | ||
|
||
**To Reproduce** | ||
Steps to reproduce the behavior: | ||
1. Go to '.' | ||
2. Go to '..' | ||
3. Go to '...' | ||
4. See error | ||
|
||
**Expected behavior** | ||
A clear and concise description of what you expected to happen. | ||
|
||
**Screenshots, videos** | ||
If applicable, add screenshots to help explain your problem. | ||
|
||
**BugTrap error report** | ||
Please, add a crashreport if you have it. It should be located in `_appdata_/reports` folder | ||
|
||
**Desktop (please complete the following information):** | ||
- OS: [e.g. Windows 10 or Ubuntu 18.10] | ||
- OpenXRay build version [e.g. 421] | ||
|
||
**Additional context** | ||
Add any other context about the problem here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
AI: | ||
- src/xrAICore/**/* | ||
- src/xrGame/ai/**/* | ||
|
||
Documentation: | ||
- docs/**/* | ||
|
||
External (3rd party): | ||
- Externals/**/* | ||
|
||
Game assets: | ||
- res/**/* | ||
|
||
Physics: | ||
- src/xrPhysics/**/* | ||
|
||
Renderer: | ||
- src/Layers/**/* | ||
|
||
DirectX: | ||
- src/Layers/xrRenderDX* | ||
- src/Layers/xrRenderPC_R1 | ||
- src/Layers/xrRenderPC_R2 | ||
- src/Layers/xrRenderPC_R4 | ||
|
||
OpenGL: | ||
- src/Layers/xrRenderGL | ||
- src/Layers/xrRenderPC_GL | ||
|
||
Sound: | ||
- src/xrSound/**/* | ||
|
||
UI: | ||
- src/xrUICore/**/* | ||
- src/xrGame/ui/**/* | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
pending review: | ||
- '**/*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
pending review: | ||
- '!**/*' | ||
|
||
ready to merge: | ||
- '**/*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
ready to merge: | ||
- '!**/*' |
Oops, something went wrong.