recapitalverb
a7c2fd078f
Fix remaining cases
2020-02-14 20:27:21 +07:00
recapitalverb
c753cb46c5
Use [Resolved] wherever possible
2020-02-14 20:14:00 +07:00
smoogipoo
9eaf372587
Immediately update selected state
2020-02-14 21:17:07 +09:00
smoogipoo
b92f1ad68d
Implement match subscreen re-design
2020-02-14 20:48:09 +09:00
smoogipoo
2ea8c47c83
Fix incorrect footer button size
2020-02-14 20:44:41 +09:00
smoogipoo
b762e5e8a5
Implement overlined components
2020-02-14 20:42:14 +09:00
recapitalverb
6d87d22a84
Remove duplicated dependency on AudioManager
2020-02-14 18:40:58 +07:00
Dan Balasescu
851e353093
Merge branch 'master' into fix-player-loader-focused-overlay-interaction
2020-02-14 20:36:38 +09:00
smoogipoo
929eb4f035
Add match footer
2020-02-14 20:35:52 +09:00
smoogipoo
d0b7b7f53a
Re-layout match settings overlay
2020-02-14 20:34:15 +09:00
smoogipoo
d5496321e2
Implement leaderboard chat display
2020-02-14 20:31:55 +09:00
smoogipoo
c75a774297
Extract participants list from the room inspector
2020-02-14 20:27:37 +09:00
smoogipoo
80fd9485a9
Refactor ready button to support selected playlist item
2020-02-14 20:18:53 +09:00
smoogipoo
c0dba63278
Remove match info
2020-02-14 20:14:25 +09:00
smoogipoo
b0793b06ed
Re-implement the match header
2020-02-14 20:10:36 +09:00
smoogipoo
b5f048ce96
Merge branch 'match-songselect-playlist-logic' into match-subscreen-redesign
2020-02-14 19:59:15 +09:00
smoogipoo
f31220c1ee
Fix exception when adding duplicate items
2020-02-14 19:56:43 +09:00
Dean Herbert
2fa7143cda
Merge pull request #7835 from peppy/player-loader-code-quality
...
Improve PlayerLoader code quality
2020-02-14 19:55:31 +09:00
Dean Herbert
14f632b532
Merge branch 'master' into match-detail-area
2020-02-14 19:54:17 +09:00
Dean Herbert
e1a1403701
Merge pull request #7832 from smoogipoo/custom-detail-area
...
Make beatmap detail area abstract
2020-02-14 19:38:19 +09:00
Dan Balasescu
45734f8e8d
Merge branch 'master' into player-loader-code-quality
2020-02-14 19:35:40 +09:00
Dean Herbert
4d4ec3515d
Fix player loading sequence continuing even when a priority overlay is visible
2020-02-14 19:16:08 +09:00
Dean Herbert
a6de5853e4
Merge branch 'master' into player-loader-code-quality
2020-02-14 18:29:54 +09:00
Dean Herbert
2808f8167d
Use more regions
2020-02-14 18:28:58 +09:00
Dean Herbert
b69d1ad678
Reorder and clean up PlayerLoader
2020-02-14 18:22:57 +09:00
Dean Herbert
be30ef3cca
Move BeatmapMetadataDisplay to its own class
2020-02-14 18:13:52 +09:00
Dan Balasescu
745de8ad7f
Merge branch 'master' into fix-cursor-cs-scaling
2020-02-14 18:11:18 +09:00
smoogipoo
f0f739707f
Add playlist support to match song select
2020-02-14 17:51:42 +09:00
Dean Herbert
66910f1ee3
Remove unnecessary bindable setter
2020-02-14 17:50:53 +09:00
Dean Herbert
48dcb91118
Merge branch 'master' into custom-detail-area
2020-02-14 17:40:12 +09:00
smoogipoo
5ec9f454d5
Implement the match beatmap detail area
2020-02-14 17:20:38 +09:00
Dean Herbert
61a7f04efb
Add a sane key up delay to relax mod
2020-02-14 17:13:50 +09:00
smoogipoo
25e399f11b
Merge branch 'match-playlist' into match-detail-area
2020-02-14 17:04:22 +09:00
Dan Balasescu
6aab9b7a08
Merge branch 'master' into fix-timeline-seek-while-playing
2020-02-14 17:02:34 +09:00
smoogipoo
aceba8791c
Clean up selection handling
2020-02-14 16:56:44 +09:00
smoogipoo
afd3e4604b
Fix race condition causing selection to be reset incorrectly
2020-02-14 16:48:23 +09:00
smoogipoo
1909ea2bd3
Add a way to hide the drag handle
2020-02-14 16:09:19 +09:00
Dean Herbert
a75715607b
Move drawable load to asynchronous context
2020-02-14 15:41:46 +09:00
Dean Herbert
720ceca78a
Final tidy-up pass
2020-02-14 15:38:47 +09:00
smoogipoo
5e871f9838
Make room playlist use the common rearrangeable design
2020-02-14 15:36:47 +09:00
smoogipoo
eb75d26c8f
Extract common rearrangeable list design
2020-02-14 15:36:16 +09:00
Dean Herbert
edf9cfc863
API can't be null on load
2020-02-14 15:36:06 +09:00
Dean Herbert
6f1cecd86f
Move LoadComplete up in method
2020-02-14 15:35:39 +09:00
Dean Herbert
7e6c194d4a
Add missing xmldoc
2020-02-14 15:34:46 +09:00
Dean Herbert
4d5abab2ee
Remove unnecessary content private storage
2020-02-14 15:29:50 +09:00
Dean Herbert
76cfe1f42c
Merge branch 'master' into online-container
2020-02-14 15:18:27 +09:00
smoogipoo
eb14dbcd77
Initial implementation of rearrangeable playlist
2020-02-14 15:01:45 +09:00
smoogipoo
3a0b2508d4
Fix possible nullrefs
2020-02-14 15:01:34 +09:00
Dean Herbert
0e439e3a70
Fix missing dependency in ZoomableScrollContainer test
2020-02-14 14:41:55 +09:00
Dean Herbert
884a5fbad4
Fix osu! gameplay cursor not adjusting to mod/convert circle size changes
2020-02-14 14:30:15 +09:00
Dan Balasescu
60d796ae3f
Merge branch 'master' into fix-timeline-seek-while-playing
2020-02-14 13:04:38 +09:00
Dan Balasescu
f64f934204
Merge branch 'master' into span_fromHex
2020-02-14 12:09:34 +09:00
Dan Balasescu
a9bfe9f7f3
Merge pull request #7800 from peppy/fix-editor-time-change-display
...
Fix editor hit objects displaying incorrectly after StartTime change
2020-02-14 11:33:42 +09:00
Berkan Diler
50899ddccb
Use Span for OsuColour.FromHex
2020-02-14 03:19:25 +01:00
voidedWarranties
368e6f9579
Use CarouselBeatmap.State to select
2020-02-13 17:47:16 -08:00
voidedWarranties
c871f07d2e
Use CarouselBeatmap action to select beatmap
2020-02-13 17:14:46 -08:00
Andrei Zavatski
c68c347503
Remove unwanted property interpolation
2020-02-14 00:40:52 +03:00
Lucas A
049b0d93d1
Add back default content fade transitions
2020-02-13 21:40:25 +01:00
Andrei Zavatski
ab84f4085a
Fix possible error on SpotlightsLayout disposal
2020-02-13 23:20:45 +03:00
Andrei Zavatski
11ec3ddf1e
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings
2020-02-13 23:20:05 +03:00
Bartłomiej Dach
0f25864fae
Textbox -> TextBox rename pass
2020-02-13 21:04:53 +01:00
Lucas A
dac0148c94
Apply review suggestions.
2020-02-13 20:08:14 +01:00
Malox10
10e3af094c
Merge branch 'master' into hoverable-timestamps
2020-02-13 18:06:15 +01:00
Andrei Zavatski
791bf6bc01
Make username text italic
2020-02-13 19:03:07 +03:00
Andrei Zavatski
e67e4f708e
Adjust country name design
2020-02-13 19:01:26 +03:00
Dean Herbert
5b3f0bbb0a
Merge branch 'master' into fix-editor-time-change-display
2020-02-13 23:55:52 +09:00
Dean Herbert
d7c71cd0c1
Merge branch 'master' into update-placement-more-often
2020-02-13 23:55:18 +09:00
Malox10
c08398a404
Merge branch 'master' into hoverable-timestamps
2020-02-13 15:21:09 +01:00
Dean Herbert
e181a95c85
Remove unused using
2020-02-13 22:28:37 +09:00
Maximilian Junges
b2fbeab773
simplify string formatting and fix color
2020-02-13 14:07:14 +01:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item
2020-02-13 21:41:23 +09:00
Andrei Zavatski
382cc1a91b
Fix incorrect overlays overlapping
2020-02-13 14:26:35 +03:00
Andrei Zavatski
11c59a141f
Add background to rankings header
2020-02-13 14:12:10 +03:00
Andrei Zavatski
f05c1de4c1
Fix possible nullref
2020-02-13 14:11:53 +03:00
Andrei Zavatski
2324296bf4
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings
2020-02-13 13:39:35 +03:00
Andrei Zavatski
a677aa6cfc
Add rankings overlay to the game
2020-02-13 13:39:33 +03:00
Dean Herbert
b9a296d3f9
Merge branch 'master' into remove-current-item
2020-02-13 19:34:15 +09:00
Dean Herbert
28ca1a5bcc
Merge branch 'master' into participants-bindable
2020-02-13 19:31:50 +09:00
Dean Herbert
d633396878
Merge pull request #7816 from smoogipoo/missing-nullcheck
...
Add missing null-allowance to leaderboard
2020-02-13 19:30:43 +09:00
Dean Herbert
80ead1c979
Merge pull request #7813 from peppy/update-framework
...
Update framework
2020-02-13 19:29:59 +09:00
smoogipoo
bc1c4f6b58
Add missing null-allowance
2020-02-13 19:04:23 +09:00
smoogipoo
bce9c8f3f3
Make room participants into a bindable list
2020-02-13 18:59:15 +09:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal
...
Fix disposal-related errors by making WorkingBeatmap non-disposable
2020-02-13 18:52:47 +09:00
Dean Herbert
49a1725749
Merge pull request #7812 from smoogipoo/playlist-bindables
...
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00
smoogipoo
75bef15583
Remove "current" multiplayer room item
2020-02-13 18:48:28 +09:00
Dan Balasescu
4b7a053544
Merge branch 'master' into update-placement-more-often
2020-02-13 18:43:27 +09:00
Dean Herbert
be2d1c6b43
Update framework
2020-02-13 18:35:31 +09:00
Dean Herbert
d6263adb7b
Merge pull request #7806 from peppy/timeline-zoom-button-repeat
...
Add mouse down repeat support to timeline zoom buttons
2020-02-13 18:35:11 +09:00
Dean Herbert
24e7c3e11b
Merge pull request #7811 from smoogipoo/mod-expansion-types
...
Improve extensibility of mod display expansion
2020-02-13 18:34:46 +09:00
smoogipoo
91edadfe9d
Make playlist beatmap and ruleset into bindables
2020-02-13 18:12:47 +09:00
smoogipoo
d4f14e552a
Improve extensibility of mod display expansion
2020-02-13 18:05:53 +09:00
Dan Balasescu
c384e3cfc2
Merge branch 'master' into timeline-zoom-button-repeat
2020-02-13 18:04:36 +09:00
Dan Balasescu
97a03729b2
Merge branch 'master' into fix-blueprint-outside-container
2020-02-13 17:54:20 +09:00
Dan Balasescu
d80e9550fb
Merge branch 'master' into timeline-zoom-button-repeat
2020-02-13 17:38:45 +09:00
Dan Balasescu
5a90e6f9b5
Merge branch 'master' into fix-blueprint-outside-container
2020-02-13 17:32:49 +09:00
Dan Balasescu
48a6583216
Merge branch 'master' into disable-interaction-progress-bar
2020-02-13 17:20:22 +09:00
voidedWarranties
ad0de27964
Safer dependency injection and accessibility levels
2020-02-12 22:11:26 -08:00
Dean Herbert
e2e6e67f79
Merge branch 'master' into difficultyadjust-order
2020-02-13 14:07:47 +09:00
Dean Herbert
53b62816f8
Add index constants for cross-class safety
2020-02-13 14:07:37 +09:00
smoogipoo
6f7196b0b8
Make beatmap detail area abstractable
2020-02-13 13:46:23 +09:00
Dean Herbert
045d1f9c5b
Disallow seeking on osu!direct download progress bars
2020-02-13 13:36:53 +09:00
Dean Herbert
6a2b3c5c02
Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
...
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
voidedWarranties
f8b69fe632
Remove unnecessary carousel variable, fix code formatting
2020-02-12 20:11:39 -08:00
voidedWarranties
b126c00292
Use dependency loader to get SongSelect instance
2020-02-12 19:05:08 -08:00
Dean Herbert
118f862342
Fix not being able to seek using scroll wheel in timeline while playing track
2020-02-13 12:03:50 +09:00
Dean Herbert
03bf10f9a2
Remove unused using statement
2020-02-13 11:15:00 +09:00
Dean Herbert
487dd47c9e
Add mouse down repeat support to timeline zoom buttons
2020-02-13 11:14:09 +09:00
Andrei Zavatski
b1b2e4a041
Simplify parent comment assignment
2020-02-13 04:50:04 +03:00
Dean Herbert
e34a24a063
Update placement blueprint more often for better display
2020-02-13 10:45:16 +09:00
Dean Herbert
2b6f99d404
Standardise placement blueprint creation and destruction
2020-02-13 10:12:56 +09:00
Andrei Zavatski
c391a464a5
Add tests
2020-02-13 04:06:34 +03:00
Dean Herbert
b65e839bd2
Simplify blueprints by removing visible state
2020-02-13 10:00:09 +09:00
Andrei Zavatski
483bbac6fd
Simplify CommentsPage.onCommentRepliesReceived
2020-02-13 03:13:56 +03:00
Dean Herbert
0fe41fd50a
Fix blueprint showing even when mouse outside of container
2020-02-13 09:03:48 +09:00
voidedWarranties
a8eb9ba45c
Update xmldoc
2020-02-12 15:55:16 -08:00
Andrei Zavatski
b0db155565
Make replies addition more consistent
2020-02-13 02:47:13 +03:00
Andrei Zavatski
c6f8e157fd
Make loadedReplies dictionary private
2020-02-13 02:37:41 +03:00
Andrei Zavatski
5201c1c87b
Use new algorithm for comments tree creation
2020-02-13 02:21:13 +03:00
Andrei Zavatski
e2b3494352
Remove dependency on load state for DrawableComment.AddReplies
2020-02-13 00:19:21 +03:00
Andrei Zavatski
ec9c01a75f
Merge remote-tracking branch 'refs/remotes/ppy/master' into subcomments-alter-new
2020-02-12 23:32:28 +03:00
Andrei Zavatski
62051c036b
Small CommitButton improvements
2020-02-12 13:43:56 +03:00
Andrei Zavatski
ab7adb3a97
Adjust button colours
2020-02-12 13:28:49 +03:00
Andrei Zavatski
760be29015
Merge remote-tracking branch 'refs/remotes/ppy/master' into comment-editor
2020-02-12 13:23:35 +03:00
Dean Herbert
f7ee675102
Clear and revert to negative infinity, avoiding transforms getting left behind on StartTime change
2020-02-12 19:02:54 +09:00
Dean Herbert
c386589cc0
Reapply current state, not idle
2020-02-12 19:02:25 +09:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay
2020-02-12 16:52:42 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness
2020-02-12 15:01:15 +09:00
voidedWarranties
e9b5137147
Remove >-1 limitation by using a separate constructor
2020-02-11 21:52:22 -08:00
Dan Balasescu
e8ea0dcc02
Merge branch 'master' into info-column-min-width
2020-02-12 13:45:16 +09:00
voidedWarranties
2901ec9f26
Select specific difficulties using their icons
2020-02-11 20:05:26 -08:00
Andrei Zavatski
9ac6c271ac
Naming adjustments
2020-02-12 02:05:45 +03:00
Andrei Zavatski
53a2b65dbd
Create dependency between textbox and commit button
2020-02-12 01:35:08 +03:00
Andrei Zavatski
5a3daf1bd7
Implement CommitButton
2020-02-12 00:57:06 +03:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay
2020-02-11 21:07:26 +01:00
Andrei Zavatski
c022cf72b5
Implement CancellableCommentEditor
2020-02-11 20:47:51 +03:00
Andrei Zavatski
730c115f49
Fix some size values
2020-02-11 20:11:22 +03:00
Lucas A
b9e10cb498
Privatize ViewTarget
2020-02-11 18:10:46 +01:00
Andrei Zavatski
829152c8e8
Implement EditorTextbox
2020-02-11 20:08:24 +03:00
Andrei Zavatski
482f622c94
CommentEditor basic implementation
2020-02-11 18:46:49 +03:00
Dean Herbert
2a67246b21
Ensure game is at main menu before performing exit on screen
2020-02-11 22:37:38 +09:00
Maximilian Junges
6278338448
implement custom tooltip for DrawableDate
2020-02-11 14:21:12 +01:00
recapitalverb
2be7d1a873
Remove redundant type specification
2020-02-11 18:19:08 +07:00
recapitalverb
44568ac9e6
Avoid covariant array conversion
2020-02-11 17:36:10 +07:00
recapitalverb
28a39fd8fa
Use explicit typing
2020-02-11 17:12:32 +07:00
recapitalverb
17791259ed
Fix InfoColumn minWidth implementation
2020-02-11 16:21:31 +07:00
voidedWarranties
3d1183eea0
Merge branch 'master' into difficultyadjust-order
2020-02-10 16:46:24 -08:00
voidedWarranties
ca237fd987
Simplify ordering by using only numbers, add xmldoc
2020-02-10 16:21:49 -08:00
Andrei Zavatski
0b6558dc40
Add SpotlightsLayout to RankingsOverlay
2020-02-11 02:35:23 +03:00
Andrei Zavatski
b04a4b5c8a
Implement SpotlightsLayout
2020-02-11 01:44:56 +03:00
Andrei Zavatski
ed6a35cb9f
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights
2020-02-11 00:18:11 +03:00
Andrei Zavatski
15b4e3386f
Fix incorrect algorithm for comment tree creation
...
Can cause one comment to be redrawn multiple times
2020-02-10 23:57:48 +03:00
TheWildTree
e072042d4e
Match osu-web font size
2020-02-10 21:11:49 +01:00
Bartłomiej Dach
35d5237ddd
Adjust font sizes
2020-02-10 20:40:39 +01:00
Bartłomiej Dach
811553cd60
Remove unnecessary coercions
...
Comparisons to null of nullable numbers are always false.
2020-02-10 20:37:34 +01:00
Bartłomiej Dach
e2950d7027
Extract method to avoid nested ternaries
2020-02-10 20:27:46 +01:00
Andrei Zavatski
d20a860879
CI fix
2020-02-10 16:08:58 +03:00
Andrei Zavatski
8239f21cad
Remove whitespace
2020-02-10 15:52:12 +03:00
Andrei Zavatski
26afe0f31e
Add ability to load long comment trees in CommentsContainer
2020-02-10 15:43:11 +03:00
Dan Balasescu
68e59410d9
Merge branch 'master' into seek-to-endtime-on-placement
2020-02-10 19:26:54 +09:00
smoogipoo
0ab3982494
Unify error handling
2020-02-10 17:25:11 +09:00
Dean Herbert
8186f72507
Remove unused using
2020-02-10 17:12:45 +09:00
smoogipoo
668f36d7f3
Clean up logging
2020-02-10 17:04:31 +09:00
smoogipoo
cef682aa03
Make WorkingBeatmap non-disposable
2020-02-10 17:02:01 +09:00
smoogipoo
51e2a934bd
Fix possible beatmap nullref in logo visualisation
2020-02-10 17:02:00 +09:00
smoogipoo
a988a53d69
Better handle beatmap task cancel exception
2020-02-10 17:02:00 +09:00
dependabot-preview[bot]
2252f79084
Bump Sentry from 2.0.1 to 2.0.2
...
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet ) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases )
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.0.1...2.0.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-10 08:01:14 +00: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
f3c47dc8c9
Merge branch 'master' into seek-to-endtime-on-placement
2020-02-10 14:53:11 +09:00
voidedWarranties
ea521b466f
Switch numerical consts to an enum
2020-02-09 21:37:40 -08:00
Dan Balasescu
bb15153f30
Merge branch 'master' into placement-display-in-timeline
2020-02-10 14:29:01 +09:00
Dan Balasescu
28cf5c7a59
Add accessor
2020-02-10 14:28:43 +09:00
Dan Balasescu
1f3d4e1f72
Merge branch 'master' into string_cleanup
2020-02-10 13:37:17 +09:00
voidedWarranties
137181017b
Naming consistency with osu!web
2020-02-09 20:36:54 -08:00
voidedWarranties
88a56d00bf
Allow specifying order to SettingSource
2020-02-09 20:11:37 -08:00
Dan Balasescu
f4657b8ea8
Merge branch 'master' into fix-virtual-track-beatsync
2020-02-10 13:11:06 +09:00
Maximilian Junges
ed8cb1d6bf
add missing eof newline
2020-02-09 23:46:06 +01:00
Maximilian Junges
3e06324f61
fix formatting issue
2020-02-09 23:39:34 +01:00
Maximilian Junges
867c733809
make score date hoverable
2020-02-09 23:19:32 +01:00
Maximilian Junges
b45f1ef99a
make timestamps hoverable
2020-02-09 22:27:37 +01:00
Dean Herbert
96574a98ad
Use non-zero length for fallback virtual track (allows tests to work as expected)
2020-02-09 21:34:56 +09:00
Dean Herbert
c1f52ef594
Refactor BeatSyncContainer to handle zero length tracks
2020-02-09 21:25:28 +09:00
Dean Herbert
d73ef7c37e
Change DummyBeatmap's track to be 0 length
2020-02-09 21:25:11 +09:00
Dean Herbert
93ff25d2a4
Rename caret class
2020-02-09 15:36:44 +09:00
Dean Herbert
3865090fff
Merge branch 'master' into beat-caret
2020-02-09 14:20:51 +09:00
jorolf
c2e0c83724
change the hierarchy layout
2020-02-08 20:25:16 +01:00
Berkan Diler
5b452293d6
Minor cleanups for legacy beatmap decoders
...
Replaces some string.StartsWith(string, StringComparison.Ordinal) calls with ring.StartsWith(char) , when only one char is compared. Possible since .NET-Standard 2.1
And another LegacyStoryboardDecoder.handleEvents() cleanup, saves some MB of allocations.
2020-02-08 18:05:27 +01:00
Lucas A
30e0a34e50
Wrap Content into a container for animating visibility.
2020-02-08 17:11:31 +01:00
Lucas A
7ca9f4dc20
Apply review suggestions
2020-02-08 17:11:31 +01:00
Lucas A
d3dc0b63ff
Remove string concatenation from ctor
2020-02-08 17:07:26 +01:00
Lucas A
6d51b344ab
Display a loading animation when the user is connecting
2020-02-08 17:07:20 +01:00
Joehu
e0de60a277
Update default background dim to 80% to match stable
2020-02-07 21:03:33 -08:00
Dean Herbert
84d9e3eda7
Merge branch 'master' into fix-accuracy-format
2020-02-08 11:37:03 +09:00
Dean Herbert
801e39a543
Improve xmldoc for PlacementObject
2020-02-08 11:35:27 +09:00
Dean Herbert
5c3880d712
Merge branch 'master' into placement-display-in-timeline
2020-02-08 11:35:17 +09:00
Dean Herbert
7c89e93da5
Merge branch 'master' into sorted-hitresults
2020-02-08 11:19:18 +09:00
Dean Herbert
6758c19625
Merge pull request #7758 from EVAST9919/user-graphs-data
...
Receive historical monthly user playcounts from API
2020-02-08 10:19:39 +09:00
Bartłomiej Dach
9bfd3a1a63
Make PercentageBreakInfoLine use FormatAccuracy
2020-02-08 00:11:19 +01:00
TheWildTree
393b566966
Make PercentageCounter use FormatAccuracy
2020-02-07 22:16:06 +01:00
TheWildTree
8c10d31af9
Make accuracy formatting more consistent
2020-02-07 22:09:45 +01:00
jorolf
1ba8cc904a
Make the caret blink to the beat
2020-02-07 21:42:47 +01:00
TheWildTree
2770fb71b2
Use SortedStatistics where needed
2020-02-07 21:12:21 +01:00
TheWildTree
59cf2037d0
Introduce SortedStatistics
2020-02-07 21:11:58 +01:00
TheWildTree
7395f01919
Use osu-web font sizes
2020-02-07 20:28:02 +01:00
Dean Herbert
91203c2b12
Merge branch 'master' into placement-display-in-timeline
2020-02-08 01:50:24 +09:00
Dean Herbert
51ae741fc7
Merge pull request #7755 from peppy/fix-spinner-placement
...
Fix spinner placement blueprint in multiple ways
2020-02-08 01:49:48 +09:00
Dan Balasescu
4ad20ccd8b
Merge pull request #7754 from peppy/screen-under-timeline
...
Make editor screens display below timeline
2020-02-08 00:47:20 +09:00
Dan Balasescu
411ab2b190
Merge pull request #7746 from peppy/skin-animation-frame-rate
...
Add support for reading skin frame rate from configuration file
2020-02-08 00:37:01 +09:00
Dean Herbert
678eb8ec31
Reduce accessibility to set
...
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-02-08 00:12:23 +09:00
Dean Herbert
0530ef07bd
Merge pull request #7743 from UselessToucan/make_screenshot_manager_a_drawable
...
Make ScreenshotManager a Component
2020-02-08 00:10:35 +09:00
Dan Balasescu
e4c7b9ebc1
Merge branch 'master' into screen-under-timeline
2020-02-08 00:05:45 +09:00
Dan Balasescu
7c715937ca
Merge branch 'master' into skin-animation-frame-rate
2020-02-07 23:52:45 +09:00
Andrei Zavatski
2d1afb66fb
Add history counts to user api
2020-02-07 16:21:47 +03:00
Dean Herbert
2e50e56d7c
Seek to previous object endtime after successful placement
2020-02-07 19:12:09 +09:00
Dean Herbert
a6531bf73e
Don't show distance snap grid for spinners (for now)
2020-02-07 19:09:23 +09:00
Dean Herbert
2082948f9a
Make editor screens display below timeline
2020-02-07 18:23:59 +09:00
Dan Balasescu
476c86f961
Merge branch 'master' into offset-match-stable
2020-02-07 18:21:50 +09:00
Dan Balasescu
71ba3e459b
Merge pull request #7750 from peppy/fix-editor-test-scene
...
Fix editor test scene exiting after loading
2020-02-07 18:07:48 +09:00
Andrei Zavatski
881d192af3
Fix crash when selecting spotlight tab with not-null country
2020-02-07 12:07:16 +03:00
Andrei Zavatski
4ca39135a5
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights
2020-02-07 12:06:42 +03:00
Dean Herbert
56a091674b
Add placement display to timeline
2020-02-07 18:04:10 +09:00
Dean Herbert
e08437c5dc
Track placement object in EditorBeatmap
2020-02-07 18:03:14 +09:00
Dean Herbert
e31d69c749
Add commit status to EndPlacement; call BeginPlacement on initial movement
2020-02-07 18:02:48 +09:00
Dean Herbert
b7996f91fc
Update the windows platform offset to match stable
2020-02-07 17:51:38 +09:00
Andrei Zavatski
dc8dd24405
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights
2020-02-07 11:49:31 +03:00
Dan Balasescu
7b70481a10
Merge branch 'master' into fix-editor-test-scene
2020-02-07 17:20:43 +09:00
Dan Balasescu
a6a285bc09
Merge branch 'master' into fix-editor-snapping-inaccuracy
2020-02-07 17:20:42 +09:00
Dan Balasescu
e6060d5ecc
Merge pull request #7749 from peppy/fix-incorrect-distance-snap-grip
...
Fix incorrect distance snap grid being displayed when in selection mode
2020-02-07 17:20:28 +09:00
Dan Balasescu
5d6e007929
Merge branch 'master' into overlapping-scroll-origin
2020-02-07 16:44:34 +09:00
Dan Balasescu
efa7eb70af
Merge branch 'master' into fix-incorrect-distance-snap-grip
2020-02-07 16:44:33 +09:00
Dean Herbert
8990152315
Fix duration snapping still being incorrect
2020-02-07 16:43:50 +09:00
Dean Herbert
9997ae17bc
Fix editor test scene exiting after loading
2020-02-07 16:42:56 +09:00
Dean Herbert
3aa18abd99
Fix typo in xmldoc
...
Co-Authored-By: Tree <thewildtree@outlook.com>
2020-02-07 16:22:59 +09:00
Dean Herbert
f63bf06373
Fix incorrect distance snap grid being displayed when in selection mode
2020-02-07 16:09:54 +09:00
Dean Herbert
c392ba6a7e
Update framework
2020-02-07 15:46:10 +09:00
Dean Herbert
9181bb41c6
Remove unused using
2020-02-07 15:11:09 +09:00
Dean Herbert
544685be48
Add support for reading skin frame rate from configuration file
2020-02-07 14:58:29 +09:00
Dean Herbert
7460018cd3
Move combo colours to GlobalSkinColours
2020-02-07 14:58:07 +09:00
Dan Balasescu
819973bba3
Merge branch 'master' into make_screenshot_manager_a_drawable
2020-02-07 14:48:50 +09:00
Bartłomiej Dach
5fde4f2c0c
Fix lifetime calculation in overlapping algorithm
...
Changes to lifetime calculation in scrolling rulesets introduced in
#7367 , which aimed to account for the distance between hit objects'
origin and its edge entering the scrolling area, fixed some issues with
hitobjects appearing abruptly, but also regressed some other scenarios.
Upon investigation, the regression was localised to the overlapping
scroll algorithm. The reason for this was two-fold:
* The previous code used TimeAt() to calculate the time of travel from
the hit object's edge to its origin. For other algorithms, that time
can be accurately reconstructed, because they don't have periods of
time where there are multiple hit objects scrolling at different
velocities.
That invariant does not hold for the overlapping algorithm, therefore
it is possible for different values to be technically correct for
TimeAt(). However, the only value that matters for the adjustment
is the one that's indicated by the control point that applies to the
hit object origin, which can be uniquely identified.
* Additionally, the offset returned (even if correct) was applied
externally to the hit object's start time and passed to
GetDisplayStartTime(). In the overlapping algorithm, the choice of
control point used in GetDisplayStartTime() is important, since
the value of the speed multiplier is read within.
Externally rewinding the hit object's start time meant that in some
cases the speed multiplier of the *previous* control point is applied,
which led to hit objects appearing too late if the scrolling rate
decreased.
Because of the above, modify GetDisplayStartTime() to take the offset
into account in all algorithms, and apply the adjustment correctly
inside of them. The constant and sequential algorithms needed no
adjustment from the previous logic, since:
* the constant algorithm disregarded control points, and
* the sequential algorithm would effectively rewind to time = 0,
calculate the absolute distance from time = 0 to the hit object start,
apply the origin offset *to the absolute distance*, and then convert
back to time, applying all control points in sequence. Due to this
it was impossible for control points to get mixed up while
calculating.
As for the overlapping algorithm, the high-level logic is as follows:
* The distance that the origin has to travel is the length of the scroll
plus the distance from the origin to the object edge.
* The above distance divided by the scroll length gives the relative
scroll lengths that the object has to travel.
* As one relative scroll length takes one time range, the relative
travel length multiplied by the time range gives the absolute travel
time of the object origin.
* Finally, the control point multiplier applicable at origin time is
applied to the whole travel time.
Correctness of the above is demonstrated by visual tests added before
and headless unit tests of the algorithms themselves. The sequential
scroll algorithm was not covered by unit tests, and remains uncovered
due to floating-point inaccuracies that should be addressed separately.
2020-02-06 23:13:28 +01:00
UselessToucan
4495192c25
Make ScreenshotManager a Component
...
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-02-06 23:22:30 +03:00
Roman Kapustin
83b2b63d2c
Make ScreenshotManager a Drawable
2020-02-06 23:02:03 +03:00
TheWildTree
c09af0052b
Revert accuracy display and column sorting changes
2020-02-06 20:21:47 +01:00
Andrei Zavatski
5946ad7d80
Fix possible memory leak and better user change test support
2020-02-06 16:54:02 +03:00
Andrei Zavatski
0840033343
Merge remote-tracking branch 'refs/remotes/ppy/master' into logged-out-comments
2020-02-06 16:38:47 +03:00
Dean Herbert
1613198834
Set a sane default keyboard step for mod settings
2020-02-06 19:43:33 +09:00
Dean Herbert
48350638a2
Hide drag handles of all playlist items not currently being dragged
2020-02-06 18:38:00 +09:00
Dean Herbert
0c30e802c0
Merge remote-tracking branch 'upstream/master' into rearrangeable-playlist
2020-02-06 17:40:28 +09:00
Dean Herbert
6b67b601e9
Update framework
2020-02-06 17:35:13 +09:00
Dan Balasescu
edf20e2c3e
Merge branch 'master' into lounge-ruleset-filtering
2020-02-06 15:35:26 +09:00
Dan Balasescu
8d12d820f1
Merge pull request #7734 from peppy/editor-slider-repeat
...
Add the ability to extend hold notes (spinners / sliders etc.) via timeline
2020-02-06 15:35:16 +09:00
