USING THE TOOLS
This section is meant to be a useful reference and provide ways to answer questions you might have on using Godot.
Using Godot
GDScript Syntax (very long, it might be better to just google your question or ask someone)
Classes in GDScript (arrays, strings, various game objects, etc)
Remember about the Help button in the Godot editor - it has access to all of the documentation and is very useful.
Using the Git Plugin
Create a Github account
Create a classic Github access token (Make sure to copy it and save it somewhere secure)
○ Make sure to give it access to the repository and check all necessary permissions
Open the terminal and run git clone https://github.com/Northwood-Game-Development-Club/wizards-and-dragons to make a copy of the repository
○ When asked for a username, type in your github username, and when asked for a password, paste in your access token that you created earlier.
Open the Godot project manager, hit Import and select the cloned folder (it should be in the directory written in front of where you entered your git command in the terminal). Click Edit.
Download and install the github app (use the amd64 .deb file)
To update your version to the latest on Github, open the Github app, click 'Fetch Origin' and then 'Pull Origin' at the top of the screen.
To add a change you made to the project to the version on Github, save and open the Github app. You should see your changes listed out. If you are satisfied, write what you changed in the commit message boxes and click the commit button. Then, click the Push button at the top of the screen (upwards arrow) to sync your changes with Github. The change should now show up in the History panel and on Github.
If you want to do something that will either take a lot of time and possibly interfere with other's work or be something you might not be certain about, create a new branch. To do this, click where it says 'Current branch' at the top of the screen and hit 'New branch'. Give it a sensible name (without spaces) and click create.
To merge a branch you created into the main branch, open the branch on Github (with the menu under the name of the current branch, or by changing the url). Click Contribute -> Open pull request. Write a description, and then click Create pull request. If you have conflicts with the merge, click Resolve Conflicts and edit the file to fix the conflict. When you are done, click Mark as Resolved and Commit Merge.
To finish the merge, click Merge Pull Request, edit the description, and click Confirm Merge. If you don't want to do anything else with this branch, click Delete branch and then remove the branch from your computer in the Godot editor with the remove branch option on the menu button on the bottom of the commit panel.
Using Git on the command line (click to expand)
Git Documentation
A Chat-GPT sourced summary of the basics:
Git is a distributed version control system that helps teams manage code changes, collaborate efficiently, and maintain a history of the project. Here's a summary of how to use Git in a group project, along with explanations of key Git commands:
Setup and Configuration:
git init: Initialize a new Git repository in the project directory.
git config: Set up user-specific or project-specific Git configurations (e.g., username and email).
Cloning a Repository:
git clone [repository URL]: Create a copy of an existing remote repository to work on locally.
Branching:
git branch: List all available branches in the repository.
git branch [branch-name]: Create a new branch.
git checkout [branch-name]: Switch to a different branch.
git checkout -b [new-branch-name]: Create and switch to a new branch in one command.
Working on Code:
git add [file]: Stage changes for commit.
git commit -m "[commit message]": Commit staged changes with a descriptive message.
git status: Check the status of your working directory and staged changes.
Merging and Pulling Changes:
git merge [branch-name]: Merge changes from one branch into the current branch.
git pull: Fetch remote changes and merge them into the current branch.
Pushing Changes:
git push [remote] [branch-name]: Push your local changes to a remote repository.
Resolving Conflicts:
git diff: View differences between conflicting branches.
git mergetool: Open a merge tool to help resolve conflicts.
Manually edit conflicted files and commit changes to resolve conflicts.
Collaboration:
git remote -v: List remote repositories associated with the project.
git fetch [remote]: Fetch changes from a remote repository.
git pull [remote] [branch-name]: Fetch and merge changes from a remote branch.
git push [remote] [branch-name]: Push your local branch changes to a remote repository.
Reviewing History:
git log: View the commit history of the current branch.
git blame [file]: See who made changes to a specific file and when.
Tagging Releases:
git tag [tag-name]: Create a tag to mark a specific commit (e.g., for releases).
Collaborative Workflow:
Follow a branching strategy (e.g., Gitflow, feature branches) to organize work and avoid conflicts.
Communicate with team members to coordinate work and resolve conflicts.
Regularly pull and push changes to keep your local and remote repositories up-to-date.