search

hrydgard / ppsspp

A PSP emulator for Android, Windows, Mac and Linux, written in C++. Want to contribute? Join us on Discord at https://discord.gg/5NJB6dD or just send pull requests / issues. For discussion use the forums at forums.ppsspp.org.
https://www.ppsspp.org
Other
11.21k stars 2.17k forks source link

Feature Request: Please merge @ANR2ME's adhoc branch #6717

Closed Heoz closed 9 years ago

Heoz commented 10 years ago

Will AdamN adhoc build be merged with this builds since adhoc is not working without AdamN builds :O

hrydgard commented 10 years ago

I have no idea what "AdamN" builds are. Please post a link.

sum2012 commented 10 years ago

His source is in https://github.com/ANR2ME/ppsspp/commits/master I have made a cleanner branch https://github.com/sum2012/ppsspp/commits/adhoc-by-ANR2ME(adamN)

sum2012 commented 10 years ago

I originally want to post it after v0.9.9.1

Heoz commented 10 years ago

http://forums.ppsspp.org/showthread.php?tid=9037&page=35 see he gives a link and then just copy into ppsspp folder and adhoc works :O But the latest build is 0.9.9-45

thedax commented 10 years ago

since adhoc is not working without AdamN builds

Adhoc works fine with a few games without his stuff. However, if the code gets cleaned up nicely (so the good stuff is left), there's probably no reason to refuse it.

hrydgard commented 10 years ago

Sorry for the delays. I hope to push out 0.9.9.1 tomorrow then I will merge it.

unknownbrackets commented 10 years ago

I'm not sure about "Core/HLE/database.db" and stuff. We may want to look at it before merging it.

There's also changes to sceKernelThread.cpp that are look wrong and seem to not really deal with savestates properly.

-[Unknown]

thedax commented 10 years ago

@unknownbrackets: To me, it looks like Adam N was trying to port parts of the server into PPSSPP (hence the including of the database). As for how far he got, I don't really know; I just looked at the commit where database.db was added.

unknownbrackets commented 10 years ago

Even if that's the case, putting it in the source tree is wrong, it would have to end up in assets/ or something if so.

-[Unknown]

thedax commented 10 years ago

Right, I don't object to that. I was just hoping to lend a bit of insight.

sum2012 commented 10 years ago

After v0.9.9.1 release,I will redo the branch, in the same time,I will move the database

LunaMoo commented 10 years ago

Is that database file even needed for server? I was under impression that it was only used for that site which shows who's playing what game on Coldbird's server.

sum2012 commented 10 years ago

@LunaMoo No need,it only for copy and paste to the source code

LunaMoo commented 10 years ago

Ah I see now, and tested as well it has entries for those games which have cross region play etc.

Heoz commented 10 years ago

So it will be merged or what xD

hrydgard commented 10 years ago

Where did the pull request go? @sum2012 , were you going to redo it?

sum2012 commented 10 years ago

I just come back to home.Wait 5 minute

sum2012 commented 10 years ago

How to solve the confict ? 1 2

sum2012 commented 10 years ago

I try to use back old version of that file

hrydgard commented 10 years ago

For resolving that conflict, just manually open the file in a text editor and fix it up. make sure the tags pair up.

anr2me commented 10 years ago

Btw, i think it might be better for the built-in adhoc server to have it's own enable/disable setting like WLAN

S-Pawar commented 10 years ago

Why isnt in built adhoc server added yet to ppsspp?

hrydgard commented 10 years ago

Because the code has issues that need fixing.

sum2012 commented 9 years ago

Can close this issue now (Merged the code)