Transdimensional Combat
Variable: snake_case
Functions: snake_case
Scenes: PascalCase
Folders: PascalCase
For this project we will be using the Gitflow workflow. There are two main branches, master
and develop
. The master
branch is used for release-able versions of code. The develop
branch is used for active development, testing, and integrating new features. Below are the proceedures to be used for developing a new feature, issuing a hotfix, and publishing a release.
- Checkout a new branch from the
HEAD
ofdevelop
. Make sure the branch name starts with "feature-" - Use this branch for developing and testing the feature.
- When the feature is completed, merge back into
develop
or create a pull request for others to review the code and later, merge. - Delete the
feature
branch.
- When the
develop
branch is ready to be released, checkout a new branch fromdevelop
. Make sure the branch name starts with "release-" - Once any last minute fixes are completed, create a pull request to merge the
release
branch intomaster
. - Once reviewed and approved, the branches will be merged.
- Once the branches are merged, the current postion of the
master
branch will be tagged as a new release. - Merge the
release
branch back intodevelop
and continue on with development. - Delete the
release
branch.
- To issue a hotfix to a bug on the
master
branch, checkout a new branch frommaster
. Make sure the branch name starts with "hotfix-" - Once the bug is fixed, create a pull request or merge the
hotfix
branch into bothmaster
anddevelop
. - Once the branches are merged, the current postion of the
master
branch will be tagged as a new release. - Delete the
hotfix
branch.
- Have bullets show over networked game
- Have lobby screen with all possible lobbys discovered on the network
- Matthias Harden
- Joe Zlonicky
- Noah Jacobsen
- Davis Carlson