Dan Balasescu
|
0eae8d078b
|
Merge branch 'master' into master
|
2020-05-05 13:33:29 +09:00 |
|
alex
|
0e2ccac33b
|
Add spaces to comments
|
2020-05-04 18:36:24 -07:00 |
|
Dean Herbert
|
06f58dd3e3
|
Ensure correct beatmap and ruleset when presenting a score from song select
|
2020-05-04 15:20:43 +09:00 |
|
Endrik Tombak
|
33a608fd15
|
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
Conflicts:
osu.Game/Screens/Select/SongSelect.cs
|
2020-05-01 11:06:20 +03:00 |
|
Dean Herbert
|
000c34dc26
|
Move recommender to field construction
|
2020-04-30 21:01:53 +09:00 |
|
Dean Herbert
|
cf4e79cf38
|
Show loading spinner when carousel is not ready to be displayed
|
2020-04-30 11:51:06 +09:00 |
|
Dean Herbert
|
119000f1ab
|
Reduce database includes where possible
|
2020-04-28 21:43:35 +09:00 |
|
Endrik Tombak
|
657bf5ad86
|
Merge branch 'master' of https://github.com/ppy/osu into present-recommended
|
2020-04-25 10:13:57 +03:00 |
|
Dan Balasescu
|
3b3a7bdd85
|
Merge branch 'master' into scroll-to-center
|
2020-04-21 10:21:08 +09:00 |
|
Dean Herbert
|
ee1ccb8bcb
|
Fix in a slightly different and hopefully more understandable way
|
2020-04-20 14:03:55 +09:00 |
|
Endrik Tombak
|
b57d709d15
|
Don't use Parent
|
2020-04-19 18:29:06 +03:00 |
|
Dean Herbert
|
5833a7ac91
|
Fix presenting new ruleset and beatmap at once causing wedge display desync
|
2020-04-17 18:56:17 +09:00 |
|
Dean Herbert
|
91b13f91ea
|
Add exception disallowing potential edit when disabled at a property level
|
2020-04-16 12:11:12 +09:00 |
|
Joehu
|
e2b28bfe88
|
Hide edit context menu item in multiplayer song select
|
2020-04-15 18:17:12 -07:00 |
|
Endrik Tombak
|
dd6c9173da
|
Move DifficultyRecommender to OsuGameBase
|
2020-04-14 18:42:00 +03:00 |
|
Dean Herbert
|
abea7b5299
|
Tidy up function passing, naming, ordering etc.
|
2020-04-11 17:13:35 +09:00 |
|
Dean Herbert
|
a843793957
|
Un-nest class
|
2020-04-11 16:41:11 +09:00 |
|
Endrik Tombak
|
35f97dfc75
|
Style changes
|
2020-04-09 18:59:18 +03:00 |
|
Endrik Tombak
|
f40bdcd34e
|
Initial rewrite, moving API logic to SongSelect
|
2020-04-09 18:47:28 +03:00 |
|
Dean Herbert
|
b1d4261402
|
Fix track looping state not being reset when entering editor from song select
Closes #8432.
|
2020-03-25 15:50:19 +09:00 |
|
Dean Herbert
|
9b60b535e5
|
Fix selection not occurring when switching from empty ruleset on first load
|
2020-03-20 15:01:26 +09:00 |
|
Dean Herbert
|
ca9cfbe51d
|
Move selection fallback logic out of BeatmapCarousel to SongSelect
|
2020-03-12 18:42:08 +09:00 |
|
Dean Herbert
|
0477ef6c13
|
Force a selection after filtering to ensure correct difficulty is selected
|
2020-03-05 21:45:19 +09:00 |
|
Dean Herbert
|
f8776a0be4
|
Display all difficulties from overriding selection
|
2020-03-04 22:59:49 +09:00 |
|
Dean Herbert
|
a62550b323
|
Reapply filters on next change after a forced beatmap display
|
2020-03-04 20:14:18 +09:00 |
|
smoogipoo
|
6f7196b0b8
|
Make beatmap detail area abstractable
|
2020-02-13 13:46:23 +09:00 |
|
Dean Herbert
|
66fb72cd8a
|
Fix song select not showing active beatmap if it is filtered by local criteria
|
2020-02-10 16:59:54 +09:00 |
|
Dan Balasescu
|
3600b0daf0
|
Merge branch 'master' into fix-mod-select-overflowing
|
2020-02-04 11:57:54 +09:00 |
|
Joehu
|
22e3150f68
|
Fix comment and remove magic numbers
|
2020-02-03 17:21:06 -08:00 |
|
Joehu
|
609ee26030
|
Fix mod select overlay not showing up in test
|
2020-02-01 11:41:41 -08:00 |
|
Joehu
|
2d42a83bb9
|
Fix mod select overlay overflowing toolbar at max ui scale
|
2020-02-01 11:24:29 -08:00 |
|
Dean Herbert
|
c5422743e2
|
Merge branch 'master' into decouple-mod-select-bindable
|
2020-02-01 02:06:23 +09:00 |
|
Dean Herbert
|
2f61d3f5ad
|
Fix song select remaining issue locally
|
2020-01-31 17:35:53 +09:00 |
|
Dean Herbert
|
7bf2e9b369
|
Decouple ModSelectOverlay from global SelectedMods
|
2020-01-30 17:38:15 +09:00 |
|
Dan Balasescu
|
09f6c57b0f
|
Merge branch 'master' into fix-import-different-ruleset
|
2020-01-30 15:08:25 +09:00 |
|
Dean Herbert
|
c158570249
|
Fix typo in comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2020-01-30 11:31:34 +09:00 |
|
Dean Herbert
|
da6952407e
|
Allow null DI
|
2020-01-29 23:01:57 +09:00 |
|
Dean Herbert
|
13eb32fea2
|
Fix editor being accessible for multiplayer song select
|
2020-01-29 22:20:34 +09:00 |
|
Dean Herbert
|
7588c574a2
|
Fix presenting a beatmap from a different ruleset not working
|
2020-01-29 19:37:54 +09:00 |
|
Dean Herbert
|
77c06b1c6e
|
Fix beatmap carousel potentially missing beatmap imports
|
2020-01-29 17:09:12 +09:00 |
|
Dean Herbert
|
fdde4a6858
|
Tidy up song select hierarchy to be more readable
|
2020-01-24 15:44:31 +09:00 |
|
Dean Herbert
|
c0a233e8bb
|
Align background wedge with carousel
|
2020-01-24 15:00:10 +09:00 |
|
Dean Herbert
|
f8cb898516
|
Improve song select display on ultrawide displays (or when UI scale is set low)
|
2020-01-23 20:03:52 +09:00 |
|
smoogipoo
|
7b2f58eb30
|
Apply OnRelease method signature refactorings
|
2020-01-22 13:22:34 +09:00 |
|
Dean Herbert
|
cdde5d1d69
|
Fix song select filters not reapplied if in a child screen
Closes https://github.com/ppy/osu/issues/6980.
|
2019-12-10 02:30:23 +09:00 |
|
Dean Herbert
|
5b416eb7ba
|
Move initial filter to run on entering
|
2019-11-20 17:24:43 +09:00 |
|
Dean Herbert
|
e0f59d8e24
|
Move method
|
2019-11-20 15:43:00 +09:00 |
|
Dean Herbert
|
e9e37fc821
|
Add private setter for FilterControl
|
2019-11-15 18:23:35 +09:00 |
|
Dean Herbert
|
296fff9243
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
|
2019-11-15 18:20:36 +09:00 |
|
Dean Herbert
|
2c3109980a
|
Fix broken merge
|
2019-11-15 13:51:39 +09:00 |
|
Dean Herbert
|
b8bb97607b
|
Merge remote-tracking branch 'upstream/master' into fix-mod-retention
|
2019-11-15 13:46:44 +09:00 |
|
Huo Yaoyuan
|
677717875e
|
Change a case to EqualityComparer.Default to handle null properly.
|
2019-11-14 17:35:02 +08:00 |
|
Huo Yaoyuan
|
f25b1ba06f
|
Merge branch 'master' into equals
|
2019-11-14 17:33:44 +08:00 |
|
Dean Herbert
|
c15f909d83
|
Remove local bindable at song select, along with misplaced reset logic
|
2019-11-14 13:29:06 +09:00 |
|
Dean Herbert
|
d8a5750e5d
|
Fix typo
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2019-11-14 08:38:01 +09:00 |
|
Dean Herbert
|
a580b9079a
|
Reword comment
|
2019-11-14 08:28:41 +09:00 |
|
Huo Yaoyuan
|
87d40cf8d0
|
Resolve equals usages.
|
2019-11-13 22:35:50 +08:00 |
|
Dean Herbert
|
110c155fa0
|
Fix background loading twice when entering song select
|
2019-11-13 19:42:05 +09:00 |
|
Dean Herbert
|
280c1a0eb4
|
Fix carousel filtering twice on startup due to unpopulated ruleset
|
2019-11-13 19:04:52 +09:00 |
|
Dean Herbert
|
bca1be0bfa
|
Add failing test
|
2019-11-13 18:54:33 +09:00 |
|
Huo Yaoyuan
|
e9b8cbb516
|
Apply other styles.
|
2019-11-11 20:27:04 +08:00 |
|
Huo Yaoyuan
|
ccc8aa6fa4
|
Apply brace style.
|
2019-11-11 20:13:13 +08:00 |
|
Dan Balasescu
|
26a33bfa4e
|
Merge branch 'master' into fix-resume-from-player-audio
|
2019-10-11 19:21:14 +09:00 |
|
Dan Balasescu
|
d4282473c6
|
Merge branch 'master' into fix-background-disposal
|
2019-10-11 17:15:30 +09: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 |
|
Dean Herbert
|
f74c79c2b8
|
Fix audio playback position being reset after resuming to song select
|
2019-10-10 11:58:43 +09:00 |
|
Dean Herbert
|
4e026b163c
|
Don't resume playback when user has paused and track hasn't changed
|
2019-10-08 15:04:38 +09:00 |
|
Dean Herbert
|
e7fc5e556c
|
Fix song select not correctly playing tracks in some cases
|
2019-10-08 11:06:07 +09:00 |
|
Joehu
|
e257f4ca04
|
Resume music to same position when exiting gameplay
|
2019-10-05 10:31:44 -07:00 |
|
Joehu
|
5d460eaf6b
|
Remove depth specification and button order regression
|
2019-10-04 17:14:19 -07:00 |
|
Joehu
|
e7ba6ef5c4
|
Fix keybinding order of beatmap options
|
2019-10-04 14:32:43 -07:00 |
|
Dean Herbert
|
d2c9a29c0d
|
Remove unnecessary local assign
|
2019-10-04 10:45:18 +08:00 |
|
smoogipoo
|
a5e1cb8feb
|
Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge
|
2019-10-04 11:21:33 +09:00 |
|
Joehu
|
5f700f2ae9
|
Simplify exit logic of screens with textboxes using back button receptor
|
2019-10-01 08:26:34 -07:00 |
|
iiSaLMaN
|
fb9f21237e
|
Reset track adjustments on resuming from another screen
|
2019-09-28 04:18:16 +03:00 |
|
Joehu
|
102dbd85bd
|
Fix CI errors
|
2019-09-24 16:48:22 -07:00 |
|
Joehu
|
7fab1a4337
|
Truncate long metadata on beatmap info wedge
|
2019-09-24 16:06:33 -07:00 |
|
Dean Herbert
|
48ee95955b
|
Remove unnecessary redirection
|
2019-09-19 15:45:08 +09:00 |
|
Dean Herbert
|
a7b6895d4c
|
Revert changes to BeatmapDetailArea
|
2019-09-19 14:26:15 +09:00 |
|
Dean Herbert
|
2e0a85c2f6
|
Merge remote-tracking branch 'upstream/master' into songselect-best-user-score
|
2019-09-19 12:57:30 +09:00 |
|
iiSaLMaN
|
aff4dab9aa
|
Ensure playing track of beatmap selected only if a track change occurred
|
2019-09-01 03:17:55 +03:00 |
|
Dean Herbert
|
1f00793891
|
Unpause music when changing selection at song select
|
2019-08-19 11:30:04 +09:00 |
|
Dean Herbert
|
e73a9c2748
|
Fix song select context menus displaying off-screen
|
2019-08-15 14:06:29 +09:00 |
|
David Zhao
|
6765e9f7fa
|
Combine into properties and update for framework changes
|
2019-07-26 15:13:10 +09:00 |
|
David Zhao
|
c89830f3d8
|
move constants, combine local vars into properties
|
2019-07-26 13:07:28 +09:00 |
|
David Zhao
|
97eb5293a8
|
Don't depend on parent sizing
|
2019-07-25 17:32:21 +09:00 |
|
David Zhao
|
c4bed0e6d2
|
Resize BeatmapCarousel, update carouselitem logic
|
2019-07-25 15:31:21 +09:00 |
|
Dean Herbert
|
764513feea
|
Fix code quality
|
2019-07-22 23:13:48 +09:00 |
|
Dean Herbert
|
8c54708582
|
Merge branch 'master' into songselect-best-user-score
|
2019-07-22 22:34:11 +09:00 |
|
smoogipoo
|
7c5a227fc5
|
Fix crashes when presenting replays
|
2019-07-17 14:46:25 +09:00 |
|
Dean Herbert
|
7634e3cc81
|
Fix song select iterating over all beatmaps in database unnnecessarily
|
2019-07-16 14:57:11 +09:00 |
|
Andrei Zavatski
|
7e367dc397
|
Push results screen when clicking on top score
|
2019-07-15 12:30:42 +03:00 |
|
Dean Herbert
|
d4c1005c7e
|
Fix incorrect comparison in line updating logic
|
2019-07-15 15:53:19 +09:00 |
|
Dean Herbert
|
6819c528db
|
Use canBeNull instead of needlessly caching MusicController for tests
|
2019-07-11 00:20:01 +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
|
338371c3fc
|
Fix music playing while exiting from editor
|
2019-07-09 00:08:18 +02:00 |
|
Dean Herbert
|
adf6d6c942
|
Update initial run import process to include scores
|
2019-07-05 14:25:52 +09:00 |
|
Dean Herbert
|
8703f0ad40
|
Change song select initialisation to promote db context sharing
|
2019-06-30 22:23:48 +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 |
|
smoogipoo
|
1a26608ba9
|
Close mod select before exiting song selection
|
2019-06-25 18:33:21 +09:00 |
|
smoogipoo
|
d9927204f8
|
Relieve OsuScreen of back button input duties
|
2019-06-25 18:33:18 +09:00 |
|
smoogipoo
|
8c96e4c1fa
|
Move back button to OsuGame
|
2019-06-25 18:33:08 +09:00 |
|
smoogipoo
|
243cd517ad
|
Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
|
2019-06-12 17:24:16 +09:00 |
|
smoogipoo
|
13234fb4a4
|
Adjust comments a bit
|
2019-06-12 16:07:35 +09:00 |
|
smoogipoo
|
5d3fa51360
|
Merge remote-tracking branch 'origin/master' into selection-update
|
2019-06-12 15:10:57 +09:00 |
|
Dean Herbert
|
606be3d7ce
|
Merge branch 'master' into backgrounded-beatmap-status-lookups
|
2019-06-12 00:22:47 +09:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
Dean Herbert
|
d7cb932606
|
Merge branch 'master' into selection-update
|
2019-06-10 17:51:40 +09:00 |
|
Dean Herbert
|
600503ec8e
|
Use Task.Run/Wait to avoid warnings
|
2019-06-10 13:42:29 +09:00 |
|
Dean Herbert
|
a20eda7b5f
|
Fix remaining cases to work without things
|
2019-05-28 23:54:42 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +09:00 |
|
David Zhao
|
e59a00ac6e
|
Remove excessive selection updating
|
2019-05-28 14:04:33 +09:00 |
|
Dean Herbert
|
9add2562f9
|
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
|
2019-05-12 15:50:10 +09:00 |
|
Dean Herbert
|
790700d8bf
|
Use more correct calculation
|
2019-05-12 15:40:58 +09:00 |
|
Joehu
|
175daac16a
|
Close beatmap options when suspending
|
2019-05-11 21:26:42 -07:00 |
|
Joehu
|
29cec54b3c
|
Fix beatmap carousel overlapping beatmap info wedge
|
2019-05-11 20:08:45 -07:00 |
|
Dean Herbert
|
6dea16f365
|
Move action and hotkey specification local
|
2019-05-08 19:29:43 +09:00 |
|
Dean Herbert
|
772eb460fb
|
Move button definitions to their respective classes
|
2019-05-08 19:03:26 +09:00 |
|
Dean Herbert
|
9a9ac05cd9
|
Fix post-merge issues
|
2019-05-08 18:42:54 +09:00 |
|
Dean Herbert
|
41ab82cdc3
|
Merge branch 'master' into refactor-select-footer
|
2019-05-03 21:46:41 +09:00 |
|
LeNitrous
|
31341bfeb1
|
use SongSelect's SelectedMods property to ensure it exists
|
2019-05-03 16:51:33 +08:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
LeNitrous
|
01cc78108c
|
add random button
|
2019-04-11 05:47:32 +08:00 |
|
LeNitrous
|
22f9339b01
|
let mods button have selected mod icons
|
2019-04-10 21:53:13 +08: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
|
cbb3fdaca8
|
Fix various crashes due to bindable being disabled
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
ad124bfeec
|
Reimplement select mod track adjustments
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
Dean Herbert
|
d6f8dbfd5c
|
Merge branch 'master' into wedge-fix
|
2019-03-29 12:23:42 +09:00 |
|
Dean Herbert
|
26a73b4a65
|
Merge branch 'master' into correct-preview-loop
|
2019-03-29 12:00:58 +09:00 |
|
Dean Herbert
|
759c5b3db9
|
Restore previous resume behaviour for the time being
|
2019-03-29 10:52:26 +09:00 |
|
Dean Herbert
|
3b1f83da1d
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-29 10:31:15 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Unknown
|
fea6adbf54
|
fix wedge bleeding into other elements (and being misaligned)
|
2019-03-27 10:12:09 +01:00 |
|
Dean Herbert
|
a10e43410a
|
Fix song select potentially starting play before the carousel (and bindables) have been initialised
|
2019-03-21 20:52:34 +09:00 |
|
Dean Herbert
|
4789aa81cb
|
Add an explicit flag for tracking song select's bindable binding
Not required (this change does not affect logic) but improves clarity.
|
2019-03-21 20:52:15 +09:00 |
|
Dean Herbert
|
96dba6a20d
|
Move nested method to bottom of class
|
2019-03-21 20:51:21 +09:00 |
|
David Zhao
|
2646126d86
|
Merge remote-tracking branch 'upstream/master' into visual-settings-container
|
2019-03-20 14:29:20 +09:00 |
|
David Zhao
|
15637f9c4a
|
Rework instant blur logic such that updateVisuals doesn't need to be public
|
2019-03-20 14:17:35 +09:00 |
|
Dean Herbert
|
e59917ed03
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-20 10:58:15 +09:00 |
|
David Zhao
|
eac7672c6b
|
Clean up debug logging
|
2019-03-18 14:03:54 +09:00 |
|
David Zhao
|
8cdfb1fd61
|
Remove BlurrableBackgroundScreen, rework tests
|
2019-03-14 16:09:17 +09:00 |
|
David Zhao
|
8714902349
|
Handle all blurring directly from background
|
2019-03-14 14:02:46 +09:00 |
|
David Zhao
|
de6d8fc637
|
Move user blurring into VIsualSettingsContainer
|
2019-03-13 18:25:22 +09:00 |
|
Dean Herbert
|
8230d5b52e
|
Ensure initial blur is set on song select background creation
We do not want the blur transition to play here
|
2019-03-12 17:27:20 +09:00 |
|
Dean Herbert
|
1954eaca4c
|
Populate an initial beatmap
|
2019-03-12 14:01:27 +09:00 |
|