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

Update several support files #27

Closed
wants to merge 2 commits into from
Closed

Update several support files #27

wants to merge 2 commits into from

Conversation

Fanatic-64
Copy link
Contributor

Update several non-source files, including:
-Documentation
-A newer CHT
-Jabo 1.6.1 plugins (instead of 1.6)
-N-Rage 1.83 (instead of 1.82a)

Update several non-source files, including:
-Documentation
-A newer CHT
-Jabo 1.6.1 plugins (instead of 1.6)
-N-Rage 1.83 (instead of 1.82a)
@Fanatic-64 Fanatic-64 changed the title Update several support files Update several files & fix AiCountPerByte Jan 25, 2015
@Fanatic-64
Copy link
Contributor Author

Don't know how to make both commits into separate pull requests...

@death-droid
Copy link
Contributor

Have to keep changes separated into individual branches.

@Fanatic-64
Copy link
Contributor Author

Will do... next time. Don't know how to roll back commits either.

@blikblum
Copy link

Create a branch from a previous commit http://stackoverflow.com/questions/2816715/branch-from-a-previous-commit-using-git
Cherrypick the commit into this branch https://ariejan.net/2010/06/10/cherry-picking-specific-commits-from-another-branch/
Create a new pull request from the branch

@project64
Copy link
Owner

where is the source of the binary files from? I pushed a change for the 400 ai

@Fanatic-64 Fanatic-64 changed the title Update several files & fix AiCountPerByte Update several support files Jan 26, 2015
@Fanatic-64
Copy link
Contributor Author

You mean where I got them from? Well, here's were I got all the files from:
-PJ64gameFAQ.chm, RDB - WhatsNew.txt: Obtained from here: http://www.pj64-emu.com/downloads/func-startdown/109/
-Project64.cht: Obtained from this commit: https://github.com/project64/project64/tree/e815584b593d2b2c715a89b8a7d4321c8c1106ce
-NRage_DInput8_V2.dll, N-Rage - Readme.txt: Obtained from here: http://members.chello.at/n-rage/dinput8/index.html Source code is available there.
-Jabo_Direct3D8.dll, Jabo_Dsound.dll, Jabo_DInput.dll: Obtained from here: http://www.jabosoft.com/articles/114

@Fanatic-64
Copy link
Contributor Author

Is this going to be merged? I need to delete and recreate my fork since I messed a bit with GitHub.

@LegendOfDragoon
Copy link
Contributor

Why delete?

@Fanatic-64
Copy link
Contributor Author

"and recreate my fork since I messed a bit with GitHub"

@LegendOfDragoon
Copy link
Contributor

You're likely able to fix it without having to delete ;/ . You can edit commit history. To make your fork up to date, just use type the following, into git shell
cd project64
git pull https://github.com/project64/project64.git in the git cmd.

I think you'll have to wait until this pull request is accepted, since I believe git pull overwrites your files.

@cxd4
Copy link
Contributor

cxd4 commented Feb 3, 2015

That would pull the current state of project64/project64.git to his local hard disk yes, but it wouldn't revert the commits already uploaded to Fanatic-64/project64.git to his online account.

I've deleted and re-forked Project64 repository 3 times already and guess I didn't see any negative effects from it. I had to delete and re-fork whenever a pull request I sent wasn't merged, and force-overwriting master branch when pushing failed 90% of the time due to my crappy network Wi-Fi.

To be on the topic of the pull request, I can't make anything of this hardly since Git isn't really for hosting binary files either. It's better to work with text commits. The binary files / support plugins, DLLs, CHMs should probably just be given in the package downloads for public users.

@project64 project64 mentioned this pull request Feb 4, 2015
@project64
Copy link
Owner

ok I think that has everything from this pull request now has bee updated or removed from the release.

Any issues with me closing it?

@Fanatic-64
Copy link
Contributor Author

Could we include the newer RDB - WhatsNew.txt file? Or remove it from the repo?

@project64
Copy link
Owner

there has been a lot of updates to the rdb lately .. what in particular do you want in there ?

yes some of these files can probably removed from the current branch.

@oddMLan
Copy link
Contributor

oddMLan commented Feb 23, 2015

Where is the newer .cht file from? Is that update going to be included in master repo?

@project64
Copy link
Owner

as Fanatic-64 comment, I got it from https://github.com/project64/project64/tree/e815584b593d2b2c715a89b8a7d4321c8c1106ce it is now in the config dir

@death-droid
Copy link
Contributor

Can be closed now?

@project64
Copy link
Owner

I suspect we can, I removed the old files that will not be in 2.2, the change to the settings config is in as well as I think all files that were updated.

@project64 project64 closed this Mar 2, 2015
project64 pushed a commit that referenced this pull request Jan 20, 2016
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 this pull request may close these issues.

None yet

7 participants