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

Revert "Dolphin Pro" April Fools joke that never should've been merged #2258

Merged
merged 1 commit into from Apr 1, 2015

Conversation

JosJuice
Copy link
Member

@JosJuice JosJuice commented Apr 1, 2015

People are going to download Dolphin today, and then they're going to be stuck with this crap for maybe months, because not everyone updates all the time. Dolphin won't tell you to update to resolve the issue, it'll demand that the user needs to pay. It will be hard for users to know that this is an April Fools joke. It might not be triggered until weeks later, depending on how much they use Dolphin.

@Stevoisiak
Copy link
Contributor

Agreed 100%. Without a date check on the "Dolphin Pro" joke, it's just going to linger around. This should get reverted asap

@JosJuice JosJuice changed the title Revert April Fools joke that never should've been merged Revert "Dolphin Pro" April Fools joke that never should've been merged Apr 1, 2015
@Sonicadvance1
Copy link
Contributor

Breaks all the buildbots, doesn't LGTM

@Stevoisiak
Copy link
Contributor

There's a limit to every joke. Activating a silly pop up to recharge batteries on April 1st? That's funny. Having the joke last past that date and actually seriously obstructing usability? That's taking it too far.

@JosJuice JosJuice force-pushed the revert-2256-Dolphin-Pro branch 2 times, most recently from 811b8eb to b8b9ac7 Compare April 1, 2015 19:31
@degasus
Copy link
Member

degasus commented Apr 1, 2015

I see, we should disable this in some days, but I don't see why we should revert it completely. imo an emulated battery is cool :D

@Stevoisiak
Copy link
Contributor

@degasus Oh, definately. It's a cool feature, but we really need to get this dolphin pro stuff reverted ASAP

@Sonicadvance1
Copy link
Contributor

If we revert this how will we get more people to buy Dolphin Pro?

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

The battery emulation is a bit neat, but it needs to be properly reviewed before merging. That's why I'm reverting everything.

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

Why the hell is this still failing on the buildbot? I tried reverting it in two different ways, and then I also tried manually undoing all the changes.

@nyanpasu64
Copy link
Contributor

not sure, maybe hard revert to origin/master? not good with git.

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

Although I must say that your posts were pretty shitty, it was a bit unnecessary to delete them.

