Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INI settings for 'Hasbro Family Game Night 2' #9899

Merged
merged 1 commit into from Jul 18, 2021
Merged

INI settings for 'Hasbro Family Game Night 2' #9899

merged 1 commit into from Jul 18, 2021

Conversation

jack-1313
Copy link
Contributor

@Rumi-Larry
Copy link

Cool, but the pr title should have the name of the game :)

@mbc07
Copy link
Contributor

mbc07 commented Jul 16, 2021

If Sync GPU Thread can fix this, I think it should be preferred over disabling Dual Core. As bad as Dual Core is, it can still provide nice speed boosts especially for people with low end machines...

@jack-1313 jack-1313 changed the title Create R6X.ini (Hasbro Family Game Night 2 ) Create R6X.ini Jul 16, 2021
@jack-1313
Copy link
Contributor Author

Cool, but the pr title should have the name of the game :)

I hope it is fine now.
(.❛ ᴗ ❛.)

@JMC47
Copy link
Contributor

JMC47 commented Jul 16, 2021

I saw conflicting reports that syncGPU may not always fix it when on the unofficial discord.

@jack-1313
Copy link
Contributor Author

jack-1313 commented Jul 16, 2021

If Sync GPU Thread can fix this, I think it should be preferred over disabling Dual Core. As bad as Dual Core is, it can still provide nice speed boosts especially for people with low end machines...

So, I tested using “Sync GPU Thread” enabled, and this fixed this issue. Although, it is not much faster than single core as I wasn’t able to notice any significance difference.

But still I have made the required changes in the file.
Hopefully, everything is ok now.

@Rumi-Larry
Copy link

Cool, but the pr title should have the name of the game :)

I hope it is fine now.
(.❛ ᴗ ❛.)

I suggest "INI settings for 'Hasbro Family Game Night 2'"

@jack-1313 jack-1313 changed the title (Hasbro Family Game Night 2 ) Create R6X.ini INI settings for 'Hasbro Family Game Night 2 Jul 17, 2021
@jack-1313
Copy link
Contributor Author

I have corrected the spelling mistake, and for now, I have reverted back to "Disable Dual Core", because of this:-

I saw conflicting reports that syncGPU may not always fix it when on the unofficial discord.

@jack-1313
Copy link
Contributor Author

Can this PR be merged?

“Disable Dual Core” and “Safe Texture Cache Accuracy” completely solve the issue.

As for “Sync GPU”, we don’t know if it is able to fix the hang for all devices. Until we get more details, this GameINI seems good to me. And if we later get the confirmation that “Sync GPU” fixes, then I will make a new PR for the required changes.

Also, I tried my best to merge all my 4 commits, but since I am new to GitHub, I wasn’t able to do so. Hopefully you guys can use the “Squash and Merge” option.

@Rumi-Larry
Copy link

The title is good, but you missed the second single quote

@jack-1313
Copy link
Contributor Author

jack-1313 commented Jul 18, 2021

The title is good, but you missed the second single quote

Oh, sorry for that.
My first PR has truly turned out to be a disaster with so many mistakes.

Hope everything is now good to go.

@jack-1313 jack-1313 changed the title INI settings for 'Hasbro Family Game Night 2 INI settings for 'Hasbro Family Game Night 2’ Jul 18, 2021
@jack-1313 jack-1313 changed the title INI settings for 'Hasbro Family Game Night 2’ INI settings for 'Hasbro Family Game Night 2' Jul 18, 2021
@mbc07
Copy link
Contributor

mbc07 commented Jul 18, 2021

A simple change like this is very unlikely to get merged until you squash your commits...

Fixes :
https://bugs.dolphin-emu.org/issues/12534

Update R6X.ini

Update R6X.ini

Update R6X.ini
Copy link
Contributor Author

@jack-1313 jack-1313 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the squashed one, the only which needs to be merged?

8f10719

I am confused, have I done anything wrong?

@JosJuice
Copy link
Member

It looks like you first created a squashed commit, and then merged/pulled origin. You need to do it without merging/pulling origin. If the reason why you merged/pulled origin is because git push wouldn't let you push otherwise, you need to use the -f option to git push to override that.

@jack-1313
Copy link
Contributor Author

jack-1313 commented Jul 18, 2021

When I try squashing all the 6 commits, I get this error-
"Unable to squash. Squashing replays all commits up to the last one required for the squash. A merge commit cannot exist among those commits."

Do I need commit all 6, or only the initial 4 that I had earlier tried to squash, or else?

@JosJuice
Copy link
Member

Try git reset --hard 8f107191cbed3d993a2db41440e24c77449491cd

This will bring you back to how things were right after making the 8f10719 commit, before making the merge commit.

@jack-1313
Copy link
Contributor Author

@JosJuice

When I try to git push origin, it asks for git pull, so I do that also.

After that it shows this message
"Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch.
Lines starting with '#' will be ignored, and an empty message aborts the commit."

I am stuck here, can you please help what to do now?

@JosJuice
Copy link
Member

Like I mentioned before, you shouldn't use git pull. Instead, use git push -f in place of git push.

@jack-1313
Copy link
Contributor Author

So, finally, somehow I am able to squash all my commits into one with JosJuice's help.
Let me know if there is something else that also needs to be done.

@JMC47
Copy link
Contributor

JMC47 commented Jul 18, 2021

I double checked single core vs dualcore + syncGPU performance in a few games just in case, and it doesn't seem to be a major difference. If anything, the safe texture cache is a harder hit, but it appears to be necessary to put it to safe. Seems fine to me and the game isn't really playable in master anyway unless you use single core.

@JMC47 JMC47 merged commit ed30008 into dolphin-emu:master Jul 18, 2021
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
6 participants