Skip to content

Patch 1#3

Open
Wangoviridans wants to merge 2 commits intorafaco:masterfrom
Wangoviridans:patch-1
Open

Patch 1#3
Wangoviridans wants to merge 2 commits intorafaco:masterfrom
Wangoviridans:patch-1

Conversation

@Wangoviridans
Copy link
Copy Markdown

Calculated: add team size

Add: team size added in calculated battles. (first time with autokey, plz double check).
@rafaco
Copy link
Copy Markdown
Owner

rafaco commented Apr 8, 2021

Thanks @Wangoviridans! First Pull Request on this repo 🥇

Having a team size button is an interesting feature that give more flexibility to our UI. I'll love to merge it and to release a new version containing your feature.

Related to your PR, it get broken somehow as it add 825 duplicated lines to the project. Using an external comparison tool, I managed to identity your proper changes (around 12 lines) and they looks very good. You need to fix the PR, in order to contain only your proper changes.

You can create a new PR or reuse this one but you have to remove the conflictive commit. I recommend you to create a new branch from my develo branch in your fork, apply there your proper changes and verify line by line your changes before every commit. Then remove the current commits from this PR and add the new one from your new branch.

Cheers!

@Wangoviridans
Copy link
Copy Markdown
Author

Douh! Sry! Pull req. was made via phone & rdp + copy paste :)
Cancel this request, I will push correct PR soon :)

@rafaco
Copy link
Copy Markdown
Owner

rafaco commented Apr 9, 2021

Hi @Wangoviridans,
I also saw in your commits that you have to change the script because you installed PlariumPlay in a custom folder... well, not any more :)

You give me the idea for a new feature and it's already working on 'develop' branch. When "Open Game" is pressed and the folder is not found, a folder selector will ask for the correct installation folder. Selected folder get stored in settings for following executions.

You can pull "develop" branch and give it a try. If you haven't created your PR already, do it from this updated "develop" branch sources. I will merge it into "develop" branch and release both features together.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants