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

Implement mp3/ogg Background Music Player using SDL2-mixer #725

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9ab5223
Revert "Use local game art ( image, marquee and video ) from romfolde…
joolswills Feb 27, 2018
49ca22a
bump version to v2.7.5
joolswills Feb 27, 2018
0330cfb
set curl to follow redirects to fix scraper error
jrassa May 23, 2018
920db2b
bump version to v2.7.6
joolswills Jul 11, 2018
66853e5
Revert "Revert "Use local game art ( image, marquee and video ) from …
joolswills Feb 9, 2019
a384c20
Merge remote-tracking branch 'retropie/master' into stable
joolswills Feb 9, 2019
2af2ec5
bump version to v2.8.0
joolswills Feb 9, 2019
c296a7d
Merge remote-tracking branch 'retropie/master' into stable
joolswills Feb 12, 2019
10ed2f2
bump version to v2.8.1
joolswills Feb 12, 2019
c6fa3c7
Merge remote-tracking branch 'retropie/master' into stable
joolswills Mar 4, 2019
25ef0c8
bump version to v2.8.2
joolswills Mar 4, 2019
5a40734
Revert "InputManager: improve trigger axis calibration"
joolswills Apr 6, 2019
3a9297a
bump version to v2.8.3
joolswills Apr 6, 2019
b4fb8ff
Merge remote-tracking branch 'retropie/master' into stable
joolswills Jun 26, 2019
72b8644
bump version to v2.8.4
joolswills Jun 26, 2019
a252ea2
filterTrigger: filter negative trigger axis event after positive axis…
psyke83 Jul 26, 2019
e8216c7
Merge remote-tracking branch 'retropie/master' into stable
joolswills Dec 29, 2019
7e6c2bf
bump version to v2.9.0
joolswills Dec 29, 2019
9d97dd1
Merge remote-tracking branch 'retropie/master' into stable
joolswills Apr 11, 2020
49d440a
bump version to v2.9.1
joolswills Apr 11, 2020
7aff7ce
Merge remote-tracking branch 'retropie/master' into stable
joolswills Jun 9, 2020
e56be5e
bump version to v2.9.2
joolswills Jun 9, 2020
6e24dfe
Merge remote-tracking branch 'retropie/master' into stable
joolswills Jun 11, 2020
982f6cc
bump version to v2.9.3
joolswills Jun 11, 2020
534883e
Merge remote-tracking branch 'retropie/master' into stable
joolswills Nov 1, 2020
be9e0f3
bump version to v2.9.4
joolswills Nov 1, 2020
91760a0
Merge remote-tracking branch 'retropie/master' into stable
joolswills Nov 3, 2020
2d6e425
bump version to v2.9.5
joolswills Nov 3, 2020
eae5f0f
Merge remote-tracking branch 'retropie/master' into stable
joolswills Nov 4, 2020
be5dcaf
bump version to v2.9.6
joolswills Nov 4, 2020
723935d
Merge remote-tracking branch 'retropie/master' into stable
joolswills Nov 13, 2020
d9be033
Merge remote-tracking branch 'retropie/master' into stable
joolswills Oct 31, 2021
c805670
bump version to v2.10.0
joolswills Oct 31, 2021
1d05ae4
Revert default ThreadedLoading option
pjft Dec 26, 2021
c9d905c
bump version to v2.10.1
joolswills Dec 26, 2021
677f63c
Merge remote-tracking branch 'retropie/master' into stable
joolswills Mar 7, 2022
2dd5e6b
bump version to v2.10.2
joolswills Mar 7, 2022
0091d04
Background Music Player
bluestang2006 Mar 8, 2022
ff6117f
Improved volume slider
bluestang2006 Feb 7, 2021
adcfcb9
Add music volume slider
bluestang2006 Mar 7, 2021
70a120a
Credits
bluestang2006 Mar 26, 2022
d67431f
Revert mixerName, mixerCard
bluestang2006 Mar 26, 2022
e5b5abd
Revert Settings.cpp, Settings.h
bluestang2006 Mar 26, 2022
6f6e9e9
Fix GuiMenu.cpp
bluestang2006 Mar 26, 2022
f19383e
Set default folders where music files can be stored
bluestang2006 Mar 26, 2022
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'retropie/master' into stable
  • Loading branch information
joolswills committed Nov 3, 2020
commit 91760a08dfd630730e950d75b27c572cfce3154d

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.