Comments (14)
Can you revert that commit and test?
from ishiiruka.
Looks like it causes conflicts, might need to do it right at a 2.0.x rather than the most recent commit but there aren't tags for those so I'll have to look through the history. I'll see if a can resolve them later but I don't really know anything about the code base.
On branch slippi
Your branch is up to date with 'origin/slippi'.
You are currently reverting commit 078aa1e.
(fix conflicts and run "git revert --continue")
(use "git revert --abort" to cancel the revert operation)
Changes to be committed:
(use "git reset HEAD ..." to unstage)
modified: Source/Core/DolphinWX/Frame.h
modified: Source/Core/DolphinWX/FrameTools.cpp
Unmerged paths:
(use "git reset HEAD ..." to unstage)
(use "git add ..." to mark resolution)
both modified: Source/Core/Core/HW/EXI_DeviceSlippi.cpp
both modified: Source/Core/Core/HW/EXI_DeviceSlippi.h
both modified: Source/Core/Core/HW/SI.cpp
from ishiiruka.
Well, so far I've isolated the issue to Source/Core/Core/HW/SI.cpp 6128f83.
All the conflicts were completely innocuous other than different values for ROLLBACK_MAX_FRAMES (7 vs 5) in EXI_DeviceSlippi.h, which I verified had no impact on the issue. So I did a partial revert where I only reverted the changes with an impact in SI.cpp, and it feels much better.
I haven't bothered trying to alter the remaining changes for a fix at all since I have basically no knowledge of the inner workings of this code.
from ishiiruka.
The commit you linked, does it revert that section to what it was before?
from ishiiruka.
Other than the bit of code here 078aa1e#diff-b62f4664b164e36115c14f8f55559034R684, which is commented out in the current revision, yes, it reverts SI.cpp to 078aa1e.
from ishiiruka.
Gotcha, that should all be safe. You can probably just revert anything that references the g_BButtonPressTime
variable. Mind doing that?
from ishiiruka.
Afterwards feel free to submit the PR, I'll look it over and merge if it looks good.
from ishiiruka.
C++ isn't my expertise but I can probably manage. These are the only references to g_BButtonPressTime
:
./Source/Core/Core/HW/EXI_DeviceSlippi.cpp:76:extern u64 g_BButtonPressTime;
./Source/Core/Core/HW/EXI_DeviceSlippi.cpp:1959: // NOTICE_LOG(SLIPPI, "%llu", Common::Timer::GetTimeUs() - g_BButtonPressTime);
./Source/Core/Core/HW/SI.cpp:683: g_BButtonPressTime = Common::Timer::GetTimeUs();
./Source/Core/Core/HW/SI.cpp:684: ERROR_LOG(SLIPPI, "B Press: %llu", g_BButtonPressTime);
You just want me to rip that stuff out?
from ishiiruka.
Yeah any reference to the variable and you can get rid of the commented code blocks that reference it too
from ishiiruka.
Merged
from ishiiruka.
Yes, thank you both for working with me on it. Does this affect both rollback online and old netplay lobbies, or just old netplay lobbies? I haven't tried to test the changes with rollback online at all because I assumed it would only allow official release clients.
from ishiiruka.
Yes, thank you both for working with me on it. Does this affect both rollback online and old netplay lobbies, or just old netplay lobbies? I haven't tried to test the changes with rollback online at all because I assumed it would only allow official release clients.
you can try playing with the latest commit, just no guarantees it won't desync.
from ishiiruka.
@reinhard33 how were you able to confirm that this fixed your issue btw? Just testing it locally? Also do you have discord? would be easier to communicate more quickly there, feel free to DM after joining the Slippi Discord
from ishiiruka.
I confirmed that this PR fixed the issue with the local netplay lobbies. I think the slowness online I mentioned in the first post was something else because I did my first direct connect with a friend on 2.0.3 with known good connections, and that was perfect.
from ishiiruka.
Related Issues (20)
- Can't connect to friend with direct connection HOT 1
- Playback build doesn't immediately end when netplay build is running next to it
- Dolphin crashes with "Failed to allocate below the 2GB boundary" errors HOT 1
- Controller rumbles during spectator mode
- Modifier Control Stick key only works when turning to the right HOT 5
- Build fails on latest fedora R35 despite all dependencies being met
- Update to Apple Silicon Native Dolphin on MacOS HOT 5
- Desync Triggers Every Game HOT 2
- Controller keeps rumbling when quitting during rumble.
- Steam deck only works on opengl with -no-sandbox option enabled while in game mode HOT 3
- Crash on Arch Linux HOT 5
- Wrong Chat Messages in Preview
- Different directional input values on Linux vs Windows (b0xx controller) HOT 6
- vulkan renderer crash on fullscreen HOT 2
- appimage does not seem to include libmpg123 HOT 2
- hi there! HOT 1
- ENABLE_HEADLESS=ON causes wx/bitmap.h: No such file or directory HOT 3
- Slippi Dolphin uses GTK on KDE Plasma (Qt Desktop) whilst Upstream uses Qt HOT 5
- When using multiple playback dolphins, every SlippiSpectateServer after the first fails to start HOT 1
- SlippiReplayComm cannot pick up comm file changes within the same epoch second
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from ishiiruka.