ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/project64/project64 into develop

This commit is contained in:
zilmar 2024-10-10 18:00:12 +10:30
parent c176f61aac fc23fca43e
commit 7aa77a3840
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.github/CONTRIBUTING.md vendored
View File

@ -1,10 +1,10 @@
# Introduction # Introduction
First of all, thank you for considering contributing to Project64! Project64 is an open-source project and we love to receive contributions from the community. Contributions by the community help fix bugs, add new features, and improve the project. There are many ways to contribute, from writing and improving the documentation, testing, submitting bug reports and feature requests, or writing code which can be incorporated into Project64 itself. First of all, thank you for considering contributing to Project64! Project64 is an open-source project, and we love to receive contributions from the community. Contributions help fix bugs, add new features, and improve the project. There are many ways to contribute, from writing and improving the documentation, testing, submitting bug reports and feature requests, or writing code that can be incorporated into Project64 itself.
If you are looking for support or need help, please join the [Discord](https://discord.gg/Cg3zquF)! It's the best way to get your questions answered quickly. Please do not open a GitHub issue without first reading through the [support document](../Docs/SUPPORT.md). If you are looking for support or need help, please join the [Discord](https://discord.gg/Cg3zquF)! It's the best way to get your questions answered quickly. Please do not open a GitHub issue without first reading through the [support document](../Docs/SUPPORT.md).
Following these guidelines will help make sure that users and developers alike can work together to achieve the projects goals. Following these guidelines will help ensure that users and developers alike can work together to achieve the project's goals.
Please do NOT post any copyrighted materials. This includes (but is not limited to) ROMs, ROM hacks, IPL and firmware files, etc. Please do NOT post any copyrighted materials. This includes (but is not limited to) ROMs, ROM hacks, IPL and firmware files, etc.
@ -12,17 +12,17 @@ Save states and game saves do not fall under this category, so please post them
# Github Contribution Guide # Github Contribution Guide
1. Create a fork of the repository on your own account. 1. Create a fork of this repository on your own account.
2. Create a new branch from the `develop` branch. 2. Create a new branch from the `develop` branch.
* Use helpful naming convention for the branch. (i.e. `fix`, `documentation`, etc.) * Choose a meaningful name for the branch (e.g. `fix`, `documentation`).
3. Commit the changes made on your new branch 3. Commit any changes onto your new branch.
4. If senisible, squash all of your commits into one. This will help clean up the process of vetting. 4. If sensible, squash all commits into one. This helps clean up the vetting process.
* Esnure that commit messages are clear, consice, and infromative. They should include information about all changes made especially if you've squash multiple commits into one. * Ensure that commit messages are clear, concise, and informative. They should include information about all changes made, especially when squashing multiple commits into one.
5. Once all commits have been made and squashed, rebase all changes in your branch. 5. Once all commits have been made and squashed, rebase all changes in your branch.
* Rebasing will resolve any merge confilcts that your changes may present * Rebasing will resolve any merge confilcts that your changes may cause.
7. Create a pull request to the `develop` branch 6. Create a pull request to the `develop` branch
* The Pull request should be descriptive including any and all changes made to the code base. If multiple files have been changed, then organize the changes in a manner that is easy for a reviewer to follow. * The pull request should be descriptive and include all changes made to the code base. If multiple files have been changed, organize them such that they can be easily followed by a reviewer.
* Make sure that you **allow edits** by maintainers when making the Pull Request * Make sure that you **allow edits** by maintainers when making the Pull Request.
8. Your changes should be reviewed and fixes may be made to your changes. 7. Your changes should be reviewed and fixes may be made to your changes.
* If fixes are made please make sure to address them * If fixes are made please make sure to address them.

1
Config/Project64.rdb
View File

@ -5610,6 +5610,7 @@ Status=Compatible
Counter Factor=1 Counter Factor=1
Linking=Off Linking=Off
ViRefresh=3000 ViRefresh=3000
RDRAM Size=8
Core Note=Requires Parallel-RSP. Core Note=Requires Parallel-RSP.
[93A625B9-2D6022E6-C:42] [93A625B9-2D6022E6-C:42]