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

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

Closed
Heoz opened this issue Aug 13, 2014 · 24 comments
Closed

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

Heoz opened this issue Aug 13, 2014 · 24 comments

Comments

@Heoz
Copy link

Heoz commented Aug 13, 2014

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

@hrydgard
Copy link
Owner

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

@sum2012
Copy link
Collaborator

sum2012 commented Aug 13, 2014

@sum2012
Copy link
Collaborator

sum2012 commented Aug 13, 2014

I originally want to post it after v0.9.9.1

@Heoz
Copy link
Author

Heoz commented Aug 13, 2014

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 thedax changed the title Versions Feature Request: Please merge @ANR2ME's adhoc branch Aug 16, 2014
@thedax
Copy link
Collaborator

thedax commented Aug 16, 2014

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
Copy link
Owner

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

@unknownbrackets
Copy link
Collaborator

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
Copy link
Collaborator

thedax commented Aug 16, 2014

@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
Copy link
Collaborator

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
Copy link
Collaborator

thedax commented Aug 16, 2014

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

@sum2012
Copy link
Collaborator

sum2012 commented Aug 16, 2014

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

@LunaMoo
Copy link
Collaborator

LunaMoo commented Aug 16, 2014

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
Copy link
Collaborator

sum2012 commented Aug 16, 2014

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

@LunaMoo
Copy link
Collaborator

LunaMoo commented Aug 16, 2014

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

@Heoz
Copy link
Author

Heoz commented Aug 19, 2014

So it will be merged or what xD

@hrydgard
Copy link
Owner

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

@sum2012
Copy link
Collaborator

sum2012 commented Aug 19, 2014

I just come back to home.Wait 5 minute

@sum2012
Copy link
Collaborator

sum2012 commented Aug 19, 2014

How to solve the confict ?
1
2

@sum2012
Copy link
Collaborator

sum2012 commented Aug 19, 2014

I try to use back old version of that file

@hrydgard
Copy link
Owner

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

@anr2me
Copy link
Collaborator

anr2me commented Aug 21, 2014

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
Copy link

S-Pawar commented Oct 5, 2014

Why isnt in built adhoc server added yet to ppsspp?

@hrydgard
Copy link
Owner

hrydgard commented Oct 5, 2014

Because the code has issues that need fixing.

@sum2012
Copy link
Collaborator

sum2012 commented Jan 4, 2015

Can close this issue now (Merged the code)

@hrydgard hrydgard closed this as completed Jan 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

8 participants