(EDIT: for future reference, delroth posted a bunch of stuff, then neobrain deleted it. delroth's comment saying that they shouldn't have been deleted was also deleted afterwards. I heard from others that delroth then at some point got rid of neobrain's rights in this repo.)

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

@jimbo1qaz Oh, git is working fine. It's just the buildbot. The only reason I can think of anymore is that delroth intentionally made it stop working or something.

@nyanpasu64
Copy link
Contributor

appears to be build conflicts or something
maybe I'll try making a revert PR myself?

@delroth
Copy link
Member

delroth commented Apr 1, 2015

Can't get a revert working, it must be delroth's fault.

lol

@Sonicadvance1
Copy link
Contributor

All that Dolphin Pro money~

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

@delroth Okay, sorry. I get kinda stressed out when something like this happens. As degasus says here, there's a problem: #2256 (comment)

@delroth
Copy link
Member

delroth commented Apr 1, 2015

@JosJuice maybe if you stopped being so stressed out you could join those of us that instead laugh at @Stevoisiak and you right now for being so stressed out. It's been so much fun so far!

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

I'm stressing out because this isn't a fucking joke. We will ruin the experiences of several users by doing this. This needs to be reverted ASAP.

@delroth
Copy link
Member

delroth commented Apr 1, 2015

Oh god, all those users that will spend 10 minutes posting on our forums about that in a month, causing everyone else to remember the joke and have fun. WE CAN'T HAVE FUN. STOP EVERYTHING. REVERT.

@JMC47
Copy link
Contributor

JMC47 commented Apr 1, 2015

I don't think it's that big of a deal. Worst comes to worst we can post a blog post about the April Fools build and whatnot as long as nothing else gets merged before it gets reverted. I'm pretty sure we can remove builds from the page anyway if we absolute needed to, or mark it as an April Fools build tomorrow.

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

Only a minority of Dolphin users use the forums. And, I repeat, users will think something is very wrong if Dolphin tells people to pay.

@waddlesplash
Copy link
Contributor

Only a minority of Dolphin users use the forums. And, I repeat, users will think something is very wrong if Dolphin tells people to pay.

Agreed, this is taking it too far. Saying "... please pay ... April fool!" is one thing, but not having that is another.

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

For the reference, the current commit reverts everything except the part that supposedly contains the TM character. It fails on lint but succeeds on everything else.

@comex
Copy link
Contributor

comex commented Apr 1, 2015

It seems to me that some users will not realize that the remote not working has anything to do with "battery" (especially since the control is disabled, which in a non-joke world means "not relevant"), and will thus never hover over the battery option and see the Dolphin Pro message. Actually, I suspect a fair number of users wouldn't see the message even if they were actively trying to change the battery - it is not normal to hide vital information in tooltips on random widgets.

They will probably be okay, because the first troubleshooting step for someone on an old dev build would be to upgrade. But it will cause some confusion, and it's pretty obnoxious to effectively April Fool people on a random day of the year.

There are much better ways this joke could have been implemented. I would merge this PR immediately if I weren't dissociated from the tree at present.

@delroth
Copy link
Member

delroth commented Apr 1, 2015

Maybe we should extend that feature as a killswitch for dev builds that have been used for > 20h of gameplay! @comex always has great ideas.

@comex
Copy link
Contributor

comex commented Apr 1, 2015

Don't make me write a PR to integrate Omaha.

At least, not until I'm less tired!

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

@comex You're right. Thanks for posting that - I had mostly just read the messages in the code instead of thinking about how it would look in the UI.

@JosJuice
Copy link
Member Author

JosJuice commented Apr 1, 2015

TM fixed by degasus in PR #2261, PR rebased and remade as a full revert. This is ready to merge.

@delroth
Copy link
Member

delroth commented Apr 1, 2015

Can we get an update from our chief financial officer about the expected reduction in income due to the merge of this pull request? I'd like a report explaining exactly how we're planning to overcome the loss. I can see several options, like adding a toolbar in our installer.

@shuffle2
Copy link
Contributor

shuffle2 commented Apr 1, 2015

@delroth that seems like a good start. But what else can we do to repair revenue? Perhaps we should consider a system to transparently protect a user's local game images, and only allow the user to load them once dolphin has authenticated to our servers and retrieved a time-limited token. #DolphinCloudDRM This will protect the user and ensure they have a better experience.

@delroth
Copy link
Member

delroth commented Apr 1, 2015

@shuffle2 I like the fact that it's in the cloud. It must be scalable. Can we somehow add some big data aspects to the project in order to leverage some synergies?

@Alcaro
Copy link
Member

Alcaro commented Apr 1, 2015

The obvious solution would be a Bitcoin miner. Dolphin is already a resource-heavy program, I doubt another bit would make any difference.

@delroth
Copy link
Member

delroth commented Apr 1, 2015

@Alcaro cancel @degasus' PR removing spinlocks in CPU/GPU sync. Instead, replace the spinlocks with bitcoinspinlocks™ that compute SHA256s until they can grab a mutex.

@shuffle2
Copy link
Contributor

shuffle2 commented Apr 1, 2015

@Alcaro User machines are too low performance for bitcoin these days, but this is generally a good idea. How about allowing the user's PC to automatically click advertisements on dolphin websites? It can happen in the background and is an easy way for users to show their support of the project.

@delroth
Copy link
Member

delroth commented Apr 1, 2015

I remember NVidia GPUs had issues with setting a low power mode when running Dolphin. If we were mining some BTCs on GPU, this wouldn't be happening!

@Ofunniku
Copy link

Ofunniku commented Apr 1, 2015

@delroth yes, the idle time from that is quite significant, but I think you'll get a larger hashrate with a gpuminer
@shuffle2 the GPU is the most idle thing in most systems running dolphin, you could have a low-updating gpuminer use up about half of that and not slow down the emulation at all

@nyanpasu64
Copy link
Contributor

Baaaaad idea.

On Wed, Apr 1, 2015 at 2:25 PM, Ofunniku notifications@github.com wrote:

@delroth https://github.com/delroth yes, the idle time from that is
quite significant, but I think you'll get a larger hashrate with a gpuminer
@shuffle2 https://github.com/shuffle2 the GPU is the most idle thing in
most systems running dolphin, you could have a low-updating gpuminer use up
about half of that and not slow down the emulation at all


Reply to this email directly or view it on GitHub
#2258 (comment).

delroth added a commit that referenced this pull request Apr 1, 2015
Revert "Dolphin Pro" April Fools joke that never should've been merged
@delroth delroth merged commit 1aec542 into dolphin-emu:master Apr 1, 2015
@delroth
Copy link
Member

delroth commented Apr 1, 2015

Oops, misclick, please ignore.

@JosJuice JosJuice deleted the revert-2256-Dolphin-Pro branch April 2, 2015 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet