smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
smoogipoo
28510674ac
Shorten body text
2020-01-06 17:48:29 +09:00
smoogipoo
61c269b17b
Leaderboard should not change the model
2020-01-06 17:32:24 +09:00
smoogipoo
4a7f5f98df
Cleanup methods/events
2020-01-06 17:20:09 +09:00
Willy Tu
e23c71be80
Update Resolved and Cached attribute issues
2020-01-03 11:34:26 -08:00
Willy Tu
0a4e180ce7
Merge branch 'master' of github.com:ppy/osu into #7146
2020-01-03 11:32:06 -08:00
Viktor Rosvall
ddec59ec91
Further refactoring. I think this may have polluted the FooterButton too much. Not sure what to do about the centering.
2020-01-01 12:22:19 +01:00
Viktor Rosvall
8695e57f62
Hides mod display when no mods are active to fix issue of invisible margin
2019-12-31 12:21:55 +01:00
Viktor Rosvall
f40ebc83ca
Begun refractorization process of wrapping Button text in a FillFlowContainer
2019-12-30 23:58:49 +01:00
Viktor Rosvall
b0bcbf8b93
Adjusted margin to fix the 1 px increase
2019-12-30 21:55:09 +01:00
Viktor Rosvall
875a25c529
adjusted the margin values
2019-12-29 09:00:59 +01:00
Viktor Rosvall
b3d32710df
Centered button mods by adding padding to FillFlowContainer
2019-12-29 00:19:51 +01:00
Dean Herbert
41d99df73c
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
2019-12-25 20:49:45 +09:00
Joehu
b038c192d1
Rename property to IsSwitchable
2019-12-22 19:47:47 -08:00
Joehu
1342556894
Allow ctrl tabbing navigation to chat and song select leaderboards
2019-12-21 10:48:11 -08:00
Willy Tu
8e60ae7039
Removed directive is not required
2019-12-20 15:45:20 -08:00
Willy Tu
8353c893c0
Update BodyText of LocalScoreDeleteDialog
2019-12-20 12:00:10 -08:00
Dean Herbert
a6bdf04f6b
Remove unused using
2019-12-20 18:36:39 +09:00
Dean Herbert
822903d5db
Update song select statistics when mod changes settings
2019-12-20 18:01:35 +09:00
Willy Tu
ed07b779b1
Update to use score.ID identify local scores
2019-12-18 21:54:02 -08:00
Willy Tu
27163a5133
Removed unnecessary code for deleting individual local score.
2019-12-18 21:04:10 -08:00
Willy Tu
b67f986058
Fix CodeFactor issues
2019-12-18 19:26:35 -08:00
Willy Tu
531ac16743
Update Scoreboard Refresh Method for deleting individual scores
2019-12-18 19:22:42 -08:00
Willy Tu
d1fcadc700
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 19:16:54 -08:00
smoogipoo
2905a4418d
Fix potential nullref
2019-12-18 21:30:57 +09:00
smoogipoo
cb5a35f8f9
Fix incorrect bindable valuechanged usage
2019-12-18 21:08:49 +09:00
smoogipoo
4e11fb0fd7
Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text
2019-12-18 19:36:16 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings
2019-12-18 17:59:27 +09:00
smoogipoo
8e651962c7
Fix incorrectly binding inside BDL load()
2019-12-18 17:41:30 +09:00
Dean Herbert
ada2ae2b2c
Use tuple to avoid potential for incorrect display
2019-12-18 17:12:41 +09:00
Dean Herbert
e87aa281bf
Don't clone beatmap unnecessarily
2019-12-18 17:00:35 +09:00
wltu
4646524bf9
Remove unnecessary library
2019-12-17 13:18:20 -08:00
wltu
8aeef3f59a
Added refresh scoreboard upon deleting local score and formatted the code
2019-12-17 12:56:30 -08:00
wltu
bb2b1475cd
Merge branch 'master' of https://github.com/ppy/osu into #7146
2019-12-17 12:54:47 -08:00
Huo Yaoyuan
caf3f774ba
CA1309: compare strings correctly.
2019-12-17 13:00:15 +08:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Willy Tu
bef9637fdf
Implemented delete local score individually. Currently does not refresh the score screen after the delete is compelete.
2019-12-16 19:25:28 -08:00
Huo Yaoyuan
ab70abe8bd
Turn off unexpected new warnings.
2019-12-15 20:07:56 +08:00
unknown
3945e7403a
improve tests and refactor AdvancedStats
2019-12-13 09:39:54 +08:00
unknown
ec5b506960
apply mod difficulty settings during song select
2019-12-12 23:41:46 +08: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
Huo Yaoyuan
ad1fb3bda2
Remove IComparable in constraint.
2019-12-09 17:48:41 +08:00
Dean Herbert
48287459a0
Optimise filters to avoid property retrieval
...
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
2019-12-05 01:52:22 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info
2019-12-04 11:47:27 +09:00
Huo Yaoyuan
a42f9447e6
Don't use Equals(object) on T?.
2019-12-03 20:07:22 +08:00
Dean Herbert
f0d49d0cdf
Decouple APILegacyScoreInfo from ScoreInfo
2019-12-03 15:31:11 +09:00
Ganendra Afrasya
ada8dabf7e
Add right margin on score multiplier text
2019-11-28 18:48:43 +07:00
Ganendra Afrasya
944835da23
Add multiplier score text on mods footer button
2019-11-28 12:01:40 +07:00
Huo Yaoyuan
c0fe91a84c
Merge branch 'master' into sharpen
2019-11-26 18:21:50 +08:00
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Dean Herbert
d8260f4a65
Reduce carousel scroll motion on initial display
2019-11-22 10:51:49 +09:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
Dan Balasescu
a7c074ff37
Merge branch 'master' into math_clamp
2019-11-21 11:08:56 +09:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
Dean Herbert
3ba9f840fd
Fix song select not always scrolling to the correct location
2019-11-20 19:39:13 +09:00
Huo Yaoyuan
374ef6ff83
Merge branch 'master' into sharpen
2019-11-20 17:30:58 +08:00
Dean Herbert
8c9ed99b1b
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
2019-11-20 17:24:54 +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
Huo Yaoyuan
b04bca7db6
Reference elements in origin definition.
2019-11-17 20:55:40 +08: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
42a98c5d87
Use constants.
2019-11-12 20:07:01 +08:00
Huo Yaoyuan
d60493a961
Use discards.
2019-11-12 20:03:21 +08: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
Ganendra Afrasya
8da15f6897
Fix all score are highlighted on local scope
2019-11-01 23:19:15 +07:00
Ganendra Afrasya
ce3b34a768
Fix UserTopScoreContainer is also tinted
2019-11-01 23:00:55 +07:00
Bartłomiej Dach
c181edaedf
Replace manual comparer implementation
...
Replace manually-implemented CriteriaComparer with a call to
Comparer<T>.Create() to decrease verbosity.
2019-10-28 15:07:36 +01:00
Bartłomiej Dach
c8d3dd0e5a
Make carousel item sorting stable
...
Migrate beatmap carousel item sorting from List<T>.Sort()
to IEnumerable<T>.OrderBy(), as the second variant is documented to be
a stable sorting algorithm. This allows for eliminating unnecessary
movement of carousel items occurring whenever any set of items is tied
when changing sorting criteria.
2019-10-27 23:14:14 +01:00
Joehu
f7924d3bad
Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox"
2019-10-21 16:00:09 -07:00
Joehu
e5b50b5e1f
Fix slider bar regression when using arrows
2019-10-17 13:54:36 -07:00
Joehu
649951198e
Make most textbox carets movable
2019-10-15 14:47:48 -07:00
Joehu
ccc753a315
Make OverlayContainers with no blocking input VisibilityContainers
2019-10-14 16:27:59 -07: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
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback
2019-10-09 12:26:07 +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
Dean Herbert
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing
2019-10-08 10:12:03 +09:00
Joehu
9fdbe58326
Fix dropdown header padding when selected mod filter is hidden
2019-10-07 16:17:58 -07:00
Joehu
8e6e90eaec
Use fixed numbers for padding instead
2019-10-07 16:11:40 -07:00
Dean Herbert
f15953d65c
Fix carousel including filtered difficulties in sort comparisons
2019-10-07 15:17:03 +09:00
Joehu
11d937beab
Fix beatmap detail area tab dropdown being blocked by content
2019-10-06 10:24:33 -07:00
Joehu
38c1cee5fd
Fix tab controls overflowing
2019-10-06 10:22:55 -07:00
Joehu
e257f4ca04
Resume music to same position when exiting gameplay
2019-10-05 10:31:44 -07:00
Joehu
a71db11ea5
Remove depth parameter description
2019-10-04 18:38: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
9861b21440
Remove unnecessary padding/margin
2019-09-24 16:28:40 -07:00
Joehu
7fab1a4337
Truncate long metadata on beatmap info wedge
2019-09-24 16:06:33 -07:00
Dean Herbert
4a59e3351e
Update beatmap carousel tests code style
...
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
2019-09-25 02:42:12 +09:00
Bartłomiej Dach
96c0c80dc5
Factor out methods in FilterQueryParser
...
Factor FilterQueryParser.ApplyQueries into shorter methods to reduce
method complexity.
2019-09-22 21:20:50 +02:00
Bartłomiej Dach
70842f71f4
Fix floating point handling in filter intervals
...
Due to floating-point rounding and representation errors, filters could
wrongly display results incongruous with the wedge display text (ie.
a beatmap with the BPM of 139.99999 would be displayed as having 140
BPM and also pass the bpm<140 filter).
Apply tolerance when parsing floating-point constraints. The tolerance
chosen is half of what the UI displays for the particular values (so
for example half of 0.1 for AR/DR/CS, 0.01 for stars, etc.)
Tests updated accordingly.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
b262ba13cd
Add creator= and artist= filters
...
To match stable, add creator= and artist= filters to the beatmap
carousel on song select screen. Contrary to stable, this implementation
supports phrase queries with spaces within using double quotes.
The quote handling is not entirely correct (can't nest), but quotes
should rarely happen within names, and it is an edge case of an edge
case - leaving best-effort as is. Test coverage also included.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
f5f5094611
Take culture into account when parsing filters
...
Culture was not taken into account when parsing filters, which meant
that in cultures that use the comma (,) as a decimal delimiter, it would
conflict with the comma used to delimit search criteria. To remove
any ambiguity, introduce local helper functions that allow the decimal
point to be utilised, using the invariant culture. This also matches
stable behaviour.
The decision to not reuse osu.Game.Beatmaps.Formats.Parsing was
deliberate due to differing semantics (it's not really sane to throw
exceptions on receiving user-facing input).
2019-09-22 00:18:53 +02:00
Bartłomiej Dach
dddd94684b
Split out lower and upper interval inclusivity
...
A single IsInclusive field causes unexpected issues when trying to
formulate a half-open interval query. Split out IsInclusive into two
fields, Is{Lower,Upper}Inclusive and update usages accordingly.
2019-09-22 00:18:28 +02:00
Bartłomiej Dach
33c51d5178
Extract parsing filter queries to class
...
For the sake of testability without having to spin up visual tests,
extract methods related to parsing filter queries from FilterControl
to a static FilterQueryParser class.
2019-09-22 00:18:28 +02:00
Revel
f7f9c0f7e0
Update BeatmapDetailAreaTabControl.cs
2019-09-19 15:47:32 -04:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score
...
Show personal best on song select
2019-09-19 21:17:23 +09:00
smoogipoo
94d3bcc612
Fix top score not being selectable
2019-09-19 20:47:33 +09:00
smoogipoo
5120d82ef8
Fix crash with multiple range criterias
2019-09-19 17:36:44 +09:00
smoogipoo
96ea507320
Reorder comparison for readability
2019-09-19 17:21:22 +09:00
smoogipoo
e075dd7ea8
Fix equals operator not working
2019-09-19 17:16:34 +09:00
smoogipoo
7683f7ff23
Make OnlineStatus use OptionalRange
2019-09-19 17:12:07 +09:00
smoogipoo
d7831d8f5d
Use non-generic IComparable interface
2019-09-19 17:11:43 +09:00
smoogipoo
167bb9fcc1
Fix ugly casts
2019-09-19 17:11:28 +09:00
smoogipoo
0915a94470
Make BeatDivisor use OptionalRange
2019-09-19 16:53:27 +09:00
smoogipoo
3c21b68b73
Make OptionalRange generic
2019-09-19 16:51:57 +09:00
Dean Herbert
48ee95955b
Remove unnecessary redirection
2019-09-19 15:45:08 +09:00
smoogipoo
c1daa187fe
Reduce default tolerance
2019-09-19 15:44:14 +09:00
Dean Herbert
36d0695e5c
Add spacing
2019-09-19 15:44:05 +09:00
Dean Herbert
033c68a428
Fade in score, not container
2019-09-19 15:44:00 +09:00
Dean Herbert
2b6c9aeb26
Move top score container to more local namespace
2019-09-19 15:38:40 +09:00
Dean Herbert
e0fd8609d1
Fix margins and clean up implementation
2019-09-19 15:34:46 +09:00
smoogipoo
80f46e02d8
Add equals (=) query operator variants
2019-09-19 15:33:54 +09:00
Dean Herbert
098e89cb66
Improve state reset flow
2019-09-19 15:23:33 +09:00
Dean Herbert
4967ffd8e5
Move inside leaderboard
2019-09-19 14:52:31 +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
Dean Herbert
92556db9cd
Add query-based filter modes to song select search field
2019-09-19 02:48:28 +09:00
Dan Balasescu
4910c23482
Merge branch 'master' into show-beatmap-not-selected-in-leaderboards
2019-09-10 17:43:42 +09:00
iiSaLMaN
b77550625c
Check if DummyWorkingBeatmap is selected instead
2019-09-09 20:04:04 +03:00
iiSaLMaN
1b0123a60c
Set beatmap of leaderboard to null if NoBeatmapsAvailable is selected
2019-09-05 05:56:52 +03:00
iiSaLMaN
a1c580f27e
Create "none selected" placeholder state
2019-09-05 05:56:21 +03:00
smoogipoo
a87a1e6031
Don't redraw certain buffered containers on scale change
2019-09-04 19:38:12 +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
7885c79467
Make bindables private
2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence
2019-08-27 14:12:59 +09:00
smoogipoo
6368189d46
Refactor
2019-08-27 11:59:25 +09:00
Andrei Zavatski
9321f20884
Move arrow to the first line
2019-08-26 14:32:27 +03:00
Andrei Zavatski
fd0f42eee4
Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load
2019-08-26 14:11:24 +03:00
Dean Herbert
9881d3677d
Simplify icon creation
2019-08-25 12:05:46 +09:00
Dean Herbert
ef397434f6
use GroupBy instead of Distinct+FindAll
2019-08-25 12:00:06 +09:00
Dean Herbert
a19a9b90ed
Simplify group filter display
2019-08-25 11:39:26 +09:00
Lucas A
b204e4419a
Rename SelectSortingMode & SelectGroupingMode -> SongSelectSortingMode & SongSelectGroupingMode
2019-08-24 10:34:54 +02:00
iiSaLMaN
8ccbe84f67
Loop on distinct rulesets of beatmap instead of all
2019-08-24 01:30:33 +03:00
iiSaLMaN
87340061e1
Add logic to create grouped difficulty icons in carousel beatmap set
2019-08-24 00:06:28 +03:00
Lucas A
ce5ee095b9
Fetch config bindables in BDL.
2019-08-23 14:03:56 +02:00
Lucas A
6bf31e8f91
Make song select grouping & sorting filters persistent
2019-08-23 13:15:38 +02:00
Dean Herbert
7bf430afd5
Add padding back to difficulty icons on carousel
2019-08-21 21:16:06 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
...
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
9c069f6f22
Merge branch 'master' into unpause-on-selection-change
2019-08-19 13:15:46 +09:00
Dean Herbert
1f00793891
Unpause music when changing selection at song select
2019-08-19 11:30:04 +09:00
Dean Herbert
3dc81bdad5
Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip
2019-08-17 15:19:46 +09:00
Dean Herbert
4fa9abeece
Replace DifficultyColouredContainer with a more scalable solution
2019-08-17 15:16:24 +09:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip
2019-08-17 13:45:20 +09:00
Dean Herbert
b57298406f
Fix right click blocking not resetting correctly
2019-08-15 19:25:33 +09:00
Dean Herbert
0f4bada21e
Fix right click absolute scrolling interfering with context menus
2019-08-15 18:27:45 +09:00
Dean Herbert
e73a9c2748
Fix song select context menus displaying off-screen
2019-08-15 14:06:29 +09:00
Dean Herbert
f355cff8bc
Apply reviews
2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784
Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip
2019-08-15 11:54:59 +09:00
Dean Herbert
75cb0d093b
Use description correctly
...
Required for localisation
2019-08-12 16:10:48 +09:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
Dean Herbert
616de1830a
Less sheep
2019-08-07 12:20:49 +09:00
Joehu
1fc7ddf621
Fix text depth regression
2019-08-05 18:14:41 -07:00
Joehu
a7ac411c25
Fix footer button hover sounds playing in unclickable area
2019-08-05 17:57:04 -07:00
Andrei Zavatski
fd44ca3233
Rename Animation to Layer
2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1
Move DimmedLoadingAnimation to it's own file
2019-08-04 11:09:12 +03:00
Dean Herbert
4c6cccb3a3
Update settings in line with framework changes
2019-07-30 23:31:21 +09:00
Dean Herbert
088c04a20f
Revert "Fix BackButton handling escape before all other elements ( #5440 )"
...
This reverts commit 17a6563f4c
2019-07-28 23:38:55 +09:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority
2019-07-28 12:50:18 +09:00
Dean Herbert
3571cb96b0
Fix broken merge
2019-07-27 12:56:55 +09:00
David Zhao
57e6c388a1
Merge branch 'master' into carousel-sizing
2019-07-27 11:40:07 +09:00
Dean Herbert
392e1cbafb
Merge pull request #5456 from peppy/fix-import-select
...
Fix beatmap present failing directly after an import
2019-07-26 18:48:49 +09:00
Dean Herbert
4d49aad153
Start not visible
2019-07-26 15:51:51 +09:00
Dean Herbert
7fa419a38b
Fix file layout order
2019-07-26 15:49:21 +09:00
David Zhao
0f6c6c7de0
consolidate halfheight as well
2019-07-26 15:22:29 +09:00
Joehu
0b6cfec21c
Hide leaderboard mod filter when on details tab
2019-07-25 23:20:56 -07: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
a9f0dda9d7
Confine positional input
2019-07-25 17:36:13 +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
69844e6c24
Fix beatmap present failing directly after an import
2019-07-25 12:18:18 +09:00
David Zhao
6ef3c71e22
remove unused using
2019-07-25 11:31:46 +09:00
David Zhao
e63c97b306
remove unnecessary overrides
2019-07-25 11:20:24 +09:00
David Zhao
bbcc8f0721
Add new container level and unblock footer
2019-07-25 11:11:20 +09:00
Andrei Zavatski
76b79f3554
Transform adjustments
2019-07-23 01:14:45 +03:00
Andrei Zavatski
94ed03548d
Hide top score at every leaderboard change
2019-07-22 18:34:31 +03:00
Dean Herbert
5a6c8bfec9
Adjust transition to now show janky resize
2019-07-22 23:28:17 +09:00
Dean Herbert
95241165cc
Fix text alignment
2019-07-22 23:26:11 +09:00
Dean Herbert
d83d93ee66
Use asynchronous loading
2019-07-22 23:21:07 +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
Dean Herbert
a05a6bbb77
Set "Title" as the default grouping/sorting modes in song select ( #5396 )
...
Set "Title" as the default grouping/sorting modes in song select
2019-07-22 18:06:23 +09:00
Dean Herbert
e76b3e2b40
User property instead of method
2019-07-21 10:42:40 +09:00
iiSaLMaN
842417cf42
Check if selected scope requires API
2019-07-21 03:07:27 +03:00
smoogipoo
1ce2b2eace
Set title as default grouping/sorting modes
2019-07-18 13:18:06 +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
Andrei Zavatski
9c13ede5a8
Merge remote-tracking branch 'refs/remotes/ppy/master' into songselect-best-user-score
2019-07-15 12:11:28 +03:00
Dean Herbert
d4c1005c7e
Fix incorrect comparison in line updating logic
2019-07-15 15:53:19 +09:00
Andrei Zavatski
19680c8df8
Minor adjustments
2019-07-14 16:37:05 +03:00
Andrei Zavatski
ecf0e62484
CI fixes
2019-07-14 16:16:21 +03:00
Andrei Zavatski
963e025bb8
Make it works and some layout adjustments
2019-07-14 14:03:14 +03:00
Andrei Zavatski
d1409d4610
Add top score section into beatmap detail area
2019-07-14 13:33:47 +03:00
Andrei Zavatski
d30ae24f58
Use Bindable for setting score
2019-07-14 12:40:54 +03:00
Andrei Zavatski
0584ee9ce5
Basic implementation
2019-07-14 12:34:12 +03:00
Dean Herbert
19e8198bff
Merge branch 'master' into flow_container_insert
2019-07-11 22:53:57 +09:00
Dean Herbert
3b448b0086
Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master
2019-07-11 00:25:35 +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
iiSaLMaN
38bc652bf2
Remove sorting by length for beatmaps
2019-07-09 17:02:51 +03:00
iiSaLMaN
e0c1fb7818
Compare by milliseconds for length
2019-07-09 14:47:54 +03: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
iiSaLMaN
5f3f59629e
Use the length field instead of recalculating
2019-07-08 11:55:07 +03:00
iiSaLMaN
129899f419
Add a BPM property in BeatmapInfo
2019-07-08 10:43:35 +03:00
iiSaLMaN
90d5484818
Return BPM back to OnlineInfo
...
Revert commit of "Move BPM out of OnlineInfo"
2019-07-08 09:10:41 +03:00
iiSaLMaN
729f0901f7
Move Length out of OnlineInfo
2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf
Move BPM out of OnlineInfo
2019-07-07 20:11:44 +03:00
iiSaLMaN
6ee10640e3
Remove unnecessary migration + Fix CI issues
2019-07-07 19:26:41 +03:00
iiSaLMaN
b4ef64fa61
Add sorting by Length
2019-07-07 18:26:56 +03:00
iiSaLMaN
65c8249c94
Add beatmap extension for calculating length
2019-07-07 18:25:52 +03:00
iiSaLMaN
188c80374e
Add sorting by BPM
2019-07-07 18:14:23 +03:00
Dean Herbert
ebc0e50295
Simplify conditions
2019-07-07 13:21:41 +09:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder
2019-07-06 12:09:28 -07:00
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter
2019-07-06 13:27:49 +09:00
Dean Herbert
adf6d6c942
Update initial run import process to include scores
2019-07-05 14:25:52 +09:00
Joehu
1534b75d27
Fix ci errors
2019-07-04 21:39:21 -07:00
Joehu
e8168037f9
Fix unranked beatmap leaderboards showing "no records" placeholder
2019-07-04 21:19:51 -07:00
naoey
1dab363be3
Require supporter for filtering mods on online leaderboards
2019-07-05 08:42:44 +05:30
naoey
98a242cc37
Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter
2019-07-05 08:38:33 +05:30
Dean Herbert
91d461eba7
Merge pull request #5251 from Joehuu/remove-edit-song-select-file
...
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
Joehu
5f6544eebf
Fix beatmap leaderboards requiring supporter when signed out
2019-07-04 12:05:07 -07:00
naoey
f04adb7192
Apply mods filter to local scores too
2019-07-04 22:38:33 +05:30
Joehu
9b2ebed669
Remove unused EditSongSelect file
2019-07-04 08:36:34 -07:00
naoey
99606a018b
Merge remote-tracking branch 'upstream/master' into leaderboard-mod-filter
2019-07-03 19:35:08 +05:30
naoey
4ba60ed089
Apply currently selected mods to filter leaderboard scores
...
Modifies GetScoresRequest to build query string locally instead of using WebRequest.AddParameter since it doesn't support array parameters
2019-07-03 17:04:20 +05:30
naoey
ccae4ce95e
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 14:39:11 +05:30
Roman Kapustin
9037fb59de
Make BeatmapOptionsButton insertion cleaner
2019-07-01 18:42:18 +03: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
Ganendra Afrasya
d540565197
Merge branch 'master' into difficulty-icon-tooltip
2019-06-22 11:54:00 +07:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow
2019-06-21 12:42:35 +09:00
David Zhao
65c84428cc
Fix position of gradient in beatmap carousel
2019-06-20 15:05:15 +09:00
Dean Herbert
d0a452cdf9
Show tooltips for beatmap set panels
2019-06-20 01:10:03 +09:00
Dean Herbert
2b48f5d3e0
Tidy up updateMetrics flow
2019-06-15 14:45:51 +09:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs
2019-06-15 13:42:13 +09:00
Dean Herbert
bc574520bf
Update ScrollContainer usages in line with framework changes
2019-06-14 15:55:32 +09:00
smoogipoo
f54f6e552b
Fix beatmap details potentially using the incorrect metrics
2019-06-13 18:04:42 +09:00
smoogipoo
583bb53f53
Remove GetBeatmapDetailsRequest
2019-06-13 16:57:19 +09:00
smoogipoo
0a79b444d9
Move metrics to beatmap set
2019-06-13 16:52:49 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status ( #4619 )
...
Split out user activity from user status
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +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
Dean Herbert
20b43c20c8
Rename variables to remove redundant "screen" terminology
2019-06-12 16:33:15 +09:00
smoogipoo
13234fb4a4
Adjust comments a bit
2019-06-12 16:07:35 +09:00
Dean Herbert
a9c229b1ec
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-12 16:00:35 +09:00
smoogipoo
5d3fa51360
Merge remote-tracking branch 'origin/master' into selection-update
2019-06-12 15:10:57 +09:00
Lucas A
15893bbb75
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
2019-06-11 19:41:48 +02: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
Lucas A
141775d98c
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-10 21:41:00 +02: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
Lucas A
a2bc5b538e
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-05 16:59:38 +02:00
smoogipoo
a6dc5606bc
Allow beatmapsets to be sorted by date added
2019-06-05 18:17:43 +09:00
David Zhao
4f09141718
remove extra bool
2019-05-29 12:22:34 +09:00
Dean Herbert
a20eda7b5f
Fix remaining cases to work without things
2019-05-28 23:54:42 +09:00
David Zhao
1a871af552
Fix hide selection, add test
2019-05-28 19:15:29 +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
Lucas A
55663b3576
Nest all UserActivities into UserActivity
2019-05-12 17:38:02 +02:00
Lucas A
5ac6bd8204
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-12 11:53:30 +02: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
4f697e2bd5
Add licence header
2019-05-08 19:35:20 +09:00
Dean Herbert
6dea16f365
Move action and hotkey specification local
2019-05-08 19:29:43 +09:00
Dean Herbert
c91b9c6032
Add missing button
2019-05-08 19:27:53 +09:00
Dean Herbert
772eb460fb
Move button definitions to their respective classes
2019-05-08 19:03:26 +09:00
Dean Herbert
0693290ad4
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
2019-05-08 18:43:21 +09:00
Dean Herbert
b33372ca62
Don't expand mods in button on hover
2019-05-08 18:43:15 +09:00
Dean Herbert
8906eb874a
Fix CI issues
2019-05-08 18:43:06 +09:00
Dean Herbert
9a9ac05cd9
Fix post-merge issues
2019-05-08 18:42:54 +09:00
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02: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
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02: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
LeNitrous
009eaa647a
fixes to FooterButtonRandom
2019-05-03 16:38:15 +08:00
Lucas A
5d4aa5a12e
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
2019-05-02 20:51:19 +02:00
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02: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
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring
2019-04-15 11:43:53 +02:00
LeNitrous
2d227d25cc
fix appveyor warnings
2019-04-14 07:55:15 +08:00
LeNitrous
91c327a90f
use ModDisplay
2019-04-14 07:22:31 +08:00
Lucas A
da5d6cb1d4
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
2019-04-12 22:54:35 +02:00
LeNitrous
01cc78108c
add random button
2019-04-11 05:47:32 +08:00
LeNitrous
b4d0755818
please appveyor
2019-04-10 22:10:09 +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
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
Ferdinand Bachmann
d431ca4efc
BeatmapLeaderboard: use OrderByDescending instead of negation
...
(suggested by peppy)
2019-04-07 13:26:35 +02:00
theFerdi265
cb3532e7d4
BeatmapLeaderboard: fix local scores not being sorted
2019-04-06 00:53:02 +02:00
Samuel Van Allen
bb516da5b6
Removed redundant empty argument list
2019-04-03 22:57:05 +08:00
Samuel Van Allen
3660924441
Trimmed whitespace
2019-04-03 22:40:20 +08:00
Samuel Van Allen
4d60f6fb6a
Use collection initializer and added missing blank line
2019-04-03 22:37:50 +08:00
Samuel Van Allen
73c7c6c316
Hides "Details" button when OnlineBeatmapID is null
2019-04-03 21:44:36 +08: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
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +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
Dan Balasescu
5de99f3f5b
Merge branch 'master' into fix-random-select-crash
2019-03-22 14:11:06 +09:00
Dean Herbert
37010f97d7
Fix random select crashing
...
Closes #3383 .
2019-03-21 21:02:54 +09: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
Dean Herbert
e2503888a4
Expose carousel's loaded flag
2019-03-21 20:51:06 +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
f1b2073bf6
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-19 13:01:05 +09:00
Dean Herbert
14df9f94e2
Merge branch 'master' into fix-background-loading
2019-03-18 14:59:35 +09:00
David Zhao
eac7672c6b
Clean up debug logging
2019-03-18 14:03:54 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework
2019-03-18 11:34:59 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability
2019-03-18 10:59:06 +09:00
Dean Herbert
c496f6e56b
Fix usages of OnLoadComplete
2019-03-17 13:44:20 +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
Jamie Taylor
69eb4ef983
Change updateMetrics parameter to be optional
2019-03-14 13:35:49 +09:00
Dean Herbert
dd6fbccb56
Slight refactoring of order for readability
2019-03-13 19:57:45 +09:00
David Zhao
de6d8fc637
Move user blurring into VIsualSettingsContainer
2019-03-13 18:25:22 +09:00
Jamie Taylor
e6449db8e3
Null metrics on null beatmap for transition animation
2019-03-13 14:13:42 +09:00
Dean Herbert
f0114d776d
Use interface to access API
...
Allows for better testability.
2019-03-13 12:58:18 +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
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup
2019-03-09 11:14:54 +09:00
Jamie Taylor
8e5816805c
Fix showing outdated data for non-online beatmaps
2019-03-08 18:44:35 +09:00
Jamie Taylor
c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
2019-03-07 17:01:24 +09:00
Jamie Taylor
054db48089
Move online id null check to only bypass metrics lookup
2019-03-07 16:59:43 +09:00
Jamie Taylor
e5e454ddcd
Don't perform lookup of beatmap stats unless an online id is present
2019-03-07 16:17:12 +09:00
Jamie Taylor
e13516c2ba
Only attempt to restore CurrentItem state if present
2019-03-07 14:09:28 +09:00
Jamie Taylor
6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation
2019-03-06 20:03:37 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash
2019-03-05 17:25:13 +09:00
Dean Herbert
c01990d005
Fix callback potentially not getting fired
2019-03-01 20:52:34 +09:00
Dean Herbert
19ce1f2869
Remove second conditional
2019-03-01 13:43:16 +09:00
Dean Herbert
49cbaecf4c
Update licence header
2019-03-01 10:52:53 +09:00
Dean Herbert
acc2113027
Make operation run asynchronously
2019-03-01 10:09:03 +09:00
Dean Herbert
798bc1306b
Merge remote-tracking branch 'upstream/master' into m2307-master
...
# Conflicts:
# osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
Dean Herbert
80b5f1c523
Fix code formatting issues
2019-03-01 09:49:36 +09:00
Dean Herbert
67928ac1fe
Remove pointless check
2019-03-01 09:49:11 +09:00
Dan Balasescu
a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling
2019-02-28 17:35:08 +09:00
Jamie Taylor
4c8aa65200
private + renaming
2019-02-28 17:02:45 +09:00
Jamie Taylor
6e821a426d
Fix restoration of enabled mods when cancelling song select
2019-02-28 15:06:11 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
3e1f283281
Merge remote-tracking branch 'upstream/master' into more-inspections
2019-02-28 13:09:18 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
Jamie Taylor
a3f71d69a9
Ensure ruleset and mods are set correctly when leaving MatchSongSelect
2019-02-27 16:16:13 +09:00
Jamie Taylor
7c2ffb1826
Fix MatchSongSelect not handling beatmapset deletions
2019-02-27 14:34:39 +09:00
Joehu
5b4319a80f
Fix home button being cancelled by mod select again
2019-02-26 21:01:28 -08:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash
2019-02-27 11:14:42 +09:00
Dean Herbert
d9872dda12
Use fade instead of negative margin
2019-02-26 16:10:06 +09:00
Dean Herbert
2d6d9dd723
Add better easing
2019-02-26 16:09:45 +09:00
Dean Herbert
c1432b2ed5
Add back newline
2019-02-26 15:48:34 +09:00
Dean Herbert
97dc7f9819
Merge branch 'master' into MissingSource
2019-02-25 19:35:44 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix
2019-02-25 19:11:05 +09:00
David Zhao
59ad470eed
Clean up test code
2019-02-25 18:41:13 +09:00
David Zhao
ad1bce3585
Fix song select backround not being exited in time
2019-02-25 18:40:19 +09:00
Dean Herbert
80737b9ef8
Remove "silent" parameter; consolidate import logic
2019-02-25 18:24:06 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +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
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both
2019-02-20 19:34:55 +09:00
smoogipoo
4db5531e4b
Replace copy-constructor/method with extension method
2019-02-20 19:32:30 +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
ThePyrotechnic
7bb56a198a
Merge branch 'master' into MissingSource
2019-02-17 19:54:43 +00:00
Dean Herbert
94ceb1e32b
Move screen change allowance to local usage
2019-02-14 13:28:21 +09:00
Dean Herbert
e604806398
Fix regression in screen change allowance logic
2019-02-13 19:43:01 +09:00
Dean Herbert
ab3adafafd
Fix crashes after entering player
2019-02-13 14:13:54 +09:00
Michael Manis
5fbdbcf209
removed 'unknown source' line
2019-02-12 15:30:42 -05:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
Michael Manis
cfe14dcdb1
Options for handing unknown beatmap source
2019-02-10 18:31:39 -05:00
smoogipoo
065b0c9076
Fix background not being faded correctly
2019-02-04 17:04:52 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
Unknown
8c1f8ee596
restart correctly when leaving player (without noises)
2019-01-31 12:33:08 +01:00
Unknown
e2347ae7bf
Merge branch 'master' into correct-preview-loop
2019-01-31 10:53:09 +01:00
Dean Herbert
f85518b175
Don't expose padding
2019-01-31 18:16:28 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen
2019-01-31 01:08:06 +09:00
smoogipoo
ac0bc53c4b
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
...
This reverts commit cc8793a45e94276c8abb
2019-01-31 00:02:05 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
Unknown
1fa87521f6
fix restarting with a different track in the same BeatmapSet
2019-01-26 07:29:30 +01:00
Unknown
3d5520d277
correctly loop from preview point in SongSelect
2019-01-26 07:09:01 +01:00
phosphene47
5c70be07ab
Display carousel over beatmap info wedge
2019-01-25 22:58:55 +11:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Microgolf
097062caf7
Addresses requested changes
2019-01-08 17:57:03 +01:00
smoogipoo
b17b88d071
Fix null beatmap possibly being selected
2019-01-08 18:06:46 +09:00
Matthias Coenraerds
562c9e56fb
Fix naming
2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885
Verify leaderboard scope to be local
2019-01-06 13:37:30 +01:00
Matthias Coenraerds
a93c26ccfd
Filename does not match contained type
2019-01-04 20:40:07 +01:00
Matthias Coenraerds
3879348ee4
Implement clear scores on beatmap
2019-01-04 20:23:06 +01:00
smoogipoo
dae710f9a6
Make leaderboard top not fade by default
2018-12-27 17:29:55 +09:00
Dean Herbert
67e200e1b2
Leaderboard design updates
2018-12-27 15:52:40 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
Dean Herbert
2353c204ee
Renaming
2018-12-26 20:05:57 +09:00
smoogipoo
2f32c4d4d1
Fix title of match song select
2018-12-25 17:17:51 +09:00
smoogipoo
02365ee5ba
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 23:23:21 +09:00
Dan Balasescu
e6c197e9aa
Merge branch 'master' into improve-text-search
2018-12-22 16:38:50 +09:00
smoogipoo
daa6292e08
Split results screen to allow for extensibility
2018-12-22 15:39:06 +09:00
smoogipoo
ac0e6f8d42
Fix post-merge issues
2018-12-22 15:35:22 +09:00
smoogipoo
bdb6e03dfb
Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
...
# Conflicts:
# osu.Game/Online/Leaderboards/Leaderboard.cs
# osu.Game/Online/Leaderboards/LeaderboardScore.cs
# osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
# osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
Dean Herbert
787e65c3c5
Reduce generic-ness
2018-12-22 15:20:35 +09:00
smoogipoo
e657f13c15
Separate out Leaderboard into BeatmapLeaderboard
2018-12-22 14:44:36 +09:00
smoogipoo
8a2cc64bfa
Split results screen to allow for extensibility
2018-12-21 16:34:03 +09:00
Dean Herbert
eec5afa382
Change inspection and add redundant parenthesis to appease codefactor
2018-12-15 16:37:37 +09:00
Dean Herbert
3892454ecc
Improve the way text search works at song select
2018-12-15 16:34:48 +09:00
Dean Herbert
4433346a1f
Merge branch 'master' into star-filtering
2018-12-14 20:19:59 +09:00
smoogipoo
d9fc7c7d66
Separate out Leaderboard into BeatmapLeaderboard
2018-12-14 19:51:27 +09:00
smoogipoo
5f0069eb83
Fix incorrect ruleset being sent to API
2018-12-14 17:35:05 +09:00
smoogipoo
56fd4b95cd
Fix mod/beatmap selection not always working
2018-12-14 13:38:27 +09:00
smoogipoo
208273f16a
Merge branch 'timeshift'
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-13 17:06:20 +09:00
smoogipoo
49dd6ae9b0
Move a lot more of PlaySongSelect into SongSelect
2018-12-12 13:21:44 +09:00
smoogipoo
1ac615b490
Renamespace
2018-12-10 19:27:25 +09:00
smoogipoo
10b526504a
Move ModOverlay to SongSelect
2018-12-06 19:29:18 +09:00
smoogipoo
a7ac544e12
Add interface for the multiplayer screen short title
2018-12-04 17:43:44 +09:00
Dean Herbert
415349e6ef
Add missing return
2018-12-04 12:14:26 +09:00
Dean Herbert
a33865efce
Fix home button being cancelled by mod select
2018-12-04 12:06:05 +09:00
smoogipoo
b1c5b43767
Fix post-rebase errors
2018-11-30 18:46:47 +09:00
smoogipoo
10ed09521c
Add leaderboard display for local scores
2018-11-30 18:40:53 +09:00
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
smoogipoo
d07a724970
Only allow replay screen changes in menu + songselect
2018-11-30 18:25:54 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
Dean Herbert
6cd69b794d
Fix leaderboard accessing drawables in a possibly invalid state
2018-11-22 19:08:46 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Kyle Chang
214ed43b81
Check if SongSelect is current screen before playing selected song
2018-10-30 23:47:54 -04:00
Kyle Chang
c7e950af7f
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
2018-10-29 00:04:51 -04:00
Kyle Chang
886dd0f0d4
Remove unneeded using directive
2018-10-28 13:21:12 -04:00
Kyle Chang
2b736c3cd6
Make beatmap edit button reload beatmap without mods
2018-10-28 13:04:45 -04:00
Kyle Chang
f8a8c7cb6b
Stop transferring track when editing
2018-10-28 12:43:19 -04:00
HoLLy
cf3b4447eb
Fade only textContainer instead of entire MetadataSection
2018-10-26 13:35:51 +02:00
HoLLy
88aca46500
Fade MetadataSection back in if non-null Text is set
2018-10-24 18:53:22 +02:00
Unknown
d83ce7e4bb
don't allow null values in FilterCriteria, ensure values in test instead
2018-10-19 12:22:10 +02:00
Unknown
11dad7bf74
filter beatmaps by star range
2018-10-10 16:46:02 +02:00
Dean Herbert
2babdc079c
Merge pull request #3568 from smoogipoo/fix-beatmap-details
...
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
Dean Herbert
d28b9860ff
Don't use "beatmapset" terminology
2018-10-10 19:26:35 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
6d24bde72b
Fix beatmap details not displaying
2018-10-09 17:39:27 +09:00
ekrctb
68980fc477
Adjust usage of Handle(Non)PositionalInput to follow framework update
2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5
Use UIEvent level getters for modifier keys.
2018-10-02 13:26:36 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
Dean Herbert
6841d5c2ec
Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework
2018-09-28 18:32:59 +09:00
Dean Herbert
a4bf21268b
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:59:18 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
smoogipoo
cb500e80e4
Make BeatmapInfoWedge present until info is not null
2018-09-25 14:45:26 +09:00
Paul Teng
654345f380
Remove duplicate condition test
2018-09-20 22:32:24 -04:00
Paul Teng
1644719893
Update SongSelect.cs
2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a
Test if there are beatmaps when click on delete btn
2018-09-20 22:00:20 -04:00
Dean Herbert
37f3035437
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-20 18:39:48 +09:00
smoogipoo
62135c39aa
Cleanup
2018-09-20 12:56:39 +09:00
smoogipoo
7b8094d731
Move text size/padding out of constructor
2018-09-20 12:53:45 +09:00
Dean Herbert
b2cf636ab5
Merge branch 'localisation-changes' into update-framework
2018-09-20 00:29:31 +09:00
smoogipoo
38a3c2a820
Fix song select wedge sometimes not updating when localisation changes
2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4
Apply changes in-line with framework localisation changes
2018-09-19 14:07:46 +09:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Unknown
04853b8c83
don't show StatusPill without a difficulty
2018-09-13 13:49:57 +02:00
Unknown
5414ce9932
add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet
2018-09-13 10:18:20 +02:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete
2018-09-07 16:48:01 +09:00
Dean Herbert
c23b9b61a8
Simplify implementation in line with framework improvements
2018-09-06 17:28:08 +09:00
Dean Herbert
e63f60231a
Optimise carousel memory usage by unloading off-screen panels
2018-09-06 13:31:37 +09:00
Dean Herbert
fa569e5ae4
Offer to import skins on first startup
2018-09-03 10:10:39 +09:00
Dean Herbert
144e80dff6
Add "import all skins from stable" option (and mass delete)
2018-09-03 10:10:04 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
919e78a89a
Attempt to fix cross-thread database usage
2018-08-29 01:42:25 +09:00
smoogipoo
e7a5816d27
Use GetAsync for all samples
2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
Dean Herbert
18aa30fcb0
Unbind song select's ruleset to avoid test failures
2018-08-20 14:27:32 +09:00
smoogipoo
970aa811bd
Fix mods not being reset prior to ruleset changing
2018-08-14 13:19:50 +09:00
Dean Herbert
4453b5faca
Cache mods at PlaySongSelect
2018-08-08 12:43:08 +09:00
Dean Herbert
4cb7063801
Add automated testing of mod preservation/removal
2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c
Fix mod selection not restoring when re-entering song select
2018-08-07 14:49:44 +09:00
Dean Herbert
9ab56bc4ef
Make Ruleset non-public
2018-07-31 16:35:51 +09:00
Dean Herbert
95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
Dean Herbert
1b456fd716
Fix a potential InvalidOperationException when entering song select
...
Closes #3052 .
2018-07-23 13:11:06 +02:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
Dean Herbert
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
Dean Herbert
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
Dean Herbert
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods
2018-07-17 13:41:02 +09:00
Dean Herbert
4f5578245e
Fix regression causing previews to not play
2018-07-13 21:45:49 +09:00
Dean Herbert
63c40e9051
Remove unnecessary cache operations
2018-07-13 21:45:42 +09:00
Dean Herbert
bbb11a4066
Fix regression in drawable rank first display
2018-07-13 19:53:29 +09:00
Dean Herbert
ac078153ae
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
2018-07-13 14:20:56 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
9e59b4a8e2
Fix SongSelect binding to ruleset too early
...
Causes music to stop playing while at main menu.
2018-07-10 01:29:24 +09:00
Dan Balasescu
ee4607c86e
Merge branch 'master' into fix-exit-race-condition
2018-07-09 19:02:37 +09:00
Dean Herbert
49e94850b6
Fix being able to trigger player before carousel is ready
...
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
Dean Herbert
09b3375a9d
Fix pressing escape too fast causing multiple exit attempts at song select
2018-07-09 18:12:23 +09:00
smoogipoo
0a67e5a274
Fix some possible null reference exceptions
2018-07-09 17:09:17 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
Dean Herbert
e28a610757
Fix mods not correctly resetting when changing ruleset at song select
2018-07-05 13:22:52 +09:00
Dean Herbert
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Joehu
d476842c44
Fix FooterButton clicking area
2018-07-02 22:03:17 -07:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder
2018-07-02 17:17:40 +09:00
smoogipoo
4070c1a888
Merge remote-tracking branch 'origin/master' into non-null-ruleset
...
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dean Herbert
2c597874bf
Fix leaderboard showing placeholder briefly when entering song select
2018-07-01 18:17:02 +09:00
smoogipoo
6d6436c8d3
Fix ruleset not getting updated if changed
2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626
SongSelect needs to recache as IBindable
2018-06-29 20:50:30 +09:00
Dean Herbert
06bd3d4815
Use IBindable where possible
2018-06-29 20:28:28 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset
2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b
Ensure toolbar triggers updates to SongSelect's ruleset
2018-06-29 19:32:42 +09:00
Dean Herbert
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
Dean Herbert
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
Dean Herbert
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
Dean Herbert
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad
Fix review issues
2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f
Remove error logging
...
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572
Move leaderboard update scheduling to a more central method
2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983
Privatise game ruleset and access via DI
...
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
Dean Herbert
96100a2200
Remove schedule logic (seems unnecessary)
2018-06-20 17:41:48 +09:00
Dean Herbert
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
smoogipoo
e77084bec4
Give OsuScreen a mutable BindableBeatmap
2018-06-06 20:19:53 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips
2018-06-06 09:06:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour
2018-06-06 08:27:28 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
DrabWeb
a7bab14b30
Add tooltip to ScoreComponentLabel.
2018-06-03 22:26:30 -03:00
DrabWeb
db4c26e1ab
Rewrite ScoreComponentLabel.
2018-06-03 22:22:44 -03:00
Joehu
bd7c9cd8bf
Set 'Colour' when creating 'textFlow'
2018-06-03 17:41:34 -07:00
Joehu
5c713ac2ab
Use default colour in MetadataSection
2018-06-03 07:51:57 -07:00
Joehu
dc2a004c87
Remove link colours for all unlinked text
2018-06-02 12:04:58 -07:00
Dean Herbert
5c2a2e394e
Fix incorrect async logic in BeatmapInfoWedge
...
Closes #2653 .
Alternative to #2657 .
2018-06-01 20:31:29 +09:00
Joehu
b4d621a2cb
Add link colour to beatmap source
2018-05-31 10:21:22 -07:00
Dan Balasescu
76567ae98b
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:42:58 +09:00
Dean Herbert
a28e71995d
Offload database query to task
...
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
Dean Herbert
54e53f7190
Fix player getting loaded when exiting song select
2018-05-30 15:48:20 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Joehu
46c6c1d07e
Allow drag clicking footer and filter on song select
2018-05-20 20:25:39 -07:00
Dean Herbert
d20011ba58
Fix an endless feedback loop
2018-05-17 17:56:29 +09:00
Dean Herbert
db0470243a
Fix nullref when changing ruleset at main menu
2018-05-13 12:55:54 +09:00
smoogipoo
fd9796d08c
Remove some unnecessary changes
2018-05-11 14:13:52 +09:00
smoogipoo
816ad5c426
Pass down ruleset to the buffered wedge
2018-05-11 14:10:53 +09:00
smoogipoo
fbd7ccc03f
Make BeatmapInfoWedge display properly for converts
2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20
Implement ruleset-specific beatmap statistics
2018-05-07 15:51:08 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
Dean Herbert
3886e75959
Fix potentially missing group headers in beatmap carousel
2018-04-24 01:52:25 +09:00
Dean Herbert
2d1cef79d6
Fix instability in carousel item sorting
2018-04-23 19:01:01 +09:00
Dean Herbert
c77f339444
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
2018-04-20 12:41:38 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
Dean Herbert
f7ca6267b1
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
2018-04-19 20:53:06 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
Dean Herbert
e395a47112
Changes to naming and text
2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
2018-04-18 19:46:59 +09:00
Dean Herbert
1728dd6502
Make BeatmapSetOverlay accept nulls everywhere
2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
2018-04-18 16:41:01 +09:00
Dean Herbert
1be2571d33
Make BeatmapSetOverlay accept nulls everywhere
2018-04-18 16:08:45 +09:00
Dean Herbert
f62677222c
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
2018-04-18 13:08:53 +09:00
Dean Herbert
188c8ce1e7
Remove unnecessary score nulling (already happens in PlaceholderState_Set)
2018-04-18 11:58:55 +09:00
Dean Herbert
a27f39a555
Add documentation explaining intertwining logic
2018-04-18 11:57:06 +09:00
smoogipoo
9af6ef1864
Remove extra unneded safety
2018-04-16 17:48:49 +09:00
smoogipoo
b9220a1e29
Fix leaderboard placeholder sometimes disappearing indefinitely
2018-04-16 17:39:55 +09:00
smoogipoo
1b9d54a6ad
Fix various data races causing crashes or incorrect leaderboard states
2018-04-16 17:39:03 +09:00
Dean Herbert
81f0649e44
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
2018-04-13 19:50:44 +09:00
tgi74000
1a2b1d4c98
Use the already existent RightMouseScrollbar field
2018-04-13 11:32:33 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200
Add right click scrolling in song select (and its option)
2018-04-13 11:09:49 +02:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id
2018-04-10 16:05:32 +09:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect
2018-04-06 12:37:16 +03:00
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay.
...
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
2018-04-04 21:46:31 +05:30
smoogipoo
69e2d4fd22
Make CarouselRoot a nested class
2018-04-02 15:24:08 +09:00
smoogipoo
82a847b820
Extract random selection logic into CarouselRoot
2018-04-02 15:16:10 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
Endrik Tombak
7e30375443
Use selectNextRandom instead
2018-03-30 10:46:46 +03:00
Endrik Tombak
3f65e3a7e3
Make selection at random when last was null
2018-03-30 00:15:32 +03:00
smoogipoo
097ab66182
Fix resharper error
2018-03-25 01:54:25 +09:00
Dean Herbert
0e669c9a3f
Fix many warnings
2018-03-24 18:23:22 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
d4aeb3d00b
Fix BeatmapCarousel's flush not correctly applying selection changes
...
They may have been delayed until the next Update, which is too late in this case.
2018-03-23 12:10:13 +09:00
Dean Herbert
62229300c4
Fix DummyRuleset getting selected
...
Resolves #2261 .
2018-03-22 00:26:48 +09:00
FreezyLemon
95c84ea7fe
remove (now) unnecessary line
2018-03-12 23:00:06 +01:00
FreezyLemon
ddc1f03a96
deselect autoplay button after ctrl-enter play
...
before, the mod was removed, but the button was still active
2018-03-12 22:35:45 +01:00
Dean Herbert
db2a663234
Use private instead of protected
2018-03-11 01:26:03 +09:00
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change.
2018-03-09 19:39:28 +05:30
naoey
d04f47718f
Make song select choose random when initial selection fails.
...
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
naoey
25fb527cc7
Remove previous fix and move filtered logic to carousel.
...
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
2018-03-09 15:51:00 +05:30
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps
2018-03-08 13:02:57 +09:00
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09:00
naoey
a57dc154f9
More specific tests.
2018-03-03 20:34:29 +05:30
naoey
307147a8a3
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
2018-03-03 16:10:22 +05:30
naoey
fb724ca8a7
Make song select ensure current beatmap is always playable in the active ruleset.
...
- Add a to TestCasePlaySongSelect testing this scenario
2018-03-03 16:09:24 +05:30
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing
2018-02-28 22:53:02 +09:00
Dan Balasescu
b898226a91
Merge branch 'master' into fix-mod-select
2018-02-28 21:52:07 +09:00
Dan Balasescu
a3d26d7d55
Merge branch 'master' into fix-song-select-iteration
2018-02-28 21:40:25 +09:00
Dean Herbert
08497427fd
Merge branch 'master' into fix-multiple-tracks-playing
2018-02-28 15:32:16 +09:00
Dean Herbert
4a52db14d1
Fix depth of already-visible panels not being updates after a sorting change
2018-02-28 14:18:25 +09:00
Dean Herbert
510ecd7c87
Ensure selection is finalised before exiting song select
...
Resolves #2080 .
2018-02-28 00:07:28 +09:00
Dean Herbert
84a8fbe0b3
Fix null ref
2018-02-27 21:26:06 +09:00
Dean Herbert
034875be47
Fix bindings not being unbound on ModSelect
...
Resolves #2018 .
Closes #2079 .
2018-02-27 20:45:32 +09:00
Dean Herbert
9b44f447ca
Fix song select iteration when all panels are filtered
...
Resolves #2069 .
2018-02-27 17:52:12 +09:00
Dean Herbert
f2b3d9a0e8
Change some missed instances
2018-02-22 14:17:35 +09:00
Dean Herbert
ddf49c2e65
Fix intro not being replaced by a playable song when entering song select
2018-02-16 10:45:15 +09:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Shane Woolcock
d603d032d5
Inlined delete beatmap dialog
2018-02-13 16:26:05 +10:30
Shane Woolcock
8d313486b3
Add a confirmation dialog to the Delete option in the beatmap context menu
2018-02-13 00:40:34 +10:30
