Bartłomiej Dach
d067159435
Recolour elements of editor setup screen to match dropdown theming
2021-10-13 22:32:54 +02:00
smoogipoo
fdf7142711
Remove Room.Position
2021-10-13 21:24:54 +09:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-13 20:17:57 +09:00
Dan Balasescu
d88daf0cc2
Merge pull request #15073 from peppy/fix-player-loader-low-pass
...
Improve `PlayerLoader` audio and visual transitions
2021-10-13 17:01:49 +09:00
Dean Herbert
02689a1b60
Use actual BeatmapInfo rather than PlayableBeatmap.BeatmapInfo for editor writes
2021-10-13 14:50:12 +09:00
Dean Herbert
26a1e40d24
Fix storyboard outro during fail test not being lenient enough
2021-10-13 13:48:57 +09:00
Dean Herbert
ae4dcbd829
Improve PlayerLoader audio and visual transitions
2021-10-13 13:26:20 +09:00
Dean Herbert
3d6602b8df
Ensure FailAnimation is disposed synchronously to avoid test failures
2021-10-11 14:05:31 +09:00
Dean Herbert
794b4c46cf
Split score counter class into two distinct classes to simplify usages
2021-10-10 17:56:32 +09:00
Dean Herbert
06cce0119c
Use localisable format string for comma separator mode
2021-10-10 17:41:16 +09:00
Dean Herbert
446f091d32
Use comma separator for tournament score displays
2021-10-10 16:06:12 +09:00
smoogipoo
bc37cb6f43
Merge branch 'master' into no-more-difficulty-control-points-info
2021-10-08 18:41:17 +09:00
Dean Herbert
436ead421a
Move low pass fail effect to FailAnimation
2021-10-08 12:27:04 +09:00
Dean Herbert
da96cc73d8
Fix dual specification of SuspensionHandler and move fields around slightly
2021-10-07 23:40:47 +09:00
Dean Herbert
310d7965b6
Merge branch 'master' into more-filter-effects
2021-10-07 20:52:38 +09:00
Dan Balasescu
f8e50731b7
Merge pull request #14991 from peppy/intro-tests-no-menu-load
...
Allow intro screens to be created without loading a `MainMenu`
2021-10-07 20:48:54 +09:00
Dean Herbert
ef64c64f0b
Merge branch 'master' into popup-filter-effect
2021-10-07 18:56:07 +09:00
Dan Balasescu
bece807857
Merge pull request #14980 from peppy/difficulty-move-to-beatmap
...
Copy `BaseDifficulty` to `Beatmap<T>` and move the majority of write operations across
2021-10-07 18:43:44 +09:00
Dean Herbert
f98dd1b811
Merge branch 'master' into popup-filter-effect
2021-10-07 18:40:21 +09:00
Jamie Taylor
cc209f0f2d
Add filter effect to fail sequence
2021-10-07 17:55:30 +09:00
Jamie Taylor
5c48340520
Add filter effect to beatmap loading
2021-10-07 17:55:21 +09:00
Dean Herbert
0df409c050
Move difficulty copy to BeatmapModelManager.Save
2021-10-07 17:16:45 +09:00
Dan Balasescu
d50443fdf2
Merge branch 'master' into difficulty-move-to-beatmap
2021-10-07 16:50:10 +09:00
Dean Herbert
f88d898960
Allow intro screens to be created without loading a MainMenu
2021-10-07 16:38:22 +09:00
Dean Herbert
5f129ae33c
Remove local overridden storage of Mods in Player
...
Not required and only causing headaches. Accessing mods should now be
done via `GameplayState`.
Closes #14912 .
2021-10-07 14:53:39 +09:00
Dean Herbert
9705c7b546
Use cloned mods in one more place
2021-10-06 21:30:30 +09:00
Dean Herbert
433e7cd403
Fix rate mods not working if pp counter is displayed
2021-10-06 21:26:30 +09:00
Dean Herbert
4ca97bc60a
Merge branch 'master' into difficulty-move-to-beatmap
2021-10-06 16:14:21 +09:00
Dean Herbert
222997f2b9
Copy difficulty settings back out to BeatmapInfo on editor changes
2021-10-06 15:19:26 +09:00
Dean Herbert
b339c149d8
Copy BaseDifficulty to Beatmap<T> and move all write operations across
2021-10-06 15:10:45 +09:00
Dan Balasescu
e6aa05a4a4
Merge pull request #14978 from peppy/fix-editor-file-selector-textbox-drags
...
Fix dragging on an editor file selection text box causing repeated popover display
2021-10-06 13:52:08 +09:00
Dean Herbert
d9849bcf49
Fix dragging on an editor file selection text box causing repeated popover display
...
Local fix and no tests as this is a pretty weird usage of `TextBox`.
We'll probably want to change it to not use a textbox eventually.
Closes #14969 .
2021-10-06 13:15:05 +09:00
Dan Balasescu
e837a3511d
Merge branch 'master' into beatmap-difficulty-more-interface-usage
2021-10-06 12:18:51 +09:00
Dan Balasescu
4bbff2ebf7
Merge branch 'master' into new-interfaces
2021-10-06 11:38:17 +09:00
Dan Balasescu
9491e5a547
Merge pull request #14954 from peppy/rename-result-response
...
Rename `APIRequest.Result` to `Response`
2021-10-06 10:52:33 +09:00
Dean Herbert
5a4474e1b2
Fix incorrect DI retrieval in ReplayDownloadButton
2021-10-06 05:29:00 +09:00
Dean Herbert
98fef6ece2
Handle judgement reverts with actual display updates
2021-10-05 19:08:30 +09:00
Dean Herbert
bd84a8b749
Merge branch 'new-interfaces' into beatmap-difficulty-more-interface-usage
2021-10-05 18:21:21 +09:00
Dean Herbert
0859c336de
Also dim counter during initial calculation phase
2021-10-05 17:24:36 +09:00
Dean Herbert
f64226ded6
Fix display not displaying correctly after initial load
2021-10-05 17:10:32 +09:00
Dean Herbert
599d82e383
Avoid returning a live IEnumerable
2021-10-05 17:01:07 +09:00
Dean Herbert
fa7f11d906
Add easing to rolling counter value
2021-10-05 16:51:49 +09:00
Dean Herbert
565e888f58
Tidy up attribute retrieval code
2021-10-05 16:40:07 +09:00
smoogipoo
45b63cbad9
Remove unnecessary dependency
2021-10-05 16:03:25 +09:00
Dean Herbert
676df55a0e
Fade display out during rewind (as the value displayed is no longer valid)
2021-10-05 15:39:29 +09:00
Dean Herbert
81a13566bc
Adjust default location slightly, fix alignment of "pp" subtext
2021-10-05 15:28:03 +09:00
Dean Herbert
b6af93d434
Apply some code quality refactoring
2021-10-05 15:14:49 +09:00
Dean Herbert
7176dc95e5
Revert Player.Score to protected
2021-10-05 14:55:40 +09:00
Dean Herbert
e19be8ebe4
Make GameplayState.Score immutable
2021-10-05 14:55:40 +09:00
Dean Herbert
d3b9660148
Move common interface implementations to extension methods
2021-10-05 14:41:14 +09:00
Dean Herbert
b41fa41c85
Rename APIRequest.Result to Response
2021-10-05 14:28:56 +09:00
smoogipoo
5624dd9af6
Fix incorrect CancellationToken usage
...
Apparently I wrote the BDL system and don't know how this works. I
believe you need `CancellationToken?` or CanBeNull=true, however that doesn't actually
play well when actually using the token in code...
2021-10-05 12:07:41 +09:00
smoogipoo
593da79bbc
Further asyncify load process
2021-10-05 11:26:13 +09:00
smoogipoo
d120678e30
Fix redundant default value
2021-10-04 21:13:14 +09:00
smoogipoo
d1e7191f94
Pass score into GameplayState
2021-10-04 20:59:51 +09:00
smoogipoo
0b0316e27e
Fix missing CanBeNull
2021-10-04 20:59:31 +09:00
smoogipoo
1837e1bf3c
Share rounding with PerformanceStatistic
2021-10-04 20:35:53 +09:00
smoogipoo
fb63e5ed87
Add todo
2021-10-04 20:35:26 +09:00
smoogipoo
221cc1747c
Drop "default" prefix
2021-10-04 20:34:28 +09:00
smoogipoo
5aae673240
Use GameplayState
2021-10-04 20:33:54 +09:00
smoogipoo
2e3450b3f5
Make Mods readonly
2021-10-04 20:20:24 +09:00
smoogipoo
031c5a441e
Merge branch 'master' into realtime-pp-display
2021-10-04 20:19:37 +09:00
Dan Balasescu
4bd1083388
Merge pull request #14903 from peppy/importer-returns-live
...
Add `ILive<T>` and use as return type of `Import` methods
2021-10-04 20:16:32 +09:00
smoogipoo
4871db2f86
Merge branch 'master' into importer-returns-live
2021-10-04 19:42:36 +09:00
Dean Herbert
853cf6feaa
Rename last remaining BeatmapInfo Beatmap usage
2021-10-04 17:35:53 +09:00
Dean Herbert
916342c837
Merge branch 'master' into importer-returns-live
2021-10-04 16:24:26 +09:00
smoogipoo
69c2b7dc59
Merge branch 'master' into rename-beatmap-info-beatmap-fields
2021-10-04 16:03:22 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
...
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Bartłomiej Dach
017756cbca
Use Torus alternates on online play screens as per design
2021-10-04 00:26:41 +02:00
Dean Herbert
ec61c3c5ee
Rename all remaining cases
2021-10-03 00:55:29 +09:00
Dean Herbert
973c31132b
Rename BeatmapInfo variables which were named beatmap for clarity
2021-10-02 12:45:34 +09:00
Dean Herbert
7e009f6168
Add full xmldoc
2021-10-02 02:31:41 +09:00
Dean Herbert
32afd3f426
Replace all basic usages
2021-10-02 02:22:23 +09:00
Dean Herbert
05ca3aec4f
Rename GameplayState to SpectatorGameplayState
2021-10-02 02:10:11 +09:00
smoogipoo
0ee148b53f
Extra guard against no attributes
2021-10-01 21:31:26 +09:00
smoogipoo
a1f880a36a
Split classes
2021-10-01 21:00:39 +09:00
smoogipoo
d0081908c5
Make Score internal
2021-10-01 20:52:48 +09:00
smoogipoo
5820a71652
Fix mania difficulty calculator crashing
2021-10-01 19:57:45 +09:00
Dean Herbert
59bd13c154
Merge branch 'master' into slider-timeline-velcotiy-adjust-v2
2021-10-01 17:47:00 +09:00
Dean Herbert
ac471a0ec1
Merge branch 'no-more-difficulty-control-points-info' into slider-timeline-velcotiy-adjust-v2
2021-10-01 17:46:58 +09:00
Dean Herbert
a92d499d7a
Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo
2021-10-01 16:55:50 +09:00
smoogipoo
36be041846
Merge branch 'master' into realtime-pp-display
2021-10-01 13:28:38 +09:00
Dean Herbert
a2e61883e3
Initial push to use ILive in import process
2021-09-30 22:55:25 +09:00
Dean Herbert
3e3b9bc963
Split out IModelDownloader and also split apart ScoreManager
2021-09-30 18:25:20 +09:00
smoogipoo
4d8418e072
Fix possible nullrefs
2021-09-30 17:54:56 +09:00
smoogipoo
d2a8f35b4c
Update styling
2021-09-30 17:54:52 +09:00
smoogipoo
84bddf0885
Initial PP counter implementation
2021-09-30 17:00:24 +09:00
smoogipoo
816018edb7
Move hosted by text into nullcheck
2021-09-30 12:04:30 +09:00
smoogipoo
202a602d2f
Change default status to "ready to play"
2021-09-30 12:03:44 +09:00
smoogipoo
ea30445efc
Remove verbatim string
2021-09-30 12:03:34 +09:00
smoogipoo
619a907c47
Fix zero height grid
2021-09-30 12:01:26 +09:00
smoogipoo
56b3c8aa9a
Remove forgotten text
2021-09-30 11:52:14 +09:00
smoogipoo
c83dd7d2b6
Merge OnlinePlayComposite and RoomSubScreenComposite
2021-09-29 20:55:20 +09:00
Jamie Taylor
4d91204faf
Pause Editor sample playback while popup dialog is shown
2021-09-29 20:46:41 +09:00
smoogipoo
c9c2d20544
Limit max size
2021-09-29 20:44:38 +09:00
smoogipoo
67d847fbd3
Add room status text to DrawableRoom
2021-09-29 20:24:49 +09:00
smoogipoo
5f921c7836
Change SelectedItem to show the last item by default
2021-09-29 20:24:32 +09:00
smoogipoo
d89577b2e7
Add host to DrawableRoomParticipantsList
2021-09-29 19:34:40 +09:00
smoogipoo
73ee82ee2b
Rename RecentParticipantsList -> DrawableRoomParticipantsList
2021-09-29 19:15:58 +09:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
...
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Dean Herbert
46bafb6252
Merge branch 'master' into no-more-difficulty-control-points-info
2021-09-28 13:53:56 +09:00
Bartłomiej Dach
ca6cbca04a
Fix range selection crashing after non-mouse selection
2021-09-27 20:54:29 +02:00
Dean Herbert
df85092426
Resolve inner items early in process and rename variable
2021-09-27 14:24:17 +09:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting
2021-09-27 14:12:09 +09:00
Bartłomiej Dach
d3203f83dd
Add implementation of range selection
2021-09-26 20:12:26 +02:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection
2021-09-26 19:27:47 +02:00
Bartłomiej Dach
6dc3e66c93
Include combo information when determining ordering if available
2021-09-26 15:52:25 +02:00
Bartłomiej Dach
a86b9893ac
Always re-sort blueprints before adding/removing one
2021-09-26 15:48:56 +02:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
...
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dan Balasescu
ffdaf23329
Merge pull request #14814 from peppy/fix-key-counter-masking
...
Fix `KeyCounterDisplay` potentially getting stuck invisible due to autosize masking
2021-09-21 16:21:38 +09:00
Bartłomiej Dach
761548e533
Merge branch 'master' into 14470-ur-not-updating
2021-09-20 22:07:33 +02:00
sh0ckR6
fb416c79e9
Fully revert Player
2021-09-20 15:01:03 -04:00
Dean Herbert
a3464c98a7
Fix KeyCounterDisplay potentially getting stuck invisible due to autosize masking
...
Closes #14793 .
2021-09-20 23:52:01 +09:00
sh0ckR6
9a1db04920
Resolve GameplayClockContainer instead of Player
2021-09-20 10:28:58 -04:00
sh0ckR6
36a20ab0b3
Resolve failed test compilation
2021-09-20 10:26:07 -04:00
sh0ckR6
10fe2382b0
Address most issues
2021-09-20 10:07:42 -04:00
Bartłomiej Dach
4e094b2127
Implement grid size toggling matching stable
2021-09-19 20:26:02 +02:00
Bartłomiej Dach
56e80a0706
Add rectangular position snap grid
2021-09-19 18:07:19 +02:00
sh0ckR6
04715a5471
Add null-check when invoking OnSeek
2021-09-18 12:20:36 -04:00
sh0ckR6
f6e279baa1
Add xmldoc to HitErrorMeter.Clear
...
Explains how the method is called and what inheritors should do when implementing it.
2021-09-18 12:18:11 -04:00
sh0ckR6
12cc16c598
Remove unused property in SongProgress
2021-09-18 12:05:06 -04:00
sh0ckR6
b2b3108afa
Resolve addressed issues
...
+ Stopped using testing methods in non-testing classes
+ Resolve Player and add OnSeek event
+ Take bindings away from BarHitErrorMeter
+ Add support for ColourHitErrorMeter
2021-09-17 16:19:41 -04:00
Jamie Taylor
f868feae44
Remove unnecessary Schedule
2021-09-17 21:12:39 +09:00
Jamie Taylor
9485323a13
Add audio feedback for incorrect MP room password
2021-09-17 20:52:13 +09:00
Dan Balasescu
a591fffdbd
Merge pull request #14782 from peppy/refocus-textbox-on-failed-password
...
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:59:09 +09:00
Dean Herbert
027912d4f6
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:25:25 +09:00
Dean Herbert
1c8e17cf11
Fix the default background parallax being set incorrectly when no screen is present
2021-09-17 18:14:39 +09:00
Dean Herbert
5f27f1c099
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
...
Bit of an unfortunate one. Because we are applying the pitch adjustment
to the lowest level (`Track`), it's hard to filter out in parent clock
calculations.
Tried a few solutions but this feels the best. Note that we can't just
undo the `pauseFreqAdjust` adjustment as it will div-by-zero.
Closes https://github.com/ppy/osu/issues/14773 .
2021-09-17 15:43:38 +09:00
Dean Herbert
f524e913e1
Move AllowTrackAdjustments specification to RoomSubScreen
2021-09-17 13:24:01 +09:00
Dean Herbert
cd4ba71a6b
Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj"
...
This reverts commit 06ff4838fb5453ea0ce9
2021-09-17 13:22:39 +09:00
Joseph Madamba
55feb47e61
Disallow track adjustments on playlists / multi lounge
2021-09-16 20:17:21 -07:00
smoogipoo
e8dea0138c
Fix one more issue
2021-09-16 18:34:13 +09:00
smoogipoo
f9d5abff8a
Update with keybinding changes
2021-09-16 18:26:12 +09:00
Dean Herbert
3495fae519
Handle potential for OnResuming call without an OnSuspending first
2021-09-16 16:31:41 +09:00
Dean Herbert
b58415fe19
Make suspend stored state nullable to ensure we don't break it
2021-09-16 16:12:14 +09:00
Dean Herbert
fa693bb8a8
Move MusicController adjustment set to inside OsuScreen itself (and result nullable)
2021-09-16 16:08:09 +09:00
AbstractQbit
318f0941ca
Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen
2021-09-15 21:25:39 +03:00
Dean Herbert
931e873a7e
Merge branch 'master' into inheritable-allow-track-adjust
2021-09-15 22:26:13 +09:00
AbstractQbit
f0439ef50b
Remove unnecessary AllowTrackAdjustments overrides, add true to SongSelect
2021-09-15 13:12:57 +03:00
Dean Herbert
8acfefed1b
Merge pull request #14741 from smoogipoo/fix-lounge-beatmaps-counter
...
Fix incorrect beatmap count and SR range in multi lounge
2021-09-15 18:51:52 +09:00
AbstractQbit
1181317c72
Fix issues found by code quality ci
2021-09-15 12:01:56 +03:00
smoogipoo
f54d554d30
Extract removal to method
2021-09-15 17:03:28 +09:00
AbstractQbit
48cf98ef93
Rephrase null meaning in IOsuScreen.AllowTrackAdjustments
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-09-15 11:00:49 +03:00
AbstractQbit
b87af3dd68
Move the inherited AllowTrackAdjustments into OsuScreen
2021-09-15 10:55:16 +03:00
Dean Herbert
1ba716d9f1
Merge pull request #14737 from bdach/editor-difficulty-switch-shared-state
...
Preserve current time and clipboard contents when switching between difficulties
2021-09-15 12:38:56 +09:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling
2021-09-14 22:58:20 +02:00
Dean Herbert
13f88cbc4e
Fix EditorClock retaining a reference to potentially outdated ControlPointInfo
2021-09-14 23:56:57 +09:00
AbstractQbit
b9193aae6d
Make IOsuScreen.AllowTrackAdjustments nullable
...
Allows for inheriting value from the previous screen if undefined
2021-09-14 17:37:57 +03:00
Dean Herbert
57f8ccca16
Remove nullability from EditorState properties
...
Also update the xmldoc to not be specific to difficulty switching
2021-09-14 23:36:28 +09:00
Dean Herbert
f8bdca542d
Make restoring state a public call on Editor
2021-09-14 23:36:17 +09:00
