{"action":"created","issue":{"url":"https://api.github.com/repos/dolphin-emu/dolphin/issues/1995","labels_url":"https://api.github.com/repos/dolphin-emu/dolphin/issues/1995/labels{/name}","comments_url":"https://api.github.com/repos/dolphin-emu/dolphin/issues/1995/comments","events_url":"https://api.github.com/repos/dolphin-emu/dolphin/issues/1995/events","html_url":"https://github.com/dolphin-emu/dolphin/pull/1995","id":56150630,"number":1995,"title":"Added Enet and move traversal code from old netplay branch","user":{"login":"Ziek","id":8287045,"avatar_url":"https://avatars.githubusercontent.com/u/8287045?v=3","gravatar_id":"","url":"https://api.github.com/users/Ziek","html_url":"https://github.com/Ziek","followers_url":"https://api.github.com/users/Ziek/followers","following_url":"https://api.github.com/users/Ziek/following{/other_user}","gists_url":"https://api.github.com/users/Ziek/gists{/gist_id}","starred_url":"https://api.github.com/users/Ziek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Ziek/subscriptions","organizations_url":"https://api.github.com/users/Ziek/orgs","repos_url":"https://api.github.com/users/Ziek/repos","events_url":"https://api.github.com/users/Ziek/events{/privacy}","received_events_url":"https://api.github.com/users/Ziek/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":8,"created_at":"2015-02-01T03:45:51Z","updated_at":"2015-02-01T11:28:44Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/dolphin-emu/dolphin/pulls/1995","html_url":"https://github.com/dolphin-emu/dolphin/pull/1995","diff_url":"https://github.com/dolphin-emu/dolphin/pull/1995.diff","patch_url":"https://github.com/dolphin-emu/dolphin/pull/1995.patch"},"body":"Added Enet library, and replaced tcp calls in netplayserver and netplayclient over to enet\r\n\r\nGrabbed traversalproto.h and traversalclient.cpp/.h and moved it over with some change to fit current netplay.  Though I would like to start moving more over soon, so some of those changes may change back.\r\n\r\nMade some changes to NetPlay GUI so a person can switch between direct and traversal .\r\n\r\nmoved over the netplay copy code to be able to copy host code\r\n\r\nHost now sets everyone's g_netplay_gctime"},"comment":{"url":"https://api.github.com/repos/dolphin-emu/dolphin/issues/comments/72361075","html_url":"https://github.com/dolphin-emu/dolphin/pull/1995#issuecomment-72361075","issue_url":"https://api.github.com/repos/dolphin-emu/dolphin/issues/1995","id":72361075,"user":{"login":"BhaaLseN","id":826052,"avatar_url":"https://avatars.githubusercontent.com/u/826052?v=3","gravatar_id":"","url":"https://api.github.com/users/BhaaLseN","html_url":"https://github.com/BhaaLseN","followers_url":"https://api.github.com/users/BhaaLseN/followers","following_url":"https://api.github.com/users/BhaaLseN/following{/other_user}","gists_url":"https://api.github.com/users/BhaaLseN/gists{/gist_id}","starred_url":"https://api.github.com/users/BhaaLseN/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BhaaLseN/subscriptions","organizations_url":"https://api.github.com/users/BhaaLseN/orgs","repos_url":"https://api.github.com/users/BhaaLseN/repos","events_url":"https://api.github.com/users/BhaaLseN/events{/privacy}","received_events_url":"https://api.github.com/users/BhaaLseN/received_events","type":"User","site_admin":false},"created_at":"2015-02-01T11:28:44Z","updated_at":"2015-02-01T11:28:44Z","body":"Since its one big commit at the moment, you don't even need a rebase (at least not to split it up, tho; but to get it to the most recent master).\r\n\r\nI suggest you do the following:\r\n```git fetch origin``` (where ```origin``` is the name of the remote pointing to dolphin-emu/dolphin)\r\n```git rebase origin/master master``` (puts all commit from your local ```master``` on top of ```origin/master```. Again, replace ```origin``` with the correct remote name).\r\nAt this point, you still have one big commit.\r\n```git reset HEAD~1``` (basically undos the commit, but keeps all changes in your working copy. From, there just create new commits by using either ```git gui``` or ```git add -p```)\r\nWhen you're done, push it again (overwriting your current branch on github):\r\n```git push -f Ziek master``` (replace ```Ziek``` with the name of your own fork/remote)."}}