A flight simulator for 2020-1's Open Day.
The master
branch will only be used for full releases, for active development checkout to the dev
branch.
Suggestions are welcomed!
- Unity 2019.2.8f1
For collaboration to work, the following plugins should be installed and used.
- Get Github For Unity plugin at this link or install it on the Unity Asset Store in your Editor.
- It is recommended to work with the Command Line it provides, since it will save tons of weird crashes. You can open one terminal instance from
Window -> Github Command Line
. - To start, checkout to the
dev
branch.
- It is recommended to work with the Command Line it provides, since it will save tons of weird crashes. You can open one terminal instance from
- Get Unity Standard Assets (2017) from the Asset Store in your Editor. Don't worry, it'll be alright :^)
Guideline #1: Do not commit to the master
branch.
Instead, create a branch from the dev
branch addressing an issue. Use this format fix/{number}
.
Example: Let's say you're working on issue #2
.
git checkout dev
git checkout -b fix/2
Guideline #2: If you want to develop something (or notice that something has to be done), be it adding some feature or fixing a bug, create an issue, please.
Steps:
- Go to the issue page.
- Click on New issue.
- Set a descriptive title, i.e.
Implement Cloud Physics
. - Set a description of what has to be achieved. The more detail it has the better will be for everyone.
- Add a label:
bug
orenhancement
(if it's a feature). - Click on Projects and select Open Day Taskboard.
- (Optional) If you want to work on this issue, assign yourself on Assignees.
- Submit new issue.
Guideline #3: If you finish an issue, do not merge it without authorization. Instead, push your branch to remote and make a pull request.
Example: Let's say you were working on issue #2
and you finished your changes.
git add .
(or the folders/files you want to commit.git commit -m "Fixes #2"
git push origin fix/2
- Go to the pull request page.
- Create a
New pull request
. - Select
dev
as base branch and your branch (fix/2
, in this case) as the compared branch. - If there are merge conflicts, fix them or message one of the collaborators in this project.
- Click on
Create pull request
. - Wait upon approval.
- Diego Canez (@dgcnz)
- Facundo Garcia (@fgarciacardenas)
- Nelson Soberon (@Nelsonxxji)
Names are alphabetically ordered, they don't reflect the quantity of work each member has done.