Skip to content

Rebasing Upstream: Friendship Is Magic #65

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.

Sign up for GitHub

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

Open
jason-oliveira wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Rebasing Upstream: Friendship Is Magic #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
468887a
Check for zero rumble setting before allowing rumble
theofficialgman Aug 29, 2020
b897f30
Merge pull request #411 from theofficialgman/master
fgsfdsfgs Aug 30, 2020
420d82c
fix spaces
fgsfdsfgs Aug 30, 2020
d88bd76
Update README_es_ES.md
sodomon2 Sep 9, 2020
a7ea882
Merge pull request #420 from sodomon2/master
fgsfdsfgs Sep 9, 2020
9ee16a3
Bugfix: Discord Integration crashes
s4Ys369 Oct 3, 2020
9d0c4dd
Merge pull request #434 from s4Ys369/patch-1
fgsfdsfgs Oct 3, 2020
e6d2e7a
Revert "Bugfix: Discord Integration crashes"
s4Ys369 Oct 9, 2020
57c2034
Merge pull request #438 from s4Ys369/revert-434-patch-1
fgsfdsfgs Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions README_es_ES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,11 @@ sudo xbps-install -S base-devel python3 audiofile-devel SDL2-devel glew-devel
sudo xbps-install -S base-devel python3 audiofile-devel-32bit SDL2-devel-32bit glew-devel-32bit
```

##### Alpine Linux - (compilando para 32 bits y 64 bits)
```
sudo apk add build-base python3 audiofile-dev sdl2-dev glew-dev
```

#### Compila el ejecutable.

Ejecuta `make` para compilar (por defecto `VERSION=us`)
Expand Down
6 changes: 4 additions & 2 deletions src/pc/controller/controller_entry_point.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,14 @@ s32 osContInit(UNUSED OSMesgQueue *mq, u8 *controllerBits, UNUSED OSContStatus *
s32 osMotorStart(UNUSED void *pfs) {
// Since rumble stops by osMotorStop, its duration is not nessecary.
// Set it to 5 seconds and hope osMotorStop() is called in time.
controller_rumble_play(configRumbleStrength / 100.0f, 5.0f);
if (configRumbleStrength)
controller_rumble_play(configRumbleStrength / 100.0f, 5.0f);
return 0;
}

s32 osMotorStop(UNUSED void *pfs) {
controller_rumble_stop();
if (configRumbleStrength)
controller_rumble_stop();
return 0;
}

Expand Down