Merge branch 'master' into 'dev'

# Conflicts:
#   .gitlab/issue_templates/Bug.md
#   .gitlab/issue_templates/Feature.md
This commit is contained in:
Harmony 2019-05-23 09:12:11 -04:00
commit 21b07eb283
4 changed files with 52 additions and 3 deletions

View File

@ -1,5 +1,10 @@
<!--- Provide a general summary of the issue in the Title above -->
<!-- You may remove sections that are not related -->
<!-- You should remove sections that are not related -->
## Build Information
<!-- Issues will be closed if you don't provide this information, as we may need to replicate it on your exact build -->
Emulator Version:
Emulator Build (hash):
## Expected Behavior
<!--- Tell us what should happen -->
@ -8,7 +13,7 @@
<!--- Tell us what happens instead of the expected behavior -->
## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- Not obligatory, but suggest a fix/reason for the bug -->
## Steps to Reproduce
<!--- Provide a link to a live example, or an unambiguous set of steps to -->

View File

@ -0,0 +1,29 @@
<!--- Provide a general summary of the issue in the Title above -->
<!-- You should remove sections that are not related or use -->
## Build Information
<!-- Issues will be closed if you don't provide this information, as we may need to replicate it on your exact build -->
Emulator Version:
Emulator Build (hash):
## What is the error?
```
Include your error here. If you have a thread dump, attach it as a txt file
```
## When does this error occur?
<!--- Tell us when this error occurs -->
## What is the outcome of this error?
<!--- What happens after this error occurs? Does the emulator crash? Does the user disconnect? -->
## Steps to Reproduce
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
1.
1.
1.
1.
## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug or make a merge request for your solution -->

View File

@ -1,5 +1,5 @@
<!--- Provide a general summary of the feature request in the Title above -->
<!-- You may remove sections that are not related -->
<!-- You should remove sections that are not related -->
## Summary
<!--- Summarize the feature that you want to add -->

View File

@ -0,0 +1,15 @@
<!--- Provide a general summary of the feature request in the Title above -->
<!-- You should remove sections that are not related -->
## Summary
<!--- Summarize what you're wanting to be improved -->
## How the feature functions now
<!--- Tell us how the feature currently functions -->
## How you want the feature to function
<!--- Tell us how you want the feature to function -->
## Other information (e.g. detailed explanation, stacktraces, related issues, suggestions, links for us to have context, eg. stackoverflow, etc)
<!-- Any other information that you believe will be useful with the implementation of the feature -->