Skip to content

Commit 3905c00

Browse files
JaimiJaimi
authored
Merge pull request #237 from umasteeringgroup/master
Update Develop from master
2 parents 3ff445e + db37fde commit 3905c00

File tree

6 files changed

+108
-49
lines changed

6 files changed

+108
-49
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**Environment (please complete the following information):**
14+
- Unity Version:
15+
- UMA Version:
16+
- Platform Build (if not editor):
17+
18+
**To Reproduce**
19+
Steps to reproduce the behavior:
20+
1. Go to '...'
21+
2. Click on '....'
22+
3. Scroll down to '....'
23+
4. See error
24+
25+
**Expected behavior**
26+
A clear and concise description of what you expected to happen.
27+
28+
**Screenshots**
29+
If applicable, add screenshots to help explain your problem.
30+
31+
**Additional context**
32+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: new feature
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

‎README.txt ‎CONTRIBUTING.md

+42-49
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,42 @@
1-
UMA - Unity Multipurpose Avatar 2.X
2-
3-
Git repo: https://github.com/umasteeringgroup/UMA
4-
Wiki: http://umawiki.secretanorak.com/
5-
Forum: http://forum.unity3d.com/threads/uma-unity-multipurpose-avatar-on-the-asset-store.219175
6-
License: MIT
7-
8-
==========================================================
9-
GitHub Branching Model
10-
==========================================================
11-
----------------------------------------------------------
12-
Main Branches
13-
----------------------------------------------------------
14-
15-
Never commit directly to these branches!
16-
17-
Master: This branch matches the current version on the asset store.
18-
19-
Develop: This branch is where new feature branches are merged in to as they are completed.
20-
21-
----------------------------------------------------------
22-
Supporting Branches
23-
----------------------------------------------------------
24-
25-
Release(version#)
26-
27-
May branch from: develop
28-
29-
Must merge back into: develop and master
30-
31-
Branch naming convention: release-*
32-
33-
----------------------------------------------------------
34-
Feature
35-
36-
May branch from: develop
37-
38-
Must merge back into: develop
39-
40-
Branch naming convention: feature-*
41-
42-
----------------------------------------------------------
43-
Hotfix
44-
45-
May branch from: master
46-
47-
Must merge back into: develop and master
48-
49-
Branch naming convention: hotfix-*
1+
==========================================================
2+
GitHub Branching Model
3+
==========================================================
4+
----------------------------------------------------------
5+
Main Branches
6+
----------------------------------------------------------
7+
8+
Never commit directly to these branches!
9+
10+
Master: This branch matches the current version on the asset store.
11+
12+
Develop: This branch is where new feature branches are merged in to as they are completed.
13+
14+
----------------------------------------------------------
15+
Supporting Branches
16+
----------------------------------------------------------
17+
18+
Release(version#)
19+
20+
May branch from: develop
21+
22+
Must merge back into: develop and master
23+
24+
Branch naming convention: release-*
25+
26+
----------------------------------------------------------
27+
Feature
28+
29+
May branch from: develop
30+
31+
Must merge back into: develop
32+
33+
Branch naming convention: feature-*
34+
35+
----------------------------------------------------------
36+
Hotfix
37+
38+
May branch from: master
39+
40+
Must merge back into: develop and master
41+
42+
Branch naming convention: hotfix-*

‎README.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
![UMA](logo.png)
2+
3+
Unity Multipurpose Avatar System, or UMA for short, is a free character creation and modification system with lots of cool features. UMA was designed with flexibility in mind, so although it's primary purpose is for working with humanoid characters, its systems can be adapted to work with any model you like. So if you want to create modifiable, optimised models for use in your games. UMA is the place to start. As a community project UMA is always being improved. Although the best efforts are made to keep this wiki up to date, it relies on the spare time of helpful individuals to maintain. If you want more help or feel like chipping in then get involved with one of the community links below.
4+
5+
6+
Git repo: https://github.com/umasteeringgroup/UMA
7+
8+
Wiki: http://umadocs.secretanorak.com/doku.php?id=start
9+
10+
Forum: http://forum.unity3d.com/threads/uma-unity-multipurpose-avatar-on-the-asset-store.219175
11+
12+
License: MIT
13+
14+
[![UMA Intro](intro.png)](https://youtu.be/qzJeMWNEhWM)]

‎intro.png

125 KB
Loading

‎logo.png

4.98 KB
Loading

0 commit comments

Comments
 (0)