Skip to content

Commit

Permalink
Merge branch 'dev' into future_changes_for_coc
Browse files Browse the repository at this point in the history
  • Loading branch information
ChugunovRoman committed Nov 22, 2023
2 parents 465be64 + 467c919 commit e90e224
Show file tree
Hide file tree
Showing 2,896 changed files with 200,783 additions and 32,509 deletions.
10 changes: 10 additions & 0 deletions .git-blame-ignore-revs
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
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 @@ open_collective: openxray
#liberapay: # Replace with a single Liberapay username
#issuehunt: # Replace with a single IssueHunt username
#otechie: # Replace with a single Otechie username
#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
custom: ['https://boosty.to/openxray'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Steps to reproduce the behavior:
**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
**Screenshots, videos**
If applicable, add screenshots to help explain your problem.

**BugTrap error report**
Expand Down
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/vanilla_bug_report.md
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.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ updates:
open-pull-requests-limit: 10
labels:
- External (3rd party)
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
labels:
- External (3rd party)
37 changes: 37 additions & 0 deletions .github/labeler.yml
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/**/*


2 changes: 2 additions & 0 deletions .github/labeler_on_new_pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pending review:
- '**/*'
5 changes: 5 additions & 0 deletions .github/labeler_on_pr_approved.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pending review:
- '!**/*'

ready to merge:
- '**/*'
2 changes: 2 additions & 0 deletions .github/labeler_on_pr_merged.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ready to merge:
- '!**/*'
Loading

0 comments on commit e90e224

Please sign in to comment.