Skip to content

03. Working With Battle Team

Jump to bottom
Niklas edited this page Jan 9, 2026 · 8 revisions

⚠️ Important: Ensure you’ve completed everything in Wiki Section 1: Prerequisites and Wiki Section 2: Local Cloning Guide before proceeding to make sure you have the project setupped and ready.

How to get started with Battle Team Development.

Assets/QuantumUser folder is where most of the Battle team development happens.

📆 Meetings

Full Team meetings (not just Battle-Team) (KOKO TIIMIN PALAVERI)

For testing out new builds and collaborating with other teams. Also discussing Prg related general topics.

Battle-Team meetings (BATTLEPALAVERI)

For discussing Battle in general. Working together on tasks. Planning how to do things.

Meeting times

Check the meeting times from the shared Calendar.

Additional meeting

You can also request a meeting for additional help by sending a message in Discord with the time and date (check shared Calendar) of the meeting to the appropriate person.

📄 Basic workflow

Starting a new task

Writing your task

  1. Open Battle project view
  2. Click "+ Add item"
  3. Click +
  4. Click "Create new issue"
  5. Use template "Battle taski"
  6. Write task in finnish

Creating your branch

  1. pull from main
  2. create your feature branch based on main
  3. Link your feature branch to the "Development" section on the task

Working on your task

  • Commit your changes to your feature branch.
    • Use english in your commits
    • Add your issue number to the end of commits message title.
    • Commit early, commit often!
  • Also remember to push to remote
  • When necessary merge changes from main branch to your feature branch.

Finishing your task

  1. Create a pull request
  • Use english
  1. Wait for someone to review your pull request before merging to main.

Branching

Primary Branch

We primarily use main branch for development.
However the main branch is protected so you can't directly push into it.
From the main branch you branch out feature branch. Once your task is done you merge your branch back to main.

Feature Branches

The term "Feature branch" refers to feature branch workflow which is used for most tasks in battle development. Not all feature branches are features. They could be fixes or something else.

Create a feature branch for every task you are working on.

  • Make sure you are on the main branch before creating a feature branch
    • Make sure that you choose the main branch as the base branch when using GitHub desktop

Feature branch naming

The basic structure we use for branch names in Battle-Team is: <Team>/<type>/<name>

Branch types:

  • feature
  • update
  • refactor
  • fix

For example:
Battle/feature/BallPhysics
Battle/refactor/Collisions
Battle/fix/PlayerMovement

Clone this wiki locally