Dean Herbert
|
d9debef156
|
Add explicit LoadTrack method
|
2020-08-17 15:38:16 +09:00 |
|
smoogipoo
|
688e447950
|
Fix potential hierarchy mutation from async context
|
2020-08-12 01:33:06 +09:00 |
|
smoogipoo
|
b64142dff9
|
Fix incorrect load state being used
|
2020-08-11 12:37:00 +09:00 |
|
smoogipoo
|
87ce1e3558
|
Remove impossible null case (DummyWorkingBeatmap)
|
2020-08-08 00:58:04 +09:00 |
|
smoogipoo
|
b8373e89b7
|
Move beatmap bind to BDL load()
|
2020-08-07 23:08:09 +09:00 |
|
smoogipoo
|
e87f50f74f
|
Rename method
|
2020-08-07 22:31:41 +09:00 |
|
smoogipoo
|
b6fb7a0d39
|
Fix possibly setting null track
|
2020-08-07 22:05:58 +09:00 |
|
smoogipoo
|
5002d69f69
|
Update inspections
|
2020-08-07 20:51:56 +09:00 |
|
smoogipoo
|
61b632516e
|
Ensure CurrentTrack is never null
|
2020-08-07 19:43:16 +09:00 |
|
smoogipoo
|
fe8c462498
|
Remove intermediate container
|
2020-08-06 17:00:17 +09:00 |
|
smoogipoo
|
0edd509397
|
Only change track when audio doesn't equal
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
e9fc783b1d
|
Add back loop-on-completion
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
5c05fe3988
|
Expose track from MusicController
|
2020-08-06 16:24:14 +09:00 |
|
smoogipoo
|
6e42b8219c
|
Move track to MusicController, compiles
|
2020-08-06 16:24:14 +09:00 |
|
Dean Herbert
|
e8f75a78e8
|
Also fix second instance of same execution
|
2020-07-31 22:02:12 +09:00 |
|
Dean Herbert
|
4d2a677080
|
Fix next track starting before previous one is paused
Closes #9651.
|
2020-07-31 20:33:18 +09:00 |
|
Dean Herbert
|
7b7b92aa10
|
Fix potential crash when trying to ensure music is playing
|
2020-07-13 17:28:16 +09:00 |
|
Dean Herbert
|
1760cc2427
|
Fix behavioural regression by splitting methods out
|
2020-07-10 18:03:56 +09:00 |
|
Dean Herbert
|
49b88971d1
|
Display all usable beatmaps in playlist, including protected
|
2020-07-10 17:20:27 +09:00 |
|
Dean Herbert
|
f989f1aa00
|
Change event flow to avoid firing store delete events on update
|
2020-05-27 16:08:47 +09:00 |
|
Dean Herbert
|
052ad79fc6
|
Convert dangerous events to IBindables
|
2020-05-19 16:44:22 +09:00 |
|
alex
|
0e2ccac33b
|
Add spaces to comments
|
2020-05-04 18:36:24 -07:00 |
|
Dean Herbert
|
119000f1ab
|
Reduce database includes where possible
|
2020-04-28 21:43:35 +09:00 |
|
Dean Herbert
|
62be138aa9
|
Avoid calls on MusicController executing before it may have finished loading
|
2020-04-28 11:46:08 +09:00 |
|
smoogipoo
|
5ca93758dc
|
Fix music playlist being enumerated asynchronously
|
2020-02-17 16:59:35 +09:00 |
|
Berkan Diler
|
9596030e1d
|
Make use of ElementAtOrDefault() when possible
|
2020-01-31 18:32:47 +01:00 |
|
smoogipoo
|
7b2f58eb30
|
Apply OnRelease method signature refactorings
|
2020-01-22 13:22:34 +09:00 |
|
smoogipoo
|
91735ff367
|
Update MathUtils namespace usages
|
2020-01-09 13:43:44 +09:00 |
|
Bartłomiej Dach
|
e0cfc2f405
|
Merge branch 'master' into prev-button-revamp
|
2020-01-07 21:49:53 +01:00 |
|
Dean Herbert
|
eb074b7058
|
Allow mods to apply to track, not clock
|
2019-12-09 17:44:45 +09:00 |
|
Dean Herbert
|
5da5abdb05
|
Merge branch 'master' into prev-button-revamp
|
2019-11-22 02:57:22 +09:00 |
|
Dean Herbert
|
813aebca1d
|
Remove unintentional dependency
|
2019-11-15 14:51:01 +09:00 |
|
Dean Herbert
|
6d06b444ba
|
Allow screen to specify whether to apply audio rate adjustments from mods
|
2019-11-15 13:47:14 +09:00 |
|
Dean Herbert
|
967551fec0
|
Renames and xmldoc
|
2019-10-24 13:10:17 +09:00 |
|
Ganendra Afrasya
|
d22e12d104
|
Update doc
|
2019-10-24 10:28:23 +07:00 |
|
Ganendra Afrasya
|
c6d4fc8b24
|
Apply review
|
2019-10-24 08:00:45 +07:00 |
|
Ganendra Afrasya
|
224a887773
|
Merge remote-tracking branch 'origin/master' into prev-button-revamp
|
2019-10-24 07:44:18 +07:00 |
|
Ganendra Afrasya
|
326abc1a55
|
Apply reviews
|
2019-10-16 20:11:25 +07:00 |
|
Ganendra Afrasya
|
3008ade8a2
|
Using enum to determine the action
|
2019-10-11 16:41:54 +07:00 |
|
Ganendra Afrasya
|
d7fc904381
|
Make prev button can do restart track
|
2019-10-11 00:12:36 +07:00 |
|
Dean Herbert
|
5eba33e876
|
Simplify logic and add test coverage for remaining case
|
2019-10-10 20:12:47 +09:00 |
|
Dean Herbert
|
e66f9adb86
|
Fix user pause not being cancelled when playing audio
|
2019-10-10 16:53:03 +09:00 |
|
smoogipoo
|
662a1a9c2c
|
Use current
|
2019-10-03 18:55:53 +09:00 |
|
smoogipoo
|
bcf0b2752e
|
Fix possible MusicController nullref
|
2019-10-03 18:48:44 +09:00 |
|
Dean Herbert
|
740efa5747
|
Handle potential null case
|
2019-09-29 12:19:42 +08:00 |
|
iiSaLMaN
|
fb9f21237e
|
Reset track adjustments on resuming from another screen
|
2019-09-28 04:18:16 +03:00 |
|
Dean Herbert
|
7e791f7cd7
|
Expose as IBindableList
|
2019-09-18 13:14:33 +09:00 |
|
Dean Herbert
|
3ab352ffe5
|
Randomise beatmap playback order on startup
Closes #6135.
|
2019-09-17 23:15:03 +09:00 |
|
Dean Herbert
|
1f00793891
|
Unpause music when changing selection at song select
|
2019-08-19 11:30:04 +09:00 |
|
smoogipoo
|
3a79a4149a
|
Disable music controls when beatmap is disabled
|
2019-08-14 15:19:21 +09:00 |
|
Dean Herbert
|
81f8b5f325
|
Fix merge issue
|
2019-08-13 14:52:51 +09:00 |
|
Dean Herbert
|
5898198da6
|
Merge branch 'split-out-music-controller' into music-controller-hotkeys
|
2019-08-13 14:48:14 +09:00 |
|
Dean Herbert
|
2cbdf8c01c
|
Update public methods in line with future usage
|
2019-08-13 14:46:57 +09:00 |
|
Dean Herbert
|
de1ab56a2c
|
Fix potential nullref on disposal
|
2019-08-13 14:45:27 +09:00 |
|
Dean Herbert
|
9aac5efa4e
|
Move logic out of OsuGame
|
2019-08-13 14:42:59 +09:00 |
|
Dean Herbert
|
ad24265730
|
Split visual component out of MusicController
|
2019-08-13 14:30:18 +09:00 |
|
Dean Herbert
|
b225b2eb39
|
Rename to IsUserPaused
|
2019-07-11 00:18:19 +09:00 |
|
Desconocidosmh
|
2546f647be
|
Completely change the way we fix the bug
|
2019-07-09 11:32:49 +02:00 |
|
Desconocidosmh
|
39f04e497d
|
Add UserRequestedPause
|
2019-07-08 11:24:06 +02:00 |
|
Dean Herbert
|
c34f6180e6
|
Merge branch 'master' into generic-download-model-manager
|
2019-06-26 20:37:56 +09:00 |
|
Dean Herbert
|
2707a7179e
|
Fix MusiController holding references to beatmaps while inactive
|
2019-06-26 13:18:03 +09:00 |
|
Dean Herbert
|
9e1cb90dd8
|
Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
|
2019-06-26 11:40:41 +09:00 |
|
Dean Herbert
|
f2200594c9
|
Remove necessity for MusicController to be always visible
|
2019-06-20 23:40:25 +09:00 |
|
Dean Herbert
|
15b9b53d35
|
Fix IconButtons not being scaled correctly
|
2019-06-14 13:40:32 +09:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
Dean Herbert
|
a20eda7b5f
|
Fix remaining cases to work without things
|
2019-05-28 23:54:42 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
4310f07a5c
|
Rename SelectedMods -> Mods
|
2019-04-10 12:03:57 +09:00 |
|
smoogipoo
|
ad124bfeec
|
Reimplement select mod track adjustments
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
95bf0b9ed6
|
Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset
|
2019-03-29 13:57:02 +09:00 |
|
Joehu
|
bdb39a79a9
|
Fix offset of music controller when toolbar is hidden
|
2019-03-27 20:27:26 -07:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +09:00 |
|
smoogipoo
|
1006c539be
|
Fix looping not being checked
|
2019-02-27 17:03:09 +09:00 |
|
smoogipoo
|
30815ace62
|
Fix crossthread operations due to Track.Completed
|
2019-02-27 16:52:34 +09:00 |
|
Dean Herbert
|
56697339b3
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-02-27 11:14:42 +09:00 |
|
Dean Herbert
|
2fbb0b4e6f
|
Don't use this
|
2019-02-25 19:34:03 +09:00 |
|
Dean Herbert
|
ed10024b22
|
Fix some formatting / variable naming
|
2019-02-25 19:29:09 +09:00 |
|
Dean Herbert
|
80737b9ef8
|
Remove "silent" parameter; consolidate import logic
|
2019-02-25 18:24:06 +09:00 |
|
Roman Kapustin
|
8b4aa708fa
|
Resolve merge conflict
|
2019-02-22 23:04:45 +03:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
dbfa95b9e7
|
Made medium the default font weight
|
2019-02-20 16:52:36 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
Roman Kapustin
|
71efbcf603
|
Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure
|
2019-02-03 16:14:04 +03:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
smoogipoo
|
a8ad7d4670
|
Add silent import parameter
|
2018-11-30 18:27:13 +09:00 |
|
smoogipoo
|
a88b69ec43
|
Notify of existing imports
|
2018-11-28 20:19:35 +09:00 |
|
Dean Herbert
|
61fdfe39fd
|
Add comment
|
2018-11-22 19:21:32 +09:00 |
|
smoogipoo
|
5caa67d735
|
Hide playlist when MusicController is hidden
|
2018-11-22 12:12:34 +09:00 |
|