search

electric-monk / 360Controller

XBox 360 controller driver for OSX official repo
http://tattiebogle.net/index.php/ProjectRoot/Xbox360Controller/OsxDriver
GNU General Public License v2.0
155 stars 54 forks source link

Accepting contributions, fixes, features, from the other repository #6

Open RodrigoCard opened 9 years ago

RodrigoCard commented 9 years ago

Tattiebogle, we missed you! We tried many times to contact you... (does that Mice contact form works?)

So, here is what we are talking about: https://github.com/d235j/360Controller/

About 2 or 3 years ago when @electric-monk stopped working publicly on his driver, @d235j stepped in and started a repository with your last available sources, made many fixes force feedback and other stuff. When Yosemite started demanding Kext sign, I asked apple the entitlements to sign kext for the purpose of signing this driver, and they provided it to me, so then I started contributing too. (If you need a valid kext sign certificate to make future releases, I can do that)

So, as the time passed, many amazing collaborators added features and fixed things (and broke other stuff of course! haha). Like A revamped UI for preference pane, Original Xbox Controller support, Xbox One Controller Support, a button remapper, a uninstaller, More deadzone options, Many third party controller support, etc. It is a big list!

I suggest you to download the latest beta, read the diffs and see for yourserf: https://github.com/d235j/360Controller/releases

That said, we humbly want to ask if you accept all our work as a pull, or maybe contributing or anything else. Since you are the original author, you deserve to command all this. :)

slawo commented 9 years ago

+1 to that. I believe supreme leader @electric-monk could have a look at the changes and oversee the merge with his repo if he wants that.

electric-monk commented 9 years ago

Hey all, this definitely sounds like something I'd like to do, I just need to get around to it ;) The form on the website does work, it's just that I've been so busy, mostly with work but also other projects, that I kept putting it off...at least once I replied to an e-mail not realising it'd been a year since the last message. Anyway, let me see ;)

d235j commented 9 years ago

@electric-monk: If you'd like, I can rebase our work on top of your tree. That said, there have been lots of changes, and right now our bugtracker is quite populated, so maybe it would be better to migrate everything to an GitHub organization?

MaddTheSane commented 9 years ago

@jaraco has done a merge of the forks, and I created a pull request here: #7. Although it isn't up-to-date with @d235j's fork: it only goes up to d235j/360Controller@70ae031b8a9b6442129f6ea7d387e0add67c8cd6.

electric-monk commented 9 years ago

Hey all, sorry for the delay. Busy at work/with DIY/working out having been knocked down by a car while cycling home so i didn't get time to reply sooner, but I'm not super familiar with github - what's the benefits of an organisation over pull requests?

jaraco commented 9 years ago

@electric-monk An organization means the project can be managed by a larger community, so if you're indisposed (hit by a car; sorry), others can push the project forward, or if you're hit by a bus (let's hope not), others can continue the effort. I think implicit in the suggestion is that some contributors be granted write/admin privileges on the project once migrated to the organization.

RodrigoCard commented 9 years ago

Hey @electric-monk are you recovering well from the accident? we haven't heard more news about you! Cheers!

electric-monk commented 9 years ago

Sorry! Yeah, I feel mostly normal now, though waiting to order a new bike! Apologies for not replying, work and life (I'm also redoing my kitchen, not to mention playing with hobby OS development) got in the way a little. An organisation sounds good, what do I do to create one? It looks like I'd make a new account and switch it into "organisation" mode?

d235j commented 9 years ago

I've just created an organization and transferred the repository. @electric-monk, @MaddTheSane, and @RodrigoCard, can you accept the organization invitations? I will assign permissions as soon as you do :)

d235j commented 9 years ago

At this point I think it's best for @electric-monk to transfer the old repo to a "historic" branch; there have been too many chances to the forked repo that attempting a merge, while easy enough, will break everyone's local branches, so rebasing master is probably not a good idea.

d235j commented 9 years ago

@electric-monk: does everything look OK with you?

RodrigoCard commented 9 years ago

Great! Accepted it right now. I think @FranticRain should be added to the organization too if he is okay with that, he made various valuable contributions.

Drewbadour commented 9 years ago

I'd appreciate that, thanks.

electric-monk commented 9 years ago

@d235j: I think it looks okay. Not sure what the best way to send this repo over there as a historical branch is though.