Skip to content

Commit

Permalink
Merge branch 'IrisShaders:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
WhyFenceCode authored Nov 26, 2024
2 parents 2a182b8 + 7606653 commit 6cef15a
Show file tree
Hide file tree
Showing 267 changed files with 9,217 additions and 4,653 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
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. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

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

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ For uniform references please look at `alphaTestRef` for formatting. The aside f

### PR's and Commits

PR's May take a while to be added, as they need to be fully verified, and someone needs to add them when there on.
PR's May take a while to be added, as they need to be fully verified, and someone needs to add them when they're on.

#### PR/Commit Format (Please Use it in both your commits on your branch and any pr's, makes our lives easy)
(type): (area): description
Expand All @@ -84,4 +84,5 @@ Translations are not yet supported, but once the english version is complete we
## Contributors
- [Iris Docs](https://github.com/IrisShaders/ShaderDoc/tree/master) - Most of the early documentation
- WhyFencePost / WhyFenceCode - The page and a lot of the data transfer
- NinjaMike - Many uniforms including Iris exclusive uniforms
- NinjaMike - Many uniforms including Iris exclusive uniforms, constants, shaders.properties, programs
- jbritain - Some uniforms, other miscellaneous things
22 changes: 22 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Security Policy

## Supported Versions

| Version | Supported |
| ------- | ------------------ |
| Latest | :white_check_mark: |
| Others | :x: |

## Reporting a Vulnerability

If you've found a vulnerability, we would like to know so we can fix it before it is released publicly. Do not open a GitHub issue for a found vulnerability.

Please join [The Iris Discord](https://discord.gg/jQJnav2jPu) and dm one of the docs developers. Send the details:

- where the vulnerability can be observed
- a brief description of the vulnerability
- optionally the type of vulnerability
- non-destructive exploitation details
- We will do our best to reply as fast as possible.

This notice is inspired by [Modrinth's Security Policy](https://modrinth.com/legal/security).
2 changes: 2 additions & 0 deletions astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { defineConfig } from 'astro/config';
import starlight from '@astrojs/starlight';
import starlightImageZoom from 'starlight-image-zoom'

export default defineConfig({
site: 'https://shaders.properties',
Expand Down Expand Up @@ -37,6 +38,7 @@ export default defineConfig({
autogenerate: { directory: 'how_to', collapsed: true},
},
],
plugins: [starlightImageZoom()]
}),
],
});
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@
},
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/starlight": "^0.21.5",
"astro": "^4.3.5",
"@astrojs/starlight": "^0.28.2",
"astro": "^4.16.1",
"astro-og-canvas": "^0.5.0",
"canvaskit-wasm": "^0.39.1",
"sharp": "^0.32.5",
"starlight-image-zoom": "^0.8.0",
"typescript": "^5.4.5"
}
}
Loading

0 comments on commit 6cef15a

Please sign in to comment.