Continue to port over changes from Ishii - Githubissues

r2dliu / dolphin

Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC with improvements.

https://dolphin-emu.org/

Other

8 stars 4 forks source link

Continue to port over changes from Ishii #6

Closed r2dliu closed 4 years ago

r2dliu commented 4 years ago

Mainline as of last edit is up to part with https://github.com/project-slippi/Ishiiruka/

Comb through commits since and keep mainline as up to date as possible

Make individual prs and tickets and then notify me when they're ready. This ticket will be updated accordingly

ehandal commented 4 years ago

I can take this on. This is the "git log --first-parent" of ishii as of now:

9364bbe4d6 make dolphin random cycle through all stages
dec2faa67c Merge pull request #121 from project-slippi/fix/linux-user-json-path
4872c43d69 Merge pull request #105 from project-slippi/fix/playback
bfab9af941 blacklist code from game end changes
0cd5b675b9 Merge pull request #115 from JosJuice/disable-texture-scaling
509f63b834 Merge pull request #113 from lilleswing/README-OSX-Build
31b217e1e1 Merge pull request #112 from project-slippi/update/inputs
a80eb772ff Merge pull request #108 from project-slippi/fix/rumble
d4cbf5217e Merge pull request #106 from project-slippi/fix/macOS-ci
3894e7eeea Merge pull request #103 from project-slippi/feature/preserve-inputs-on-error
1307473b28 Merge pull request #104 from ryanmcgrath/high-sierra-adapter-fix
2b12489a9b Merge pull request #96 from project-slippi/fix/blank-replay-dir
fbe603c602 Merge pull request #100 from project-slippi/seekbar-toggle
af044e39f1 Merge pull request #99 from ehandal/txt_delete
01219805a3 Merge pull request #101 from project-slippi/fix/playback
985aeed172 sane configuration defaults for slippi use
ce5dd121ee Merge pull request #92 from bhegde8/unicode-default-dir-fix

project-slippi/Ishiiruka@4c84600 is in "Merge pull request #101 from project-slippi/fix/playback" so I'm starting by porting that first and working on each commit that follows.

ehandal commented 4 years ago

Port for 01219805a3 Merge pull request #101 from project-slippi/fix/playback: https://github.com/r2dliu/dolphin/pull/24

ehandal commented 4 years ago

Port for af044e39f1 Merge pull request #99 from ehandal/txt_delete: https://github.com/r2dliu/dolphin/pull/25

ehandal commented 4 years ago

Skipping fbe603c602 Merge pull request #100 from project-slippi/seekbar-toggle since @r2dliu is working on Qt based seekbar stuff.

ehandal commented 4 years ago

Port for 2b12489a9b Merge pull request #96 from project-slippi/fix/blank-replay-dir: PR #28

ehandal commented 4 years ago

Looks like we can skip 1307473b28 Merge pull request #104 from ryanmcgrath/high-sierra-adapter-fix since the same fix was already applied in the newer libusb in mainline.

ehandal commented 4 years ago

Skipping the following Ishii changes:

0cd5b675b9 Merge pull request #115 from JosJuice/disable-texture-scaling
509f63b834 Merge pull request #113 from lilleswing/README-OSX-Build
31b217e1e1 Merge pull request #112 from project-slippi/update/inputs
a80eb772ff Merge pull request #108 from project-slippi/fix/rumble
d4cbf5217e Merge pull request #106 from project-slippi/fix/macOS-ci
3894e7eeea Merge pull request #103 from project-slippi/feature/preserve-inputs-on-error
1307473b28 Merge pull request #104 from ryanmcgrath/high-sierra-adapter-fix

Most of these are adapter changes that might not be needed in mainline. There's a CI fix that we don't need right now, and disabling texture scaling which is Ishii only.

ehandal commented 4 years ago

Port for bfab9af941 blacklist code from game end changes: #29

ehandal commented 4 years ago

Skipping 4872c43d69 Merge pull request #105 from project-slippi/fix/playback. Asked @r2dliu about it since he's working on seekbar/playback, he said not to worry about it.

ehandal commented 4 years ago

Got more commits from Ishii to do:

5eb09d0d08 Merge pull request #143 from ryanmcgrath/update-macos-translocation-msg
a412e4c32b Merge pull request #141 from HannesMann/cubeb-minimum-latency
df9f748cb9 config: fix b0xx ini writing for windows
33e17edf6b config: fix b0xx ini writing again
495ea8be41 config: only copy b0xx ini on Windows and macOS
5fcf748ea3 config: fix slash
4c0cb12906 Merge pull request #137 from JosJuice/sys-dir-concatenation
d1ccf3d851 Merge branch 'slippi' of github.com:project-slippi/Ishiiruka into slippi
8de9db95c9 config: bring back b0xx ini without User folder
d53c0c451b Add rev str to AboutDolphin
a0ab72c47a (tag: v2.2.0) config: default to 2x Internal Resolution
0aaa69de40 Merge branch 'slippi' of https://github.com/project-slippi/Ishiiruka into slippi
ba98e729cf change selections received logger message
0a09f420f3 Merge branch 'slippi' of github.com:project-slippi/Ishiiruka into slippi
59012ddc88 update to Version 2.2.0
d1739ac765 build, Dolphin: Add VC notice and delete on boot
dc02a51bed build: eliminate Overwrite directory and use Data
874a434b6b update codeset
88eb962d64 Merge pull request #132 from project-slippi/feature/stage-select
68a60b1e15 Merge pull request #130 from project-slippi/update/ci
1b0d9b3e9f data: Update default files for builds
5aff05e554 CI: fix windows publish
c9181a0364 Merge pull request #129 from project-slippi/linux-update
aefa072390 GCAdapter: input rate -> poll rate
d50d74e08f Merge pull request #127 from aribl/slippi
9a41463945 Update Readme.md
44668e9769 add support to stay connected when local testing
eaa39198a6 Merge pull request #120 from project-slippi/update/cmake
c7a21f065c Merge pull request #123 from project-slippi/fix/offbrand-adapters

ehandal commented 4 years ago

c7a21f065c Merge pull request #123 from project-slippi/fix/offbrand-adapters is a backport from mainline, skipping. eaa39198a6 Merge pull request #120 from project-slippi/update/cmake ported #32

ehandal commented 4 years ago

44668e9769 add support to stay connected when local testing ported #33 9a41463945 Update Readme.md skipping (has to do with setting the build configuration to Release x64 in VS builds).

ehandal commented 4 years ago

d50d74e08f Merge pull request #127 from aribl/slippi build issue might not exist in mainline, skipping for now. aefa072390 GCAdapter: input rate -> poll rate this WX adapter config is Ishii-only, skipping

r2dliu commented 4 years ago

skipping https://github.com/project-slippi/Ishiiruka/commit/eda5710996745a059dc9f0dce7acdd091b064b5a

r2dliu commented 4 years ago

on par