Skip to content

Commit

Permalink
Merge branch 'dev' into feature/audio-device-picker
Browse files Browse the repository at this point in the history
  • Loading branch information
diogotr7 authored Jun 2, 2020
2 parents 7ebce7a + 5045d20 commit 148cce0
Show file tree
Hide file tree
Showing 54 changed files with 1,043 additions and 595 deletions.
53 changes: 51 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"code",
"question",
"doc",
"maintenance"
"maintenance",
"review"
]
},
{
Expand All @@ -59,7 +60,10 @@
"contributions": [
"code",
"question",
"maintenance"
"maintenance",
"projectManagement",
"review",
"doc"
]
},
{
Expand Down Expand Up @@ -185,6 +189,51 @@
"contributions": [
"question"
]
},
{
"login": "Fluto",
"name": "Fluto",
"avatar_url": "https://avatars3.githubusercontent.com/u/7686594?v=4",
"profile": "https://github.com/Fluto",
"contributions": [
"code"
]
},
{
"login": "stuntguy3000",
"name": "Luke Anderson",
"avatar_url": "https://avatars1.githubusercontent.com/u/1522389?v=4",
"profile": "http://stuntguy3000.com",
"contributions": [
"code"
]
},
{
"login": "thingamajig0",
"name": "thingamajig0",
"avatar_url": "https://avatars1.githubusercontent.com/u/31176843?v=4",
"profile": "https://github.com/thingamajig0",
"contributions": [
"code"
]
},
{
"login": "rushdie99",
"name": "polinyeh",
"avatar_url": "https://avatars3.githubusercontent.com/u/9208301?v=4",
"profile": "https://github.com/rushdie99",
"contributions": [
"code"
]
},
{
"login": "xQwexx",
"name": "Qwex",
"avatar_url": "https://avatars3.githubusercontent.com/u/17799600?v=4",
"profile": "https://github.com/xQwexx",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7
Expand Down
33 changes: 22 additions & 11 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
## How to contribute!
#### I have found a bug!
- Please make sure that your bug was not already reported by searching the [Issues](https://github.com/antonpup/Aurora/issues).
- If your bug was already reported, please comment on the existing issue instead of making a new one.
- If your bug is new, feel free to make a [New Issue](https://github.com/antonpup/Aurora/issues/new).
# Contributing to Aurora

#### I want to contribute code!
- You can fork this repo and make changes to the code on the [dev branch](https://github.com/antonpup/Aurora/tree/dev).
- The [dev branch](https://github.com/antonpup/Aurora/tree/dev) is the usually the most up-to-date branch on the repo.
- Please ensure that your new code follows the [CamelCase](https://en.wikipedia.org/wiki/Camel_case) naming convention.
- If you want to make a pull request, please make sure that you are making a pull request into the dev branch (and not master).
### I have found a bug!
- Please make sure that your bug was not already reported by searching the [issues](https://github.com/antonpup/Aurora/issues).
- If your bug was already reported and you have additional information to provide, please comment on the existing issue. Do not create a new issue that is a duplicate of an existing one (unless it has been closed).
- If you cannot find your issue reported, please make a [New Issue](https://github.com/antonpup/Aurora/issues/new) and follow the bug report template.

We appreciate your kind efforts in making Aurora a better software!
### I want to contribute code!
- Please first create your own fork of this repo if you do not already have one.
- If you have not done so yet, you will need to clone your repo onto your local machine for development. `git clone https://github.com/your-username/Aurora.git`
- You will also need to add the main repo as an upstream to get updated commits. `git remote add upstream https://github.com/antonpup/Aurora.git`
- Make sure your fork is up-to-date with the latest dev branch on the main repo. `git fetch upstream`
- Create a feature or fix branch from the latest dev branch. `git checkout -b feature/my-new-feature upstream/dev`
- If you plan on adding new features, please prefix your branch name with 'feature/'. For example `feature/audio-layer-improvements`.
- If you plan on fixing bugs, please prefix your branch name with 'fix/'. For example `fix/layer-selection`.
- If you are adding features and bug fixes, use 'feature/'.
- If you are adding or fixing multiple unrelated areas, please divide your code into different branches. For example, don't add a new device at the same time as you change how the overrides system works.
- Please ensure that your code follows the existing conventions set out in the code (such as using auto properties where applicable, naming conventions, etc.).
- When you have finished your feature or bug fix, push your changes to your remote branch. E.g. `git push origin feature/my-cool-feature`
- Create a [new pull request](https://github.com/antonpup/Aurora/compare) on the main Aurora repo.
- Add a descriptive title and description which includes a detailed list of what has been changed and any known issues. You may also wish to include screenshots, examples and important design decisions you made in the description too.
- A collaborator will review your PR and accept it or make suggestions on what should be changed.

We appreciate your kind efforts in making Aurora a better software! :tada:
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Bug Report
about: Report an issue with how the program works.
labels: bug
labels: 'Type: Bug'
---
<!--
Thank you for reporting your issues to us, helping to make Aurora better! :)
Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
blank_issues_enabled: false
contact_links:
- name: Discord
url: https://discord.gg/YAuBmg9
about: Please direct any questions to our Discord server. You may also ask about any issue here - you may receive a faster response on Discord than GitHub.

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/device_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Device Request
about: Request support for a new hardware device.
labels: hardware support
labels: 'Type: Enhancement,Area: Hardware Support'
---
<!--
Please make sure you SEARCH for any other issues requesting your device before submitting your issue - it might already have been requested.
Expand All @@ -21,4 +21,4 @@ Please add support for the following device:

**Device Name:** <!-- Make/model of device -->

**Device Website:** <!-- Please add a link to the manufacturer's website -->
**Device Website:** <!-- Please add a link to the manufacturer's website -->
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/enhancement.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
name: Enhancement
about: Got an idea for a new feature for Aurora? Put it here.
labels: enhancement
labels: 'Type: Enhancement'
---
<!--
Thank you for helping to improve the Aurora lighting software.
Please describe your suggested idea in-depth below. What will it do? How will it work?
-->
-->
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/game_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Game Request
about: Request support for a new game or application.
labels: game support
labels: 'Type: Enhancement,Area: Game Support'
---
<!--
Please make sure you SEARCH for any other issues requesting this game before submitting your issue - it might already have been requested.
Expand All @@ -28,4 +28,4 @@ Please add support for the following game:

**Game Name:** <!-- What game is it? -->

**Methods:** <!-- Please tell us which methods of getting data this game has (see above). Native GSI/Mod support/Memory reading -->
**Methods:** <!-- Please tell us which methods of getting data this game has (see above). Native GSI/Mod support/Memory reading -->
2 changes: 1 addition & 1 deletion Installer/installer.iss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define public Version "0.6.1"
#define public Version "0.8.0"

#ifdef EXTERNAL_VERSION
#if len(EXTERNAL_VERSION)>0
Expand Down
Loading

0 comments on commit 148cce0

Please sign in to comment.