|
|
|
@ -96,19 +96,19 @@ We review all changes before they're merged into the main branch. This is to ens
|
|
|
|
|
|
|
|
|
|
|
|
The Types of Branches we use are as follows:
|
|
|
|
The Types of Branches we use are as follows:
|
|
|
|
|
|
|
|
|
|
|
|
* **Feature**
|
|
|
|
* Feature
|
|
|
|
Format: feature/<name>
|
|
|
|
Format: feature/<name>
|
|
|
|
*Features will be used for adding new gameplay mechanics, UI updates, major changes.*
|
|
|
|
*Features will be used for adding new gameplay mechanics, UI updates, major changes.*
|
|
|
|
|
|
|
|
|
|
|
|
* **Bugfix**
|
|
|
|
* Bugfix
|
|
|
|
Format: bugfix/<name>
|
|
|
|
Format: bugfix/<name>
|
|
|
|
*Bugfixes will be used for fixing bugs that don't appear to be game/project breaking, and may not have been noticed early.*
|
|
|
|
*Bugfixes will be used for fixing bugs that don't appear to be game/project breaking, and may not have been noticed early.*
|
|
|
|
|
|
|
|
|
|
|
|
* **Hotfix**
|
|
|
|
* Hotfix
|
|
|
|
Format: hotfix/<name>
|
|
|
|
Format: hotfix/<name>
|
|
|
|
*Hotfixes are for fixing issues that prevent features from functioning. For example, missing dependencies etc.*
|
|
|
|
*Hotfixes are for fixing issues that prevent features from functioning. For example, missing dependencies etc.*
|
|
|
|
|
|
|
|
|
|
|
|
* **Task**
|
|
|
|
* Task
|
|
|
|
Format: task/<name>
|
|
|
|
Format: task/<name>
|
|
|
|
*Tasks are smaller updates. For example, adding a new static mesh, implementing an animation etc.*
|
|
|
|
*Tasks are smaller updates. For example, adding a new static mesh, implementing an animation etc.*
|
|
|
|
|
|
|
|
|
|
|
|
|
