search

mupen64plus / mupen64plus-input-sdl

Input plugin for Mupen64Plus v2.0 project using SDL. This is derived from the original Mupen64 blight_input plugin.
GNU General Public License v2.0
43 stars 70 forks source link

DPad buttons were messed up #102

Closed wally4000 closed 2 years ago

wally4000 commented 3 years ago

Corrected and tested them now working great

Jj0YzL5nvJ commented 3 years ago

Your repository is out of sync with upstream:master and has conflicts. For reasons like this, branches are used for patches.

To fix this pull:

rm -rf mupen64plus-input-sdl
wget https://github.com/wally4000/mupen64plus-input-sdl/commit/a068680e138cc9ee28e0684e477887ddc57ef663.patch
git clone https://github.com/wally4000/mupen64plus-input-sdl.git
cd mupen64plus-input-sdl
git remote add upstream https://github.com/mupen64plus/mupen64plus-input-sdl.git
git fetch upstream
git fetch --tags upstream
git checkout master
git reset --hard d17cfdecd80223856ff1092b6cebc5245c5c12a3
git merge upstream/master
git am --committer-date-is-author-date ../a068680e138cc9ee28e0684e477887ddc57ef663.patch
git push --force origin master
wally4000 commented 3 years ago

No problems i'll sort this out soon