Skip to content

Commit

Permalink
Merge pull request #294 from DorielRivalet/release
Browse files Browse the repository at this point in the history
docs: update to velopack
  • Loading branch information
DorielRivalet authored Feb 13, 2024
2 parents 5359d87 + 022445f commit a20863e
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ scripts/input/
# composer
vendor/

# ignore Clowd.Squirrel exe
# ignore Clowd.Squirrel / Velopack exe
Update.exe

# ignore claudiaIDE
Expand Down Expand Up @@ -153,7 +153,7 @@ DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory and Clowd.Squirrel
# Click-Once directory and Clowd.Squirrel / Velopack
publish/

# Publish Web Output
Expand Down
23 changes: 8 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

- [Monster Hunter Frontier Z Overlay](#monster-hunter-frontier-z-overlay)
- [About](#about)
- [Requirements](#requirements)
- [System Requirements](#system-requirements)
- [Minimum](#minimum)
- [Recommended](#recommended)
Expand Down Expand Up @@ -59,41 +58,35 @@ The overlay is highly configurable, with a wide range of options available to su

We hope you find this overlay useful and enjoyable, and we welcome any feedback or suggestions you may have. Happy hunting!

## Requirements

- [.NET Desktop Runtime 6.0 x64](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-6.0.7-windows-x64-installer).
- [.NET Desktop Runtime 6.0 x86](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-6.0.8-windows-x86-installer).

## System Requirements

### Minimum

- OS: Windows 10 (64-bit)
- Processor: Intel® Core™ i3-4130 or Core™ i5-3470
- Memory: 8 GB RAM
- Memory: 6 GB RAM
- Storage: 500 MB available space
- Additional Notes: 1080p/30fps when refresh rate is set to 1. System requirements subject to change during software development.

### Recommended

- OS: Windows 10 (64-bit)
- Processor: Intel® Core™ i5-4460 or better
- Memory: 8 GB RAM
- Memory: 6 GB RAM
- Storage: 500 MB available space
- Additional Notes: 1080p/30fps when refresh rate is set to 30. System requirements subject to change during software development.

Please note that these system requirements are estimates and may vary based on your specific hardware configuration. If you encounter any performance issues or have different hardware specifications, please provide feedback or send an issue for assistance. We appreciate your input in helping us improve the overlay's compatibility with a wider range of hardware setups.

If you record and/or stream with the overlay, the recommended RAM is 16 GB and the recommended processor is Intel® Core™ i7 or better.
If you record and/or stream with the overlay, the recommended processor is Intel® Core™ i7 or better.

## Installation

1. [Get **ALL** of the requirements](#requirements).
2. [Download the latest version from the *Releases*](https://github.com/DorielRivalet/mhfz-overlay/releases/latest/download/MHFZ_OverlaySetup.exe).
3. Make sure *Windows* or your antivirus did not delete the file (because it reads the game's memory, *Windows* might detect it as a trojan, so you might have to get it out of quarantine).
4. Run `MHFZ_OverlaySetup.exe` **as Administrator**.
5. [Bonk monsters!](https://c.tenor.com/60Tr3Zeg6RkAAAAd/fumo-bonk.gif)
6. [Be sure to leave some feedback here!](https://forms.gle/hrAVWMcYS5HEo1v7A)
1. [Download the latest version from the *Releases*](https://github.com/DorielRivalet/mhfz-overlay/releases/latest/download/MHFZ_Overlay-win-Setup.exe).
2. Make sure *Windows* or your antivirus did not delete the file (because it reads the game's memory, *Windows* might detect it as a trojan, so you might have to get it out of quarantine).
3. Run `MHFZ_OverlaySetup.exe` **as Administrator**.
4. [Bonk monsters!](https://c.tenor.com/60Tr3Zeg6RkAAAAd/fumo-bonk.gif)
5. [Be sure to leave some feedback here!](https://forms.gle/hrAVWMcYS5HEo1v7A)

> [!NOTE]<br>
> It's recommended to start the overlay when you are done loading into Mezeporta.
Expand Down
2 changes: 1 addition & 1 deletion docs/cicd.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Our development process follows the best practices of Continuous Integration and
- **Version Control**: *Git* with commitlint and *CircleCI* for enforcing commit message style.
- **Build and Automation**: *GitHub Actions* for building and testing the software automatically.
- **Code Integrity/Quality**: *SonarCloud* for code analysis, code coverage and quality checks. *Dependabot* alerts for vulnerability issues mainly relating to package-lock.json.
- **Packaging**: *clow.squirrel* for creating installers/packages.
- **Packaging**: *Velopack* for creating installers/packages.
- **Testing**: *XUnit* for writing and executing unit tests.
- **Release Management**: *GitHub Releases* for creating versioned releases with release notes and documentation.
- **Development Environment**: C# with *Visual Studio* and .NET 6.0 for developing the software.
Expand Down
12 changes: 6 additions & 6 deletions docs/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

## Overview

The following steps outline the process for releasing and deploying the software using clowd.squirrel, after making changes and testing in-game.
The following steps outline the process for releasing and deploying the software using Velopack, after making changes and testing in-game.

### Repository branch structure

Expand Down Expand Up @@ -60,12 +60,12 @@ If you are working on fixes, test your fixes before working on something else. T
6. Update CHANGELOG.md: Run `npm run release` to automatically update the CHANGELOG.md file with the changes made. When prompted for the tag name, follow Semver's specifications and prefix with a `v`. Answer `Yes` to all except the last question ("Create a Release on GitHub?").
7. Merge release branch into main: **Recommended to send a Pull Request to the main branch**. Otherwise, run `git checkout main` to switch to the main branch and do `git pull origin main` to pull the latest remote changes, then run `git merge release` to merge the release branch into the main branch, and finally `git push origin main`.
8. Verify GitHub Actions: Verify that the GitHub Actions workflow has been triggered and completed successfully. If something is wrong, go back to step 1 and fix any issues without modifying the git history (no rebases and no squashes).
9. Publish in Visual Studio: Open the solution in Visual Studio then switch from Build configuration to Release configuration. Publish the software's project using Visual Studio.
10. Update packVersion with Clowd.Squirrel: Open the command prompt in the `C:\Users\Name\.nuget\packages\clowd.squirrel\x.x.xx\tools` folder, then run the following command, replacing the appropriate paths and version number (replace the packVersion flag with the actual version number):
- `Squirrel.exe pack --packId "MHFZ_Overlay" --packDirectory "ABSOLUTE_PATH\MHFZ_Overlay\MHFZ_Overlay\bin\Release\net6.0-windows\publish" --framework net6.0-x86 --packTitle="Monster Hunter Frontier Z Overlay" --packAuthors="DorielRivalet" --splashImage="ABSOLUTE_PATH\MHFZ_Overlay\splash.png" --icon="ABSOLUTE_PATH\MHFZ_Overlay\img\icon\mhfzoverlayicon256.ico" --appIcon="ABSOLUTE_PATH\MHFZ_Overlay\img\icon\mhfzoverlayicon256.ico" --packVersion "0.13.0"`
11. Add to GitHub Releases: Create a new release on GitHub with the appropriate version number, release notes, and documentation. Lastly, attach all of the files in the generated Releases folder separately.
9. Open terminal in `MHFZ_Overlay` project directory and run `dotnet publish -c Release --self-contained -r win-x86 -o publish`.
10. Update packVersion with Velopack: Install `vpk` from Velopack if you don't have it, then run the following command, replacing the packVersion flag with the new version number):
- `vpk pack --packId MHFZ_Overlay --packDir publish --mainExe "MHFZ_Overlay.exe" --splashImage ../splash.gif --icon mhfzoverlayicon256.ico --packAuthors "DorielRivalet" --packTitle "Monster Hunter Frontier Z Overlay" --packVersion 0.36.0`
11. Add to GitHub Releases: Create a new release on GitHub with the appropriate version number, release notes, and documentation. Lastly, attach all of the files in the generated Releases folder separately (`assets.win.json not needed`).

By following these steps, the software can be releasified and deployed using clowd.squirrel, ensuring that the latest changes are packaged and released to users efficiently and reliably. Also, you are allowed to make feature branches and merge them into the release branch.
By following these steps, the software can be releasified and deployed using Velopack, ensuring that the latest changes are packaged and released to users efficiently and reliably. Also, you are allowed to make feature branches and merge them into the release branch.

### Merging via command line

Expand Down
2 changes: 1 addition & 1 deletion docs/libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The following libraries have been utilized in the development of this software:

- [Clowd.Squirrel](https://github.com/clowd/Clowd.Squirrel): Used for installation process.
- [Velopack](https://github.com/velopack/velopack): Used for installation process.
- [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp): Used for Discord rich presence integration.
- [WPF UI](https://github.com/lepoco/wpfui): Used for UI design.
- [Memory.dll](https://github.com/erfg12/memory.dll): Used for reading game addresses.
Expand Down
Binary file added splash.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a20863e

Please sign in to comment.