1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Commit Graph

21633 Commits

Author SHA1 Message Date
Dean Herbert
bc69ed3870 Simplify sample lookup 2020-10-30 22:33:27 +09:00
cadon0
a1fa6588f6 Fix "bounce" when metadata container text is empty 2020-10-31 01:06:19 +13:00
Dean Herbert
b4e5311014 Move initial state set inside updateClock 2020-10-30 20:39:25 +09:00
Dean Herbert
1bd461f229 Move clock logic back to inside updateClock method 2020-10-30 20:21:14 +09:00
Max Hübner
f27ce7521d Make "Sometimes" setting depend on season end date, rather than chance 2020-10-30 10:27:43 +01:00
Dean Herbert
79aecc9a98
Merge branch 'master' into spectator-replay-watcher 2020-10-30 16:31:24 +09:00
Dean Herbert
32e68a6a3c Fix FramedReplayInputHandler incorrectly blocking in streaming mode when time requested is before the first frame
Most of this is just tidying up the logic to (hopefully) be better to
follow, again (again (again)).

The actual fix is that we now allow interpolation/playback when the
incoming time is less than the first frame's time, regardless of
receiving status.
2020-10-30 16:09:03 +09:00
Dan Balasescu
0ef1459f4b
Merge pull request #10621 from peppy/hud-momentary-visibility
Add momentary HUD toggle
2020-10-30 15:40:54 +09:00
Dean Herbert
0f997386ae Fix direction and IsRunning not updating on first frame after becoming valid
The parent clock will not unpause until WaitingForFrames becomes false,
so I've moved the set of that before we start to propagate its values
across. Doesn't fix any visible issue but should make propagation one
game loop faster.
2020-10-30 15:26:23 +09:00
Dean Herbert
326fd03525 Fix loop not exiting after first valid frame 2020-10-30 15:25:53 +09:00
Dan Balasescu
b14291a312
Merge branch 'master' into tracked-hud-visibility-settings 2020-10-30 14:58:45 +09:00
Dan Balasescu
8be16bd4ed
Merge pull request #10370 from peppy/fix-test-beatmap-virtual-clock
Ensure virtual track time is long enough for test beatmaps
2020-10-30 14:23:06 +09:00
Dan Balasescu
45b8af5391
Merge pull request #10614 from peppy/results-screen-animate-once
Only play results panel animation once (and only for the local user)
2020-10-30 14:21:05 +09:00
Dean Herbert
8928aa6d92 Add key binding to show HUD while held 2020-10-30 14:19:40 +09:00
Dean Herbert
b4eda65383 Commit missing pieces 2020-10-30 13:53:51 +09:00
Dean Herbert
c72017a7db Remove "hide during breaks" option
Probably wouldn't be used anyway.
2020-10-30 13:49:45 +09:00
Dean Herbert
f58f8e0f93 Update resources 2020-10-30 13:46:54 +09:00
Dean Herbert
9bb86ccb83 Change shift-tab to cycle available HUD visibility modes 2020-10-30 13:09:22 +09:00
Dean Herbert
18f92818da Show current HUD visibility mode as a tracked setting 2020-10-30 13:09:13 +09:00
Dean Herbert
46d89d55f4 Add note about ScheduleAfterChildren requirement 2020-10-30 12:47:04 +09:00
Dean Herbert
8e6c803900 Avoid running full updateClock loop when waiting on frames 2020-10-30 12:39:11 +09:00
Dean Herbert
8dbaca341e Merge branch 'sample-lookup-improvements' into results-screen-applause 2020-10-30 12:28:48 +09:00
Dean Herbert
b906736b85 Remove redundant initialisation 2020-10-30 12:28:40 +09:00
Dean Herbert
823230f06a Merge branch 'sample-lookup-improvements' into results-screen-applause 2020-10-30 12:17:36 +09:00
Dean Herbert
2ea4aa0a37 Fix incorrect specification on some sample lookups 2020-10-30 11:59:41 +09:00
Dean Herbert
d319b27b3d Run sample lookup logic through getFallbackNames 2020-10-30 11:59:41 +09:00
Dean Herbert
0b28cca7e6 Don't force Gameplay prefix on all skin sample lookups 2020-10-30 11:59:40 +09:00
Dean Herbert
c9a85587fb Allow SampleInfo to specify fallback sample lookup names 2020-10-30 11:59:29 +09:00
Dean Herbert
0c1d12460f Remove unused parameter 2020-10-30 10:30:11 +09:00
Max Hübner
fb1e09b3e7 Load seasonal backgrounds according to setting 2020-10-29 18:04:48 +01:00
Max Hübner
d9846fad37 Remove fallback texture parameter
When there isn't a seasonal event, we don't want to fall back to the basic background here, but rather to the user selected background source.
2020-10-29 18:03:36 +01:00
Max Hübner
34371b8888 Show next Background on showSeasonalBackgrounds.ValueChanged 2020-10-29 17:44:23 +01:00
Max Hübner
bf4d99dfe7 Load SeasonalBackgroundLoader asynchronously 2020-10-29 17:43:10 +01:00
Max Hübner
907e1921c7 Make SeasonalBackgroundLoader read from SessionStatics 2020-10-29 17:31:42 +01:00
Max Hübner
76c0a790b4 Add separate Seasonal Backgrounds setting (Always, Sometimes, Never) 2020-10-29 17:28:04 +01:00
Dean Herbert
87be7d162b
Merge branch 'master' into spectator-replay-watcher 2020-10-30 00:25:17 +09:00
Max Hübner
b189e0b7cf Revert "Load SeasonalBackgroundLoader asynchronously"
This reverts commit 81ebcd8796.
2020-10-29 16:01:22 +01:00
Max Hübner
7d523fee28 Revert "Set BackgroundSource.Seasonal as default setting"
This reverts commit cdb2d23578.
2020-10-29 14:31:07 +01:00
Max Hübner
0c540537c9 Revert "Add BackgroundSource.Seasonal"
This reverts commit 2871001cc2.
2020-10-29 14:30:50 +01:00
Dean Herbert
1c353b4745 Update framework 2020-10-29 20:38:28 +09:00
Dean Herbert
17ea06f793 Merge branch 'results-screen-animate-once' into results-screen-applause 2020-10-29 20:23:25 +09:00
Dean Herbert
7be4dfabd8 Revert "Update namespace references"
This reverts commit d69d78ab5d.
2020-10-29 20:23:15 +09:00
Dean Herbert
404885af89 Merge branch 'results-screen-animate-once' into results-screen-applause 2020-10-29 18:52:54 +09:00
Dean Herbert
3491dea9e2 Fix scroll logic running before children may be alive in flow 2020-10-29 18:51:54 +09:00
Dean Herbert
d69d78ab5d Update namespace references 2020-10-29 18:45:18 +09:00
Dean Herbert
f1b8a8f7f5 Remove unused using 2020-10-29 18:16:04 +09:00
Dean Herbert
335d150a13 Fix aim time being mutated inside update loop 2020-10-29 18:11:50 +09:00
Dean Herbert
4dec46b33e Attempt to fix in a less destructive way for now 2020-10-29 17:52:58 +09:00
Dean Herbert
7bef695072 Merge branch 'master' into fix-test-beatmap-virtual-clock 2020-10-29 17:51:15 +09:00
Dean Herbert
0a0239a7c7 Only play results panel animation once (and only for the local user) 2020-10-29 17:08:59 +09:00
Dean Herbert
11f85779d5 Fix panel expanded state being updated multiple times unnecessarily 2020-10-29 17:08:59 +09:00
Dean Herbert
71e373ff51 Make results panels aware of whether they are a local score that has just been set 2020-10-29 17:08:59 +09:00
Dean Herbert
4a26084df8 Only play results panel animation once (and only for the local user) 2020-10-29 17:04:33 +09:00
Dean Herbert
f1ce09930e Fix panel expanded state being updated multiple times unnecessarily 2020-10-29 17:03:45 +09:00
Dean Herbert
5d5b0221e5 Add skinning support for legacy applause playback 2020-10-29 16:32:29 +09:00
Dean Herbert
c863341ca1 Don't force Gameplay prefix on all skin sample lookups 2020-10-29 16:32:20 +09:00
Dean Herbert
b49a579411 Allow SampleInfo to specify fallback sample lookup names 2020-10-29 16:32:03 +09:00
Dean Herbert
fb82c043a5 Add rank appear sound (new default) 2020-10-29 16:11:37 +09:00
Dean Herbert
a8e9c62583 Make results panels aware of whether they are a local score that has just been set 2020-10-29 16:11:25 +09:00
Dean Herbert
6e630e8c88 Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-29 15:33:43 +09:00
Dean Herbert
2671d371da Move clock retrieval to new correct location 2020-10-29 15:28:39 +09:00
Dean Herbert
3ea27e23e8 Update namespace references 2020-10-29 15:20:10 +09:00
Dean Herbert
3751c357a3 Update framework 2020-10-29 15:19:05 +09:00
Dean Herbert
0818835b16 Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-29 15:13:21 +09:00
Dean Herbert
db2b00068f Avoid sourcing parent clock when in a paused state 2020-10-29 14:48:56 +09:00
Dean Herbert
d91456dc29 Move initial validity check out of loop for clarity 2020-10-29 14:25:47 +09:00
Dean Herbert
2e5a8b2287 Fix xmldoc to read better in new context 2020-10-29 13:16:31 +09:00
Dan Balasescu
a022b869eb
Merge branch 'master' into frame-stability-clean-up 2020-10-29 13:02:17 +09:00
Dan Balasescu
4a264bc173
Merge branch 'master' into beatmap-listing-search-options 2020-10-29 12:04:40 +09:00
Dan Balasescu
8ccc3c2ec8
Merge pull request #10596 from charlie-gray/right-click-circle-delete
Add support for deleting objects when Shift is held down
2020-10-29 11:37:22 +09:00
Bartłomiej Dach
1313ab89e7 Add xmldoc to multiple selection row 2020-10-28 23:37:21 +01:00
Bartłomiej Dach
016e920aa9 Move filter tab item hierarchy construction to BDL 2020-10-28 23:14:52 +01:00
Bartłomiej Dach
a8cefb0d4c Rename method 2020-10-28 23:12:28 +01:00
Bartłomiej Dach
f5aedc96c4 Rework multiple selection filter 2020-10-28 23:07:54 +01:00
Bartłomiej Dach
e77049eae3 Use discard-like lambda parameter names 2020-10-28 22:58:51 +01:00
Bartłomiej Dach
fa53549ed2 Mark request fields as possibly-null 2020-10-28 22:57:03 +01:00
Bartłomiej Dach
a1696942f0 Merge branch 'master' into right-click-circle-delete 2020-10-28 22:12:14 +01:00
Bartłomiej Dach
202fe09306 Group selection actions back up in SelectionHandler 2020-10-28 22:06:48 +01:00
Andrei Zavatski
5c2c5f2000 Use existing ScoreRank for rank filter 2020-10-28 23:35:08 +03:00
Andrei Zavatski
4f6081c7f3 Use BindableList<T> 2020-10-28 19:44:13 +03:00
Dean Herbert
bca317b151 Remove excess using statement 2020-10-28 23:43:16 +09:00
Dean Herbert
e1bf751dac Merge branch 'spectator-replay-watcher' into spectator-listing 2020-10-28 23:17:50 +09:00
Dean Herbert
5d02de29ca Fix attempt to change ruleset/beatmap bindables while screen is not active 2020-10-28 22:50:45 +09:00
Dean Herbert
25ab3a5fea Construct replay after being sure a ruleset is available to avoid nullrefs 2020-10-28 22:10:37 +09:00
Dean Herbert
dd2f44f393 Add basic "currently watching" text to player to signify that spectator is active 2020-10-28 19:43:06 +09:00
Dean Herbert
93fd913876 Add setting to allow automatically downloading during a spectating session 2020-10-28 19:43:06 +09:00
Dean Herbert
9807089834 Fix screen exit potentially occuring during transition 2020-10-28 19:43:06 +09:00
Dean Herbert
4df8119852 Add missing schedule 2020-10-28 19:43:06 +09:00
Dean Herbert
93e3e1a4db Don't inherit ReplayPlayer to make results screen work correctly 2020-10-28 19:02:38 +09:00
Dean Herbert
344ff8f4bc "Improve" visuals of spectator screen 2020-10-28 19:02:38 +09:00
Dean Herbert
2d73dfbe39 Add more safety around beatmap panel and button display logic 2020-10-28 19:02:38 +09:00
Dean Herbert
c97feb09bf Allow continuing to automatically spectate user from results screen 2020-10-28 19:02:38 +09:00
Dean Herbert
16b0a7b33e Add button flow to allow resuming watching after exiting manually 2020-10-28 19:02:38 +09:00
Dean Herbert
84d854e231 Avoid having the user profile show when clicking a spectator panel 2020-10-28 19:02:38 +09:00
Dean Herbert
32becb6882 Add simple listing of currently playing users 2020-10-28 19:02:38 +09:00
Dean Herbert
ce9dd0c920 Fix enum descriptions not being displayed in OverlayHeaderTabControl 2020-10-28 17:44:15 +09:00
Dean Herbert
6169349f7c Fix switching to new beatmap not working correctly 2020-10-28 17:44:11 +09:00
Dean Herbert
730cc645fb Avoid reconstructing ruleset for each frame bundle 2020-10-28 16:33:52 +09:00
Dean Herbert
48b0357e7d Fix "finished playing" events handled for potentially incorrect user 2020-10-28 16:11:14 +09:00
Dean Herbert
6eddd76bdc Simplify FramedReplayInputHandler's SetFrame implementation 2020-10-28 16:03:23 +09:00
Dean Herbert
09da75b143 Merge branch 'frame-stability-clean-up' into spectator-replay-watcher 2020-10-28 15:34:46 +09:00
Dean Herbert
2b1e79a4e8 Simplify state changes further 2020-10-28 15:32:20 +09:00
Dean Herbert
c9515653b3 Restore previous directionality logic to avoid logic differences 2020-10-28 15:31:57 +09:00
Dean Herbert
77d807d0f5 Merge branch 'frame-stability-clean-up' into spectator-replay-watcher 2020-10-28 15:26:02 +09:00
Dean Herbert
59e9c2639a Remove try-finally 2020-10-28 15:16:56 +09:00
Dean Herbert
a06516c900 Extract out frame stability state into enum for (hopefully) better clarity 2020-10-28 15:15:15 +09:00
Dean Herbert
8c9bda2ded Split out replay update method 2020-10-28 15:14:06 +09:00
Dean Herbert
9b9a41596f Split out frame stability calculation to own method 2020-10-28 15:14:06 +09:00
Dean Herbert
3e5322541d Make direction setting more clear 2020-10-28 14:35:42 +09:00
Dean Herbert
351acce698 Merge branch 'master' into fix-editor-bindable-crash 2020-10-28 13:34:54 +09:00
Dean Herbert
01b576c861 Fix editor crash on exit when forcing exit twice in a row 2020-10-28 13:32:39 +09:00
Andrei Zavatski
914bd53788 Add missing blank line 2020-10-28 02:39:51 +03:00
Andrei Zavatski
6fd3686c4d Use IReadOnlyCollection instead of List in SearchBeatmapSetsRequest 2020-10-28 02:36:35 +03:00
Andrei Zavatski
03c5057a92 Simplify BeatmapSearchMultipleSelectionFilterRow 2020-10-28 02:28:31 +03:00
Andrei Zavatski
fd11346a28 Update button colours 2020-10-28 01:48:24 +03:00
Andrei Zavatski
b4ec3b9fef Simplify MultipleSelectionFilterTabItem state changes 2020-10-28 01:41:46 +03:00
Dean Herbert
0a7f3dc19b
Avoid null reference on finalization
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-10-28 07:29:07 +09:00
Andrei Zavatski
c4efceceb2 Use char instead of sting for request parameter creation 2020-10-27 23:57:11 +03:00
Andrei Zavatski
008d1d697c Implement filtering by rank achieved 2020-10-27 23:14:48 +03:00
Andrei Zavatski
1710b396e7 Implement BeatmapSearchMultipleSelectionFilterRow 2020-10-27 22:27:29 +03:00
Andrei Zavatski
1b40b56d41 Add ability to search by play criteria 2020-10-27 21:30:53 +03:00
Andrei Zavatski
26a60d898c Implement BeatmapSearchExtraFilterRow 2020-10-27 21:22:20 +03:00
Andrei Zavatski
742a96484b Add ability to set extra parameters to SearchBeatmapSetsRequest 2020-10-27 20:13:18 +03:00
Leon Gebler
0ddf840a63 Merge branch 'master' into fix-timeline-drag-select-weirdness 2020-10-27 15:31:55 +01:00
Leon Gebler
983a2774e8 Code Formatting 2020-10-27 15:09:10 +01:00
Leon Gebler
064c50c3ac Expose currentZoom to fix selection box wiggle 2020-10-27 14:38:35 +01:00
Dean Herbert
d5e0fa322b Fix a couple of inspections 2020-10-27 22:30:45 +09:00
Lucas A
a96c067bea Remove uncessary async-await state machine level. 2020-10-27 13:45:21 +01:00
Dan Balasescu
26a7545534
Merge branch 'master' into fix-editor-samples-not-pausing-screen-swap 2020-10-27 21:29:16 +09:00
Dean Herbert
2cacdaa11b Add basic beatmap download and play flow 2020-10-27 19:28:34 +09:00
Dean Herbert
42b3aa3359 Fix spectating when starting from a point that isn't at the beginning of the beatmap 2020-10-27 18:58:37 +09:00
Dean Herbert
b3d793a505 Fix gameplay proceeding when no frames have been received yet 2020-10-27 18:58:37 +09:00
Dean Herbert
851d45d2eb Add sane pausing logic 2020-10-27 18:58:37 +09:00
Dean Herbert
9e6b0a42ec Allow FrameStabilityContainer to handle waiting-for-data state better (and pause outwards) 2020-10-27 18:58:37 +09:00
Dean Herbert
3ec3321a3d Add missing space 2020-10-27 18:58:37 +09:00
Dean Herbert
b737a8bf6e Add field to Replay denoting whether the full replay have been received or not 2020-10-27 18:58:37 +09:00
Dean Herbert
c1e7cd6e47 Stop replay playback when frames are starved 2020-10-27 18:58:37 +09:00
Dean Herbert
9bac8f3792 Add null check on replay as safety measure 2020-10-27 18:58:37 +09:00
Dean Herbert
400542bc0b Ensure frames arrive 2020-10-27 18:58:37 +09:00
Dean Herbert
ac4671c594 Add basic implementation of spectator screen 2020-10-27 18:58:37 +09:00
Dean Herbert
154ccf1b49 Expose events from streaming client 2020-10-27 18:58:37 +09:00
Dean Herbert
5fd97bd043 Add basic spectator screen 2020-10-27 18:58:37 +09:00
Dean Herbert
df5348cd93
Merge pull request #10601 from peppy/move-sample-pause-logic 2020-10-27 17:49:32 +09:00
Dean Herbert
b8beac27ce Use previous logic for catching-up mode 2020-10-27 17:14:41 +09:00
Dean Herbert
e0ad005cc1 Move editor sample disabling logic to editor class (and support screen switching) 2020-10-27 14:33:44 +09:00
Dean Herbert
09087faf3b Fix non-matching filename 2020-10-27 14:23:24 +09:00
Dean Herbert
9cfb81589e Use bindable flow instead 2020-10-27 14:10:12 +09:00
Dean Herbert
6853da459d Move sample pausing logic out of FrameStabilityContainer 2020-10-27 13:54:33 +09:00
Dean Herbert
3c2e2f29bc Remove unused using statement 2020-10-27 13:17:44 +09:00
Dean Herbert
27c1a4c4d3 Move right-click deletion logic to be handled at a SelectionBlueprint level 2020-10-27 12:53:54 +09:00
Dean Herbert
e1f578c590 Change editor timing screen seek behaviour to only occur on clicking table rows
Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).

Closes #10590.
2020-10-27 12:28:12 +09:00
Dean Herbert
266596d404
Merge branch 'master' into right-click-circle-delete 2020-10-27 12:02:29 +09:00
Dean Herbert
68719bb23d Rename other variables to match 2020-10-27 10:59:24 +09:00
Bartłomiej Dach
7392876b5f Fix mania crashing due to spectator client handling frames with unconverted beatmap 2020-10-27 00:35:25 +01:00
Bartłomiej Dach
3f8c4c57d0 Fix code style issues & restructure 2020-10-26 22:16:28 +01:00
Charlie
255bb9d100 fixed issue with returns 2020-10-26 14:52:59 -05:00
Charlie
ccaf6560ec formatting 2020-10-26 14:30:37 -05:00
Charlie
1239670566 moved right click shift delete functionality to HandleSelectionRequested + reduced func size 2020-10-26 14:28:53 -05:00
Charlie
ead3c19567 added function so circle is deleted when shift+right click 2020-10-26 13:40:42 -05:00
Leon Gebler
704f8cc4f2 Fix selection box wandering off into the distance 2020-10-26 18:45:03 +01:00
Dean Herbert
dfe07271de Add very basic latency handling to spectator test 2020-10-26 16:31:39 +09:00
Dean Herbert
b86347dc81 Merge branch 'master' into spectator 2020-10-26 13:39:07 +09:00
Dean Herbert
9caa7ff64d Remove debug endpoint 2020-10-26 13:38:05 +09:00
Dean Herbert
431054377a
Merge branch 'master' into epilepsy-warning-volume-restoration 2020-10-25 22:22:11 +09:00
Bartłomiej Dach
0542a45c43 Change to manual adjustment add/remove 2020-10-25 12:33:35 +01:00
Dean Herbert
8b04cd2cb0 Fix a potential null reference when loading carousel difficulties 2020-10-25 20:28:24 +09:00
Bartłomiej Dach
85e14f3f0c Shorten fade duration to make fade out snappier 2020-10-25 00:40:11 +02:00
Bartłomiej Dach
e101ba5cba Move volume manipulations to player loader 2020-10-25 00:40:11 +02:00
Bartłomiej Dach
73174961f0 Rework animation sequence for readability 2020-10-24 22:30:08 +02:00
Max Hübner
81ebcd8796 Load SeasonalBackgroundLoader asynchronously 2020-10-23 13:41:00 +02:00
Max Hübner
c1d03a5bac Add SeasonalBackgroundLoader and SeasonalBackground 2020-10-23 13:40:13 +02:00
Dean Herbert
e20a986401 Add ruleset to state 2020-10-23 17:24:19 +09:00
Dean Herbert
89797d7a57
Merge pull request #9786 from Wieku/storyboard-skin-sprites
Allow storyboard elements to load textures from skins
2020-10-23 17:16:55 +09:00
Dean Herbert
4f746792fb Fix regression causing storyboard sprites to have incorrect origin support 2020-10-23 15:46:24 +09:00
Dean Herbert
8232bf1957
Merge pull request #10576 from Game4all/song-select-wedge-dynamic-star-rating 2020-10-23 15:39:02 +09:00
Dean Herbert
1b84402b96 Centralise and share logic for storyboard frame lookup method 2020-10-23 15:34:00 +09:00
Dean Herbert
9141f48b04 Remove beatmap-based ctor to promote single flow 2020-10-23 14:57:27 +09:00
Dean Herbert
4fca7675b0 Don't send spectate data when an autoplay mod is active 2020-10-23 14:47:21 +09:00
Dean Herbert
e99cf369fa Don't worry about EndPlaying being invoked when not playing 2020-10-23 13:33:23 +09:00
Dean Herbert
f11bcfcb8f
Remove unnecessary public specification in interface
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-10-23 10:03:33 +09:00
Max Hübner
09d49aa0f7 Add GetSeasonalBackgroundsRequest 2020-10-22 18:25:01 +02:00
Max Hübner
cdb2d23578 Set BackgroundSource.Seasonal as default setting 2020-10-22 18:23:03 +02:00
Max Hübner
2871001cc2 Add BackgroundSource.Seasonal 2020-10-22 18:21:28 +02:00
Dean Herbert
54d666604b Fix incorrect order of flag settings 2020-10-22 22:56:23 +09:00
Dean Herbert
9f2f8d8cc7 Fix missing licence headers 2020-10-22 19:41:10 +09:00
Dean Herbert
147d502da1 Fix initial play state not being kept locally if not connected 2020-10-22 19:30:07 +09:00
Dean Herbert
ee2513bf4b Add batch sending 2020-10-22 19:17:19 +09:00
Dean Herbert
823d717a7d Reduce the serialised size of LegacyReplayFrame 2020-10-22 19:17:10 +09:00
Dean Herbert
34e889e66e Don't watch every user in normal gameplay (but allow so in test) 2020-10-22 18:38:03 +09:00
Dean Herbert
1ab6f41b3b Add basic send and receive test 2020-10-22 18:10:27 +09:00
Dean Herbert
c834aa6051 Use APIMod for mod serialization 2020-10-22 17:48:15 +09:00
Dean Herbert
0611b30258 Drop webpack 2020-10-22 17:48:15 +09:00
Dean Herbert
05697dfe68 Add spectator state object support 2020-10-22 17:48:15 +09:00
Dean Herbert
2021945a8c Add retry/error handling logic 2020-10-22 17:48:15 +09:00
Dean Herbert
96049c39c9 Add begin/end session logic 2020-10-22 17:48:15 +09:00
Dean Herbert
4788b4a643 Expose oauth access token via api interface 2020-10-22 17:48:15 +09:00
Dean Herbert
175fd512b0 Send frames to streaming client from replay recorder 2020-10-22 17:48:15 +09:00
Dean Herbert
93db75bd41 Begin shaping the spectator streaming component 2020-10-22 17:48:15 +09:00
Dean Herbert
c6db832efa Add xmldoc notes about thread safety of api bindables 2020-10-22 14:56:20 +09:00
Dean Herbert
5a00a05a95 Add missing schedule call 2020-10-22 14:49:48 +09:00
Dean Herbert
db4dd3182b Add xmldoc to spectator interfaces 2020-10-22 14:46:21 +09:00
Dean Herbert
b39a4da6bc Add initial classes for spectator support 2020-10-22 14:46:21 +09:00
Dean Herbert
da573c7487 Remove unused usings 2020-10-22 14:44:10 +09:00
Dean Herbert
3fe6f77444 Fix cases of multiple bdl methods 2020-10-22 14:30:49 +09:00
Dean Herbert
303975ccb1 Remove unnecessary permitNulls 2020-10-22 14:27:49 +09:00
Dean Herbert
9753dab93b Remove IOnlineComponent and change existing components to use bindable flow 2020-10-22 14:19:12 +09:00
Lucas A
cf69eacae9 Make StarRatingDisplay dynamic. 2020-10-21 19:05:14 +02:00
Lucas A
670775cecb Make beatmap wedge difficulty indicator color update dynamically. 2020-10-21 18:57:48 +02:00
Bartłomiej Dach
58c9e57a68 Fix comment 2020-10-21 17:17:23 +02:00
Dean Herbert
22112e4303 Fix ISourcedFromTouch events being blocked by LoadingLayer 2020-10-21 23:11:51 +09:00
Bartłomiej Dach
e2552d4c36 Merge branch 'master' into storyboard-skin-sprites 2020-10-20 23:01:54 +02:00
Bartłomiej Dach
58a54c5b6c Utilise UseSkinSprites value in storyboard sprite logic 2020-10-20 23:01:25 +02:00
Bartłomiej Dach
cdd56ece87 Read UseSkinSprites when decoding storyboards 2020-10-20 22:49:56 +02:00
Bartłomiej Dach
e54836a63e Use SkinnableSprite to avoid unnecessary reloads 2020-10-20 22:49:56 +02:00
Dean Herbert
8273715bde
Merge pull request #9484 from FlashyReese/visible-playfield-boundary 2020-10-20 19:43:41 +09:00
Dan Balasescu
bd4e0e1a60
Merge branch 'master' into epilepsy-warning 2020-10-20 17:43:37 +09:00
Dan Balasescu
5fe38533e2
Merge branch 'master' into hide-hud-during-break-time 2020-10-20 15:39:35 +09:00
Dean Herbert
55d08fad5c Remove unused field 2020-10-20 15:18:15 +09:00
Dean Herbert
411ae38605 Remove unused using 2020-10-20 15:06:31 +09:00
Dean Herbert
7a68636f71 Adjust fade sequence and durations to feel better 2020-10-20 15:03:33 +09:00
Dean Herbert
4e57751ca1 Fix background dim application to avoid overdraw, transition smoother 2020-10-20 15:03:12 +09:00
Dan Balasescu
1fe987d4b3
Merge pull request #10497 from peppy/beatmap-carousel-less-diffcalc-stutter
Disable difficulty calculation for set-level difficulty icons
2020-10-20 14:57:34 +09:00
Dan Balasescu
976f96b51d
Merge branch 'master' into beatmap-carousel-refactor-less-alloc-overhead 2020-10-20 14:26:23 +09:00
Dan Balasescu
13060b8575
Merge branch 'master' into beatmap-carousel-less-diffcalc-stutter 2020-10-20 14:26:16 +09:00
Dan Balasescu
f35611b452
Merge pull request #10494 from peppy/beatmap-carousel-refactor
Add beatmap set level pooling to beatmap carousel
2020-10-20 14:25:56 +09:00
Dean Herbert
4f8a755518 Add "hide during gameplay" mode 2020-10-20 14:20:44 +09:00
Dean Herbert
024009e174 Change default to "always visible" 2020-10-20 14:19:15 +09:00
Dean Herbert
80b1f816c7 Merge branch 'master' into hide-hud-during-break-time 2020-10-20 14:19:04 +09:00
Dean Herbert
267b399f9f Add some simple border styles 2020-10-20 13:59:03 +09:00
Dean Herbert
c57fecd1fc Update comment to make it clear this is a hack 2020-10-20 12:43:57 +09:00
Bartłomiej Dach
fd4bab85cf Merge branch 'master' into epilepsy-warning 2020-10-20 01:06:46 +02:00
Bartłomiej Dach
05251c646e Fade volume back up on pop out 2020-10-20 01:06:20 +02:00
Bartłomiej Dach
1fc22bdbff Only show warning once on given map 2020-10-20 00:59:36 +02:00
Bartłomiej Dach
a164d330e5 Improve feel of transition 2020-10-20 00:51:31 +02:00
Bartłomiej Dach
1238e6c30f Add flag value to database
Unfortunately required, as loadBeatmaps() refreshes the decoded beatmap
with the database-stored values, which can end up overwriting the
decoded ones.
2020-10-20 00:46:08 +02:00
Bartłomiej Dach
6e50ae0458 Reformulate push sequence code 2020-10-20 00:22:30 +02:00
Bartłomiej Dach
8505903041 Move warning construction to load() 2020-10-20 00:08:05 +02:00
Bartłomiej Dach
a9f27a71a2 Fix code formatting issues 2020-10-19 23:53:41 +02:00
Bartłomiej Dach
aeca61eb3e Split warning to separate file 2020-10-19 23:48:02 +02:00
Bartłomiej Dach
44279ed347 Remove unused using directive 2020-10-19 23:46:09 +02:00
Salman Ahmed
6e4b28ed1e Different version of epilepsy warning display 2020-10-20 00:32:44 +03:00
Bartłomiej Dach
ba818e3ae0
Merge branch 'master' into results-dynamic-pp-calc 2020-10-19 21:41:07 +02:00
Joehu
fef6e55b39 Remove unused using and field 2020-10-19 12:32:16 -07:00
Bartłomiej Dach
7c388f1132 Move editor playfield border locally to osu! composer 2020-10-19 21:20:13 +02:00
Bartłomiej Dach
bca0539735 Move setting to osu! ruleset subsection 2020-10-19 21:05:21 +02:00
Joehu
dbda18acea Fix autoplay/replay settings going off screen on some legacy skins 2020-10-19 12:04:23 -07:00
Bartłomiej Dach
4267d23d59 Move border to more appropriate namespace 2020-10-19 20:56:34 +02:00
Bartłomiej Dach
4af3fd1ed6 Allow toggling border on & off during gameplay 2020-10-19 20:41:45 +02:00
Bartłomiej Dach
053c7a69a6 Fix code style issues & compilation failures 2020-10-19 20:22:48 +02:00
Dean Herbert
85790d8569
Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 20:46:55 +09:00
Dan Balasescu
b9c1d21743
Merge pull request #10559 from peppy/fix-migration-test-failures
Fix migration test failures due to finalizer disposal of LocalConfigManager
2020-10-19 20:26:20 +09:00
Dean Herbert
d5940193a2 Ensure visible items is greater than zero before trying to display a range 2020-10-19 19:55:20 +09:00
Dean Herbert
9106e97c37 Ensure max value in clamp is at least zero 2020-10-19 19:10:01 +09:00
Dan Balasescu
534088c66b
Merge branch 'master' into fix-legacy-score-display-fixed-width 2020-10-19 19:04:20 +09:00
Dean Herbert
28eae5d26b Fix migration test failures due to finalizer disposal of LocalConfigManager 2020-10-19 19:03:22 +09:00
Dean Herbert
002ade51fc
Merge pull request #9816 from voidedWarranties/duplicate-multi-room 2020-10-19 19:02:03 +09:00
Dean Herbert
9792ac2fbd Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 18:44:07 +09:00
Dean Herbert
46d17d3857 Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 18:43:17 +09:00
Dean Herbert
51e9a91343
Merge pull request #10493 from peppy/update-framework 2020-10-19 18:42:55 +09:00
Dean Herbert
1c2185e969 Replace comment with link to issue 2020-10-19 18:41:28 +09:00
Dean Herbert
044622a7a6 Fix out of bounds issues 2020-10-19 18:41:17 +09:00
Dean Herbert
22bde43106
Merge branch 'master' into visible-playfield-boundary 2020-10-19 18:05:28 +09:00
Dean Herbert
b940a7cee2
Merge pull request #10235 from Joehuu/fix-tournament-ruleset-dropdown-anchor 2020-10-19 17:46:15 +09:00
Dean Herbert
d1eafc9934
Merge pull request #8136 from Game4all/fix-login-placeholder-inheritance 2020-10-19 17:45:54 +09:00
Dean Herbert
437ca91b94 Use DI to open the copy rather than passing in an ugly action 2020-10-19 17:23:04 +09:00
Dean Herbert
6d22f0e196 Use existing copy method and update xmldoc 2020-10-19 17:15:13 +09:00
Dan Balasescu
5333319482
Merge pull request #10401 from LittleEndu/score-test
Expand ScoreProcessor tests
2020-10-19 17:03:59 +09:00
Dean Herbert
61a43770bd Merge branch 'master' into duplicate-multi-room 2020-10-19 16:58:45 +09:00
Dean Herbert
79a17b2371 Reapply waveform colour fix 2020-10-19 16:57:08 +09:00
Dean Herbert
401dd2db37 Update framework 2020-10-19 16:55:00 +09:00
Dean Herbert
ca1c287664
Merge pull request #9256 from MiraiSubject/tourney-asset-refactor 2020-10-19 16:42:09 +09:00
Dean Herbert
d6efa3069a Merge branch 'master' into fix-login-placeholder-inheritance 2020-10-19 16:25:44 +09:00
Dean Herbert
f597572d73 Add comment with reasoning for TopRight anchor 2020-10-19 16:02:39 +09:00
Dean Herbert
03f336feb5 Merge branch 'master' into fix-tournament-ruleset-dropdown-anchor 2020-10-19 15:57:19 +09:00
Dan Balasescu
fe51236c00
Merge branch 'master' into score-test 2020-10-19 15:55:52 +09:00
Dan Balasescu
b5cadd6a2c
Merge pull request #10555 from peppy/fix-score-display-zero-padding
Fix incorrect zero padding for classic scoring mode
2020-10-19 15:54:12 +09:00
Dean Herbert
31f6051db9 Add missing xmldoc 2020-10-19 15:36:27 +09:00
Dean Herbert
39cf27637e Update to use virtual methods instead of reconstructing TextBuilder 2020-10-19 14:59:03 +09:00
Dean Herbert
f218a32e5f Merge branch 'master' into tourney-asset-refactor 2020-10-19 14:42:52 +09:00
Dean Herbert
ba99c5c134 Remove rolling delay on default combo counter 2020-10-19 14:39:02 +09:00
Dean Herbert
cdb649476b Allow legacy text to display fixed width correctly 2020-10-19 14:33:53 +09:00
Dean Herbert
e3b47083fc Add "scoring" as keyword to more easily find score display mode setting 2020-10-19 14:05:41 +09:00
Dean Herbert
cb1784a846 Fix score displays using non-matching zero padding depending on user score display mode 2020-10-19 14:05:28 +09:00
Dan Balasescu
408183fdf9
Merge pull request #10553 from bdach/fix-key-counter-order
Fix key counter actions displaying out of order
2020-10-19 13:44:08 +09:00
Dean Herbert
467bb9b96f
Merge branch 'master' into beatmap-carousel-refactor 2020-10-19 13:17:11 +09:00
Dean Herbert
bff3856c83 Account for panel height when removing as off-screen 2020-10-19 13:13:32 +09:00
Dean Herbert
ee0efa0b4c Fix off-by-one in display range retrieval logic 2020-10-19 13:05:42 +09:00
Dean Herbert
4590d9b93b Remove outdated comment logic 2020-10-19 13:04:12 +09:00
Bartłomiej Dach
5b96f01564 Fix key counter actions displaying out of order 2020-10-18 19:21:36 +02:00
Bartłomiej Dach
a5b0307cfb Apply same fix to legacy accuracy counter 2020-10-17 15:39:26 +02:00
Bartłomiej Dach
0acc86f757 Split line for readability 2020-10-17 15:39:25 +02:00
unknown
bba9a0b2fe set sprite text anchor and origin to top right 2020-10-17 00:25:16 +08:00
Dean Herbert
daa0a05d9e
Merge pull request #10534 from smoogipoo/fix-ef-ordinal-warning
Silence EF warning due to ordinal being unsupported
2020-10-17 00:19:42 +09:00
Dan Balasescu
dff2ba6e5d
Merge pull request #10531 from peppy/fix-accuracy-scale
Adjust accuracy display to match stable
2020-10-16 23:52:30 +09:00
Dan Balasescu
b7c12ff61e
Merge pull request #10530 from peppy/fix-catch-dual-combo-counter
Fix osu!catch showing two combo counters for legacy skins
2020-10-16 23:52:14 +09:00
smoogipoo
6385d5f369 Replace with local tolist 2020-10-16 23:40:44 +09:00
smoogipoo
81cc5e1c42 Silence EF warning due to ordinal being unsupported 2020-10-16 23:31:37 +09:00
smoogipoo
2586990301 Update resources 2020-10-16 23:19:34 +09:00
smoogipoo
dfbc0965e4 Merge branch 'master' into peppy/skinnable-health-display 2020-10-16 23:17:17 +09:00
Dean Herbert
e87f515a4f
Merge pull request #10522 from Morilli/legacyskin-fixes
Add support for ScorePrefix and ScoreOverlap values in legacy skins
2020-10-16 20:54:03 +09:00
Berkan Diler
fe3a23750c Use char overloads for string methods 2020-10-16 11:52:29 +02:00
Dean Herbert
2ba8bc45fd Also add slight adjustment to score display 2020-10-16 18:37:24 +09:00
Dean Herbert
cbaad4eb56 Adjust accuracy display to match stable 2020-10-16 18:34:14 +09:00
Berkan Diler
cc11283143 Use string.Starts-/EndsWith char overloads 2020-10-16 11:27:02 +02:00
Dean Herbert
8a3bce3cc3 Fix osu!catch showing two combo counters for legacy skins 2020-10-16 18:20:17 +09:00
Dean Herbert
a774de2270 Also add support in LegacyComboCounter 2020-10-16 17:52:22 +09:00
Dean Herbert
24b0a1b84b Switch to direct casts (we can be sure LegacySpriteText is present at this point) 2020-10-16 17:40:07 +09:00
Dean Herbert
3ce6d1fea1 Remove unnecessary AccuracyText enum
All elements use "score" regardless.
2020-10-16 17:36:54 +09:00
Dean Herbert
e9c4b67cf4 Inline variable 2020-10-16 17:35:35 +09:00
Dean Herbert
05f1017c28 Fix lookup check not being updated to use prefix 2020-10-16 17:35:21 +09:00
Dean Herbert
a1892aa0a7 Only additive flash explosions over the epic cutoff 2020-10-16 17:25:55 +09:00
Dean Herbert
77bf050a80 Ignore IgnoreHits for flashiness 2020-10-16 17:24:43 +09:00
Dean Herbert
9572260e6d Add bulge and explode support 2020-10-16 17:09:00 +09:00
Dean Herbert
8104bd0f74 Add fill colour changes 2020-10-16 17:08:46 +09:00
Dean Herbert
5803c72b4c Add support for old marker style danger textures 2020-10-16 17:08:46 +09:00
Dean Herbert
f0b15813e2 Add support for both legacy styles 2020-10-16 17:08:46 +09:00
Dean Herbert
bdebf2f1a4 Fix skinnable test scene still not working with dynamic compilation 2020-10-16 17:08:46 +09:00
Dean Herbert
6d3a106a86 Simplify texture lookups 2020-10-16 17:08:46 +09:00
Dean Herbert
f28bcabae7 Avoid transforms per hp change 2020-10-16 17:08:46 +09:00
Dean Herbert
a810f56ec8 Move "flash on hit only" logic to binding 2020-10-16 17:08:46 +09:00
Dean Herbert
5be9e30cd0 Add legacy implementation 2020-10-16 17:08:46 +09:00
Dean Herbert
e89c5c3b3c Add dynamic compile exceptions to fix skin test scenes 2020-10-16 17:08:46 +09:00
Dean Herbert
c0a1f2158c Add basic component structure for skinnable health displays 2020-10-16 17:08:46 +09:00
Morilli
df1db8611c move skin-specific config retrieval to GetDrawableComponent 2020-10-16 08:36:20 +02:00
Dan Balasescu
829241a9f0
Merge pull request #10521 from peppy/fix-editor-seek-interval-when-playing
Fix editor not seeking by full beat when track is playing
2020-10-16 13:55:03 +09:00
Dan Balasescu
39a0653859
Merge pull request #10520 from peppy/string-function-culture-inspections
Enable string StartsWith/EndsWith culture inspections and fix usages
2020-10-16 13:54:52 +09:00
Dean Herbert
83482ca15c Fix one more missed occurrence 2020-10-16 13:21:47 +09:00
Morilli
085d8d0ecb Add support for ScorePrefix and ScoreOverlap values in legacy skins 2020-10-16 06:16:20 +02:00
Dean Herbert
aea31d1582 Fix editor not seeking by full beat when track is playing
This is expected behaviour as my osu-stable, and I still stand behind
the reasoning behind it.

Closes #10519.
2020-10-16 13:07:00 +09:00
Dean Herbert
88ffcb9234 Update EndsWith usages 2020-10-16 12:58:34 +09:00
Dean Herbert
88f74921fb Update with new r# inspections 2020-10-16 12:49:39 +09:00
Dean Herbert
cc41845f56 Add missing string function ordinal specifications 2020-10-16 12:49:31 +09:00
Dean Herbert
703f58bb2f Remove last.fm support
Has been broken for ages, and their service isn't really something
people use these days.
2020-10-16 11:54:11 +09:00
Dan Balasescu
583fdc3a95
Merge pull request #10510 from peppy/skinnable-accuracy-display
Add legacy skinning support for accuracy display
2020-10-15 21:20:48 +09:00
Dan Balasescu
5d8cf87155
Merge pull request #10511 from peppy/bottom-error-display
Add support for bottom-anchored hit error display
2020-10-15 20:51:09 +09:00
Dan Balasescu
70b050f212
Merge branch 'master' into skinnable-accuracy-display 2020-10-15 20:28:57 +09:00
Dan Balasescu
1ce0e83e59
Merge branch 'master' into skinnable-score-display 2020-10-15 19:16:03 +09:00
Dan Balasescu
93dfbd5d9e
Merge pull request #10505 from peppy/skin-disabler-refactor
Move ISampleDisabler implementation to Player and FrameStabilityContainer
2020-10-15 19:14:52 +09:00
Dean Herbert
70806deba1 Add support for bottom-anchored hit error display 2020-10-15 19:14:02 +09:00
Dan Balasescu
bfffad8fdb
Merge pull request #10504 from peppy/skinnable-combo-counter
Add legacy skinning support for combo counter
2020-10-15 19:11:22 +09:00
Dean Herbert
d76365ed1b Make container readonly 2020-10-15 18:38:41 +09:00
Dan Balasescu
5640d33d1a
Merge branch 'master' into skin-disabler-refactor 2020-10-15 18:32:50 +09:00
Dean Herbert
6983978c98 Correct top-right element offset by finding the lower top anchor element 2020-10-15 18:30:44 +09:00
Dan Balasescu
2beddf5351
Merge pull request #10495 from FamousPig/mod-customisation-absorb-mouse-input
Fix mod customisation container not absorbing input
2020-10-15 18:25:44 +09:00
Dean Herbert
ca74cf824c Add padding 2020-10-15 18:24:28 +09:00
Dan Balasescu
190f3f36ce
Merge branch 'master' into skinnable-combo-counter 2020-10-15 18:13:00 +09:00
Dan Balasescu
a9075fc47c
Merge pull request #10502 from peppy/hud-available-area
Confine available area for HUD components to exclude the song progress area
2020-10-15 18:12:49 +09:00
Dean Herbert
b31a3fbabb Add test 2020-10-15 18:11:30 +09:00
Dean Herbert
4f6dd15869 Add legacy font lookup support for comma/percent 2020-10-15 17:56:37 +09:00
Dean Herbert
254eba9008 Add and consume skinnable accuracy counter 2020-10-15 17:53:16 +09:00
Dean Herbert
90ff8ff050 Merge branch 'skinnable-combo-counter' into skinnable-score-display 2020-10-15 17:52:06 +09:00
Dean Herbert
37e9f331ad Simplify score font lookup 2020-10-15 17:49:55 +09:00
Dean Herbert
43e5cb90e2 Merge branch 'skinnable-combo-counter' into skinnable-score-display 2020-10-15 17:30:29 +09:00
Dean Herbert
9f51327e4b Fix completely incorrect default positioning logic 2020-10-15 17:29:40 +09:00
Dean Herbert
5b5ba7df93 Remove unused offset 2020-10-15 17:22:34 +09:00
Dean Herbert
d8d085ede9 Align top-right elements with lowest point in score display 2020-10-15 17:14:42 +09:00
Dean Herbert
74c031cfbb Fix ModOverlay not including "UNRANKED" text in size 2020-10-15 17:14:42 +09:00
Dean Herbert
b210147c2e Update combo counter to read from default score display's position correctly 2020-10-15 17:14:42 +09:00
Dean Herbert
950c47287c Fix positioning of score display in HUD overlay 2020-10-15 17:14:42 +09:00
Dean Herbert
e1da64398e Add and consume skinnable score counter 2020-10-15 17:14:42 +09:00
Dean Herbert
219cbec6bd Split out DefaultScoreCounter and make ScoreCounter abstract 2020-10-15 16:32:30 +09:00
Dean Herbert
d5f2aab52e Tidy up SkinnableComboCounter class slightly 2020-10-15 15:37:40 +09:00
Bartłomiej Dach
c3f1a30447 Merge branch 'master' into mod-customisation-absorb-mouse-input 2020-10-15 00:40:27 +02:00
Dean Herbert
e0210f5c4c Ignore failed casts to make tests happy 2020-10-14 23:52:58 +09:00
Dean Herbert
ef2e2894a2
Merge branch 'master' into fix-mania-diffcalc 2020-10-14 23:49:14 +09:00
Dean Herbert
1684c4f412
Merge pull request #10503 from smoogipoo/fix-mod-combinations
Fix MultiMod difficulty calculator combinations not generating correctly
2020-10-14 23:42:59 +09:00
Dean Herbert
8b864c8c22
Merge branch 'master' into fix-multimod-copy 2020-10-14 22:29:38 +09:00
smoogipoo
ed57b1363f Remove unused usings 2020-10-14 20:08:46 +09:00
smoogipoo
c4fdd35223 Fix same-type incompatibility through multimod 2020-10-14 19:53:37 +09:00
Dean Herbert
e3eaba7b2c Move ISampleDisabler implementation to Player and FrameStabilityContainer 2020-10-14 19:39:48 +09:00
smoogipoo
e9ebeedbe2 Refactor generation 2020-10-14 19:32:30 +09:00
Dean Herbert
ac4f56403d Adjust size/position 2020-10-14 19:16:34 +09:00
Dean Herbert
7f5ea57bd4 Clean-up pass (best effort) on LegacyComboCounter 2020-10-14 19:16:34 +09:00
Dean Herbert
9bb8a43bce Combine LegacyComboCounter and ComboCounter classes 2020-10-14 19:16:34 +09:00
Dean Herbert
fbbea48c8c Add score text skinnability 2020-10-14 19:16:34 +09:00
Dean Herbert
2fce064e32 Add basic legacy combo counter and updating positioning logic 2020-10-14 19:16:34 +09:00
Dean Herbert
6a6718ebab Allow bypassing origin/anchor setting of skinnable components
It makes little sense to set these when using RelativeSizeAxes.Both
2020-10-14 19:16:34 +09:00
Dean Herbert
899bac6ca5 Rename catch combo counter for clarity 2020-10-14 19:16:34 +09:00
Dean Herbert
f5623ee21e Setup skinnable combo counter component with default implementation 2020-10-14 19:16:34 +09:00
Dean Herbert
60603d2918 Add skin components and interfaces 2020-10-14 19:16:34 +09:00
Dean Herbert
98acf1e31d Make field read only 2020-10-14 19:16:25 +09:00
smoogipoo
d7a52e97ff Fix multimod difficulty combinations not generating correctly 2020-10-14 19:03:11 +09:00
Dean Herbert
a7f8e26e35 Adjust bottom-right elements positions based on song progress display 2020-10-14 18:51:53 +09:00
Dean Herbert
0cf3e90904 Update SongProgress height based on its dynamic height during resize 2020-10-14 18:44:22 +09:00
Dean Herbert
ace9fbc8d3 Confine available area for HUD components to excluse the song progress area 2020-10-14 18:44:22 +09:00
smoogipoo
f04aec538f Fix MultiMod throwing exceptions when creating copies 2020-10-14 18:12:19 +09:00
Dean Herbert
207c409792
Merge branch 'master' into fix-mania-diffcalc 2020-10-14 15:26:32 +09:00
Dean Herbert
3e326a9234 Use bindable flow for event propagation 2020-10-14 15:22:17 +09:00
Dean Herbert
24eff8c66d Rename container to match "settings" term used everywhere 2020-10-14 15:13:49 +09:00
Dean Herbert
30e1fce7a4 Reduce alloc overhead of DrawableCarouselBeatmapSet using new function-based ctor 2020-10-14 15:10:50 +09:00
Dean Herbert
07e6609e6d Disable difficulty calculation for set-level difficulty icons 2020-10-14 14:16:22 +09:00
Leon Gebler
3fd913b13f rename customisation container class 2020-10-13 19:38:25 +02:00
Bartłomiej Dach
1af17fbd5e
Merge branch 'master' into fix-early-break-cull 2020-10-13 18:02:08 +02:00
Leon Gebler
663b806974 move ModSettingsContainer to seperate component 2020-10-13 17:45:40 +02:00
Dean Herbert
e662dc5342 Add missing licence headers 2020-10-13 20:57:26 +09:00
Dean Herbert
8057ea1097 Fix formatting issues 2020-10-13 20:50:36 +09:00
Dean Herbert
3d416f4d64 Clean up beatmapSet resolution in DrawableCarouselBeatmapSet 2020-10-13 19:31:29 +09:00
Dean Herbert
75b6a5e17e Remove unnecessary hack (fixed via framework update) 2020-10-13 19:31:29 +09:00
Dean Herbert
5d11db7753 Locallise ChildItems to DrawableCarouselBeatmapSet for clarity 2020-10-13 19:31:29 +09:00
Dean Herbert
37daefc2b5 Remove outdated comment 2020-10-13 19:12:33 +09:00
Dean Herbert
8eca28e8bc Add comment about off-screen loading 2020-10-13 19:10:35 +09:00
Dean Herbert
834b0186f4 Adjust fade duration to be slightly shorter 2020-10-13 18:50:10 +09:00
Dean Herbert
2346644c04 Switch DelayedLoadUnloadWrappers to DelayedLoadWrappers
Due to pooling usage, there is no time we need to unload. Switching to
DelayedLoadWrapper cleans up the code and reduces overhead
substantially.
2020-10-13 18:47:40 +09:00
Dean Herbert
a1801f8ae4 Unmark todo for now 2020-10-13 18:47:36 +09:00
Dean Herbert
40a0ab7aaa Avoid allocating CarouselItems for bounds checks 2020-10-13 18:33:31 +09:00
Dean Herbert
4f4f222514 Remove unnecessary fade (already applied by base DrawableCarouselItem) 2020-10-13 18:28:28 +09:00
Dean Herbert
83358d487f Remove logging 2020-10-13 18:18:22 +09:00
Dean Herbert
3d9ea852ec Remove masking override (no longer needed as our size is now correct) 2020-10-13 18:14:23 +09:00
Dean Herbert
69650c16fc Simplify vertical position calculations by including spacing in height definition 2020-10-13 18:13:36 +09:00
Dean Herbert
b1ddb08a4e Fix right click context menus appearing in incorrect locations 2020-10-13 18:01:12 +09:00
Dean Herbert
d9a6a6b245 Split content out into own class 2020-10-13 18:01:12 +09:00
Dean Herbert
9b2ebb8f0f Fix main content DelayedLoadUnloadWrapper not getting a valid size before load 2020-10-13 17:45:41 +09:00
Dean Herbert
f3b937e358 Fix masking issues with certain aspect ratio displays 2020-10-13 17:37:33 +09:00
Dean Herbert
fdd4d95cdc Fix difficulties being at incorrect vertical positions after filter is applied 2020-10-13 17:37:33 +09:00
Dean Herbert
1f0aa974dd Fix failing tests 2020-10-13 17:37:33 +09:00
Dean Herbert
b536f571fd Move header height propagation to update for safety 2020-10-13 17:37:33 +09:00
Dean Herbert
ded09b78cb Avoid usage of AutoSize for DrawableCarouselItems in general 2020-10-13 17:37:33 +09:00
Dean Herbert
cecdf14f53 Avoid reconstructing beatmap difficulties that were recently displayed 2020-10-13 17:37:33 +09:00
Dean Herbert
1da49073ab Calculate content height automatically 2020-10-13 17:37:33 +09:00
Dean Herbert
c08b5e8d03 Align beatmap difficulties correctly 2020-10-13 17:37:33 +09:00
Dean Herbert
cfec4f4fc1 Extract header element from base DrawableCarouselItem class 2020-10-13 17:37:33 +09:00
Dean Herbert
2aad482545 Fix x offsets of difficulties not being updated 2020-10-13 17:37:33 +09:00
Dean Herbert
1b7e3397c6 Use expiry to avoid ToArray 2020-10-13 17:37:33 +09:00
Dean Herbert
075bf23714 Better track off-screen drawables (and return to pool less often) 2020-10-13 17:37:33 +09:00
Dean Herbert
29983afcef Replace pool/cleanup logic with simplest form possible
This will temporarily break panels that go off-screen, as they will
disappear immediately
2020-10-13 17:37:33 +09:00
Dean Herbert
06e84c8eb3 Add comments and split out update steps into a more logical flow 2020-10-13 17:37:33 +09:00
Dean Herbert
20b54fb904 Move transform clean-up to pooling free call 2020-10-13 17:37:33 +09:00
Dean Herbert
f6aa448523 Store y positions inside items rather than in a separate array 2020-10-13 17:37:33 +09:00
Dean Herbert
b92c22ad42 Add logging 2020-10-13 17:37:33 +09:00
Dean Herbert
9814e9ba7f Split classes out to reduce loc burder on DrawableCarouselBeatmapSet 2020-10-13 17:37:33 +09:00
Dean Herbert
975cd5a840 Add back beatmap difficulty appear/disappear movement 2020-10-13 17:37:33 +09:00
Dean Herbert
fd8654cff3 Add back difficulty panel spacing 2020-10-13 17:37:33 +09:00
Dean Herbert
ce67f65084 Fix single results not showing up 2020-10-13 17:37:33 +09:00
Dean Herbert
220c8ba2c4 Fix incorrect vertical offsets when difficulties are filtered away 2020-10-13 17:37:33 +09:00
Dean Herbert
82f9ca3de9 Bind to filter event changes in base drawable item 2020-10-13 17:37:33 +09:00
Dean Herbert
813ee19728 Use existing event flow for rendering beatmap difficulties 2020-10-13 17:37:33 +09:00
Dean Herbert
8847cedf29 Add initial pass of vertical transforms 2020-10-13 17:37:33 +09:00
Dean Herbert
15325f5f51 Base bounds checks on +1 (to avoid worrying about current item heights) 2020-10-13 17:37:33 +09:00
Dean Herbert
bb03c5d77c Temporarily disable masking temporarily to fix panels disappearing at extents 2020-10-13 17:37:33 +09:00
Dean Herbert
524419d5e4 Fix filtered items being considered for height calculation 2020-10-13 17:37:33 +09:00
Dean Herbert
0a144a1388 Correctly free panels after use to avoid finalizer disposal of subtree 2020-10-13 17:37:33 +09:00
Dean Herbert
c5a6f4b453 Fix scroll to selected beatmap 2020-10-13 17:37:33 +09:00
Dean Herbert
5c29aa8cce Fix multiple difficulties being expanded at once 2020-10-13 17:37:33 +09:00
Dean Herbert
5c2f134665 Add back left offset for selected set 2020-10-13 17:37:33 +09:00
Dean Herbert
3cfc0dc82d Add safeties to beatmap panel loading code 2020-10-13 17:37:33 +09:00
Dean Herbert
954d43ef56 Debounce state application events 2020-10-13 17:37:33 +09:00
Dean Herbert
ca1f5dcada Add back panel padding 2020-10-13 17:37:33 +09:00
Dean Herbert
0400b34349 Load more components asynchronously after pool resolution 2020-10-13 17:37:33 +09:00
Dean Herbert
f3b24b9bb5 Avoid performing eager selection constantly on adding ranges of new children 2020-10-13 17:37:33 +09:00
Dean Herbert
0a978c6131 Add basic pooling setup 2020-10-13 17:37:33 +09:00
Dean Herbert
f17d661c1a Add basic range-based invalidation 2020-10-13 17:37:33 +09:00
Dean Herbert
3143224e5b Refactor how drawable carousel items are constructed 2020-10-13 17:37:33 +09:00
Dean Herbert
9193f5b0ba Expose panel height from non-drawable models 2020-10-13 17:37:33 +09:00
Dean Herbert
a393bbe8f7 Remove direct drawable storage from carousel models 2020-10-13 17:37:33 +09:00
Dean Herbert
b08e7ce1f5 Update BaseColour specification 2020-10-13 17:37:24 +09:00
Dean Herbert
41d82e3e8a Update framework 2020-10-13 17:34:11 +09:00
Bartłomiej Dach
68b505ab86 Extract helper function for pp value handling 2020-10-12 22:14:45 +02:00
Bartłomiej Dach
d4ba9d2682 Simplify implementation of CalculatePerformanceAsync 2020-10-12 22:10:02 +02:00
Bartłomiej Dach
7117fd0fba Add xmldoc and nullability annotations 2020-10-12 21:44:04 +02:00
Bartłomiej Dach
779e6e10a7 Split ctors to avoid passing fields one by one 2020-10-12 21:43:14 +02:00
Leon Gebler
1a85123b89 rename container class to be more descriptive 2020-10-12 21:24:42 +02:00
Leon Gebler
7df9282727 CodeAnalysis fixes 2020-10-12 15:58:34 +02:00
Dean Herbert
5ff61142ad
Merge pull request #10489 from smoogipoo/fix-convert-difficulty-icons
Fallback to default ruleset star rating if conversion fails
2020-10-12 21:57:13 +09:00
smoogipoo
372761a46f More/better commenting 2020-10-12 19:22:34 +09:00
smoogipoo
eb4ef157ca Fix implicit segments not being constructed correctly 2020-10-12 19:16:37 +09:00
smoogipoo
48c0ae40ef Fix multi-segment sliders not parsing correctly 2020-10-12 18:04:28 +09:00
smoogipoo
ccf7e2c49a Fallback to default ruleset star rating if conversion fails 2020-10-12 16:31:42 +09:00
smoogipoo
379971578d Remove culling notice from HasEffect 2020-10-12 15:28:16 +09:00
Leon Gebler
e5548a1216 Move ModSettingsContainer class inside ModSelectOverlay 2020-10-12 00:16:18 +02:00
Dean Herbert
8431a5a23c
Merge pull request #10483 from Joehuu/add-extended-stats-keyboard-shortcut 2020-10-11 22:48:42 +09:00
Dean Herbert
a246991c50
Merge pull request #10472 from LeNitrous/expose-player-isbreaktime
Expose BreakTracker.IsBreakTime in Player
2020-10-11 22:36:24 +09:00
Dean Herbert
de6fe34361 Bind to local bindable and combine dual bindings 2020-10-11 21:51:48 +09:00
Dean Herbert
5fcdee6fd8 Remove cast and expose as IBindable 2020-10-11 21:46:55 +09:00
Joehu
8faa86b048 Add ability to toggle extended statistics using space or enter 2020-10-10 18:32:22 -07:00
unknown
6a52c98a42 make IsBreakTime its own bindable and bind it to BreakTracker on load 2020-10-11 06:15:20 +08:00
Dean Herbert
16a78b3172
Merge pull request #10478 from bdach/fix-beatmap-difficulty-rating-rounding
Apply rounding when calculating beatmap difficulty rating
2020-10-11 03:36:59 +09:00
Lucas A
e845cc92b8 Round pp values to nearest integer. 2020-10-10 19:58:06 +02:00
Bartłomiej Dach
09f3c0f091
Merge branch 'master' into search-via-online-id 2020-10-10 19:40:25 +02:00
Lucas A
a0e6226b7a Rename LocalId -> LocalScoreID 2020-10-10 19:19:24 +02:00
Lucas A
de522d53ea Make CalculatePerformanceAsync() nullable. 2020-10-10 19:16:21 +02:00
Bartłomiej Dach
8af78656e4 Add precision tolerance to difficulty rating range checks 2020-10-10 18:15:52 +02:00
unknown
7bbdd6ab25 expose break time bindable 2020-10-10 21:07:17 +08:00
Dean Herbert
73c238fae3 Add the ability to search for local beatmaps via online IDs
Closes #10470.
2020-10-10 21:34:11 +09:00
Bartłomiej Dach
146b15371d
Merge branch 'master' into fix-slider-sample-parsing 2020-10-10 14:02:33 +02:00
Lucas A
6459ce28a3 Don't calculate performance if difficulty attributes aren't locally computable. 2020-10-09 18:32:03 +02:00
Sebastian Krajewski
f41fc71e42 Allow storyboard animations to load textures from skins 2020-10-09 18:02:21 +02:00
Sebastian Krajewski
cf76d77762 Fix osu!classic skin elements not showing up in storyboards 2020-10-09 17:34:01 +02:00
Sebastian Krajewski
e0b5ead223
Merge branch 'master' into storyboard-skin-sprites 2020-10-09 16:55:45 +02:00
Dean Herbert
b0f8a7794a Make SelectionHandler require EditorBeatmap presence 2020-10-09 21:44:10 +09:00
smoogipoo
8f37d2290a Expose sorting of hitobjects 2020-10-09 21:43:46 +09:00
smoogipoo
485a951281 Expose current strain and retrieval of peak strain 2020-10-09 21:42:43 +09:00
smoogipoo
d536a1f75e Fix breaks being culled too early 2020-10-09 21:04:56 +09:00
Dean Herbert
681e88af40
Merge branch 'master' into editor-fix-button-states-after-paste 2020-10-09 20:51:09 +09:00
smoogipoo
696e3d53af Fix slider samples being overwritten by the last node 2020-10-09 20:50:09 +09:00
Dean Herbert
da03084251
Merge pull request #10449 from smoogipoo/ensure-conversion-stability
Ensure stable sorting order in beatmap conversion tests
2020-10-09 20:49:04 +09:00
smoogipoo
573336cb47 Ensure stable sorting order in beatmap conversion tests 2020-10-09 20:12:17 +09:00
Dan Balasescu
ecfb7e94c5
Merge branch 'master' into fix-editor-batch-handling 2020-10-09 20:06:06 +09:00
Dan Balasescu
07f19342d1
Merge pull request #10428 from peppy/editor-reset-newcombo-on-placement
Reset new combo button state after successful placement
2020-10-09 19:48:47 +09:00
Dan Balasescu
8515978acd
Merge pull request #10447 from peppy/update-framework
Update framework
2020-10-09 19:37:10 +09:00
Dan Balasescu
bcc096ee49
Merge pull request #10446 from peppy/fix-timeline-tick-bar-lines
Fix bar lines ("down beat" as people call it) showing up too often in timeline
2020-10-09 19:24:29 +09:00
Dan Balasescu
93f5ea57a5
Merge pull request #10427 from peppy/fix-hidden-first-object
Fix first hitobject in osu! hidden mod not getting correct fade applied
2020-10-09 19:23:47 +09:00
Dan Balasescu
62690e4873
Merge pull request #10432 from peppy/editor-reverse-pattern
Add "reverse pattern" support to editor selection handler
2020-10-09 19:19:24 +09:00
Dean Herbert
021777145f Update framework 2020-10-09 18:51:52 +09:00
Dean Herbert
3838f405dd Fix missed usages 2020-10-09 18:50:05 +09:00
Dean Herbert
edaf6db5c6 Reference EditorBeatmap directly for selected objects 2020-10-09 18:44:23 +09:00
Dean Herbert
21c6242f90 Fix bar lines ("down beat" as people call it) showing up too often in timeline 2020-10-09 18:35:44 +09:00
Dan Balasescu
a6d19cd2d6
Merge pull request #10431 from peppy/fix-distribution-graph-rounding
Fix incorrect timing distribution display due to lack of rounding
2020-10-09 18:12:29 +09:00
Dan Balasescu
6572ce5f36
Merge pull request #10441 from peppy/editor-selection-blueprint-performance
Improve performance of slider blueprints
2020-10-09 18:01:25 +09:00
Dan Balasescu
a1226ccaa2
Merge pull request #10440 from peppy/fix-editor-song-after-exit
Fix editor playing deleted beatmap's track on exit-without-save
2020-10-09 17:58:31 +09:00
Dan Balasescu
4881a13f4b
Merge pull request #10443 from peppy/editor-timeline-tick-display-performance
Improve TimelineTickDisplay performance
2020-10-09 17:53:12 +09:00
Dean Herbert
5d888f687a Account for the width of points so they don't suddenly appear at timeline edges 2020-10-09 16:49:51 +09:00
Dean Herbert
ceb1494c33 Only run regeneration when passing a new min/max tick boundary 2020-10-09 16:47:29 +09:00
Dean Herbert
017a8ce496 Only recalculate when display actually changes 2020-10-09 15:57:31 +09:00
Dean Herbert
9baf704942 Add local pooling to TimelineTickDisplay 2020-10-09 15:48:24 +09:00
Dean Herbert
beec0e4193 Hide children of SelectionBlueprint when not selected 2020-10-09 14:03:13 +09:00
Dean Herbert
8be19fd820 Increase height of contracted score panel to fit mods again 2020-10-09 13:26:09 +09:00
Dean Herbert
389ffe7da5 Hide bonus result types from score table for the time being 2020-10-09 13:23:18 +09:00
Dean Herbert
07558b5bc0 Merge branch 'master' into ruleset-result-types 2020-10-09 13:17:05 +09:00
Dean Herbert
68039cff40 Set beatmap to sane default on exiting editor 2020-10-09 13:12:48 +09:00
Dean Herbert
c86b37f60d Add check to ensure MusicController doesn't play a delete pending beatmap's track 2020-10-09 13:11:24 +09:00
Dean Herbert
6649cb2204 Fix incorrect first object logic 2020-10-09 06:41:53 +09:00
Dean Herbert
825e10ec8c Add reverse handler button to selection box 2020-10-09 06:32:23 +09:00
Dean Herbert
eacc7dca9a Fix SliderPath not handling Clear correctly 2020-10-09 06:31:59 +09:00
Dean Herbert
85b33fffd0 Fix incorrect comments 2020-10-09 05:14:44 +09:00
Dean Herbert
ff5a1937f5 Fix test logic and stabilise rounding direction 2020-10-09 05:04:03 +09:00
Dean Herbert
a5b2c4195e Fix incorrect timing distribution display due to lack of rounding 2020-10-09 04:41:45 +09:00
Bartłomiej Dach
c867fb4985
Merge branch 'master' into update-check-improvements 2020-10-08 21:32:26 +02:00
Dean Herbert
5966205037 Fix ternary button states not updating correctly after a paste operation 2020-10-09 04:31:45 +09:00
Dean Herbert
e7eda19b07 Reset new combo button state after successful placement 2020-10-09 03:31:01 +09:00
Dean Herbert
2d0275ba95 Fix first hitobject in osu! hidden mod not getting correct fade applied 2020-10-09 03:07:01 +09:00
Lucas A
fa201be2ad Simplify PerformanceCacheLookup 2020-10-08 18:31:29 +02:00
Dean Herbert
8dddd8aff5
Merge pull request #9883 from swoolcock/confine-during-gameplay
Add "During Gameplay" option for mouse confining
2020-10-08 20:25:27 +09:00
Dean Herbert
4ccd751604 Further simplify non-transactional change logic 2020-10-08 18:42:53 +09:00
Dean Herbert
3114174e09 Add missing non-transactional SaveState calls 2020-10-08 18:41:03 +09:00
Dean Herbert
dbdb25ccf7 Move reset logic to OsuGame 2020-10-08 18:29:19 +09:00
Dean Herbert
43a575484a Remove pointless comments 2020-10-08 18:29:09 +09:00
Dean Herbert
0967db768f Add xmldoc covering usage restrictions 2020-10-08 18:28:56 +09:00
Dean Herbert
afed832b19 Tidy up EditorBeatmap slightly 2020-10-08 18:06:49 +09:00
Dean Herbert
1027b608ff Copy list content before firing events to avoid pollution 2020-10-08 18:04:07 +09:00
Dean Herbert
38babf3de5 Update usages of ChangeHandler to EditorBeatmap where relevant 2020-10-08 18:04:07 +09:00
Dean Herbert
b2d93f799f Hook ChangeHandler to transactional events rather than individual ones 2020-10-08 18:04:07 +09:00
Dean Herbert
0781fbd443 Make EditorBeatmap implement TransactionalCommitComponent 2020-10-08 18:04:07 +09:00
Dean Herbert
a9bca671d0 Make component and add hooking events 2020-10-08 18:04:07 +09:00
Dean Herbert
ce04daf053 Split transaction handling code out into base class 2020-10-08 18:04:07 +09:00
Dean Herbert
ef092de9ba Add missing UpdateHitObject calls and move local to usages (not via bindables) 2020-10-08 18:04:07 +09:00
Bartłomiej Dach
ac44f6f679 Ensure control point group exists after move
If the control point group moved was empty, it would not be created due
to a lack of ControlPointInfo.Add() calls.
2020-10-07 23:10:28 +02:00
Bartłomiej Dach
b1029a124c Move event subscription to LoadComplete
Prevents attempting to read from the `colours` field before it is
actually injected.
2020-10-07 22:57:20 +02:00
Bartłomiej Dach
7109c3b6cd Rename variable as suggested 2020-10-07 21:06:24 +02:00
Bartłomiej Dach
4ba8d823d3
Merge branch 'master' into fix-quick-retry-music-playback 2020-10-07 20:57:10 +02:00
Endrik Tombak
2b6e4e575e Award max combo portion score if max achievable is 0 2020-10-07 17:04:55 +03:00
Endrik Tombak
74af7cc503 Rework ScoreProcessor 2020-10-07 17:00:00 +03:00
Dean Herbert
1989141968
Merge branch 'master' into tourney-asset-refactor 2020-10-07 21:34:07 +09:00
Lucas A
cd15f83f85 Update ScorePerformanceCalculator code path. 2020-10-07 14:10:25 +02:00
Lucas A
a425cf4a31 Fix broken class reference. 2020-10-07 13:29:10 +02:00
Lucas A
7f5cf04b2b Fix merge conflicts. 2020-10-07 13:28:49 +02:00
Dean Herbert
1566882dc4
Merge pull request #10338 from Game4all/perf-calculator-remove-working-beatmap
Remove WorkingBeatmap from PerformanceCalculator
2020-10-07 20:04:24 +09:00
Dan Balasescu
6636b64cbd
Merge pull request #10407 from peppy/fix-sample-disposed-on-skin-change
Don't force playback of (non-looping) DrawableHitObject samples after skin change
2020-10-07 19:34:53 +09:00
Dean Herbert
94a6e28565 Add back second removed condition 2020-10-07 18:40:09 +09:00
Dean Herbert
3c3c1ce885 Don't force playback of (non-looping) DrawableHitObject samples after skin change 2020-10-07 18:18:01 +09:00
Dean Herbert
04fa0bff9d Add CanBeNull spec and xmldoc 2020-10-07 17:46:57 +09:00
Dean Herbert
f1a3b6d0ba Merge branch 'master' into perf-calculator-remove-working-beatmap 2020-10-07 17:43:17 +09:00
Dean Herbert
0f6eb9d4cb Ensure music playback is stopped when retrying by any means 2020-10-07 17:40:54 +09:00
Dean Herbert
5171c18a4b
Merge branch 'master' into ruleset-result-types 2020-10-07 17:04:02 +09:00
Dean Herbert
f77ad8cf39 Remove unused using 2020-10-07 17:03:34 +09:00
Dan Balasescu
54ca544855
Merge pull request #10400 from peppy/fix-first-hitobject-must-be-combo
Ensure first hitobject is always a new combo
2020-10-07 17:01:31 +09:00
Dean Herbert
31d347be5c Make extended score panel taller to better fit all information 2020-10-07 16:50:00 +09:00
Shane Woolcock
f88ba1734b Remove ConfineMouseTracker field 2020-10-07 18:11:47 +10:30
Dan Balasescu
f206ea96ce
Merge pull request #10391 from peppy/editor-setup-screen-difficulty-adjust
Add difficulty adjustment settings to editor setup screen
2020-10-07 16:33:10 +09:00
Dean Herbert
67398b5d95 Move timestamp text out of flow and attach to bottom edge 2020-10-07 16:30:14 +09:00
Shane Woolcock
2e0a9f53c1 Add test coverage 2020-10-07 17:52:39 +10:30
Dan Balasescu
fbb10f6774
Merge branch 'master' into fix-first-hitobject-must-be-combo 2020-10-07 16:21:00 +09:00
Dean Herbert
6ac70945f2 Show bonus judgements on expanded panel 2020-10-07 16:17:28 +09:00
Dean Herbert
c0bc6a75b3 Show auxiliary judgements on next line 2020-10-07 16:17:17 +09:00
Dean Herbert
e281d724b8 Consume display name logic 2020-10-07 15:43:52 +09:00
Dean Herbert
3363c3399e Allow rulesets to specify valid HitResult types (and display names for them) 2020-10-07 15:34:23 +09:00
Dean Herbert
d6d0bd90a3 Extract tuple into class 2020-10-07 15:34:03 +09:00
Dan Balasescu
338b4c56ce
Merge pull request #10399 from peppy/editor-beatmap-batch-change-support
Add editor beatmap batch change support
2020-10-07 14:57:51 +09:00
Shane Woolcock
8b8eb00bd7 Permit nulls rather than casting to OsuGame 2020-10-07 16:16:58 +10:30
Shane Woolcock
d1ec380692 Don't cache ConfineMouseTracker 2020-10-07 16:15:32 +10:30
Shane Woolcock
485bd962c7 Also reset LocalUserPlaying in OnSuspending 2020-10-07 16:15:17 +10:30
Shane Woolcock
7fff762dfc Rename IsGameplay 2020-10-07 16:14:49 +10:30
Shane Woolcock
c8c5998af4 Bail if FrameworkSetting.ConfineMouseMode is unavailable 2020-10-07 16:02:35 +10:30
Dean Herbert
a6d1484ad5 Add arbirary precision specification for now 2020-10-07 14:26:01 +09:00
Dan Balasescu
2ef5a34ace
Merge branch 'master' into editor-beatmap-batch-change-support 2020-10-07 14:08:49 +09:00
Dean Herbert
a8151d5c63 Fix HitWindows getting serialized alongside HitObjects
These were being serialized as the base type. On deserialization, due to
the HitWindow of objects being non-null, they would not get correctly
initialised by the CreateHitWindows() virtual method.

- Closes #10403
2020-10-07 13:45:42 +09:00
Dean Herbert
c1a8fe01ef Fix postprocess order in batch events 2020-10-07 11:09:45 +09:00
Shane Woolcock
8847b88e65 Fix unit tests trying to resolve OsuGame 2020-10-07 11:44:41 +10:30
Shane Woolcock
ec12a21088 Merge branch 'master' into confine-during-gameplay
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
2020-10-07 11:07:00 +10:30
Lucas A
f5a6beb4e5 Remove obsoletion notice. 2020-10-06 19:01:03 +02:00
Dean Herbert
afe3d3989a Force first hitobject to be a NewCombo in BeatmapProcessor preprocessing step 2020-10-06 22:10:13 +09:00
Dean Herbert
09f5e9c9eb Use batch change application in many places that can benefit from it 2020-10-06 22:10:07 +09:00
Dean Herbert
14c734c244 Add a very simple method of applying batch changes to EditorBeatmap 2020-10-06 22:10:07 +09:00
Dean Herbert
b2dad67ade Fix unresolvable dependency in settings test scene 2020-10-06 21:28:59 +09:00
Shane Woolcock
478f2dec96 Maintain the current gameplay state in OsuGame 2020-10-06 22:39:35 +10:30
Dean Herbert
e8b34ba4ac
Fix incorrectly committed testing change 2020-10-06 20:57:39 +09:00
Dan Balasescu
aae4a74d14
Merge branch 'master' into editor-setup-screen-difficulty-adjust 2020-10-06 20:11:44 +09:00
Dan Balasescu
50872e3839
Merge pull request #10390 from peppy/editor-setup-sections-container
Split editor setup screen up into sections
2020-10-06 20:07:56 +09:00
Dan Balasescu
7d4b495197
Merge pull request #10395 from peppy/editor-timeline-show-repeats
Add repeats display to timeline blueprints
2020-10-06 19:53:50 +09:00
Dan Balasescu
300423579e
Merge pull request #10394 from peppy/add-back-obsoleted-bindable-prop
Add obsoleted Bindable property back to SettingsItem for compatibility
2020-10-06 19:43:24 +09:00
Dean Herbert
461be02e6f Update with underlying changes 2020-10-06 19:34:21 +09:00
Dean Herbert
87d4e86cad Merge branch 'editor-setup-sections-container' into editor-setup-screen-difficulty-adjust 2020-10-06 19:30:32 +09:00
Dan Balasescu
77ccbb087c
Merge pull request #10393 from peppy/fix-editor-backwards-seek
Increase backwards seek magnitude when the track is running
2020-10-06 19:28:28 +09:00
Dean Herbert
06a51297a3 Use content instead of exposing the flow container 2020-10-06 19:26:57 +09:00
Dean Herbert
a2796d2c01 Add repeats display to timeline blueprints 2020-10-06 19:22:35 +09:00
Dan Balasescu
fa65e14455
Merge pull request #10392 from peppy/fix-editor-seek-modifier
Seek at 4x normal speed when holding shift (not 2x)
2020-10-06 19:19:41 +09:00
Dean Herbert
e64cee10b8 Add obsoleted Bindable property back to SettingsItem for compatibility 2020-10-06 19:07:31 +09:00
Shane Woolcock
782fc1d60f Use OsuGame.OverlayActivationMode rather than per-Player 2020-10-06 20:27:35 +10:30
Shane Woolcock
1877312a91 Rename DuringGameplay 2020-10-06 20:27:35 +10:30
Dan Balasescu
064d081138
Merge branch 'master' into editor-setup-sections-container 2020-10-06 18:36:11 +09:00
Dan Balasescu
4036412387
Merge branch 'master' into labelled-slider-bar-2020 2020-10-06 18:29:20 +09:00
Dan Balasescu
e2d081e3cc
Merge pull request #10388 from peppy/editor-setup-placeholder-text
Add placeholder text/colour when no beatmap background is specified yet
2020-10-06 18:29:01 +09:00
Dean Herbert
d5782c95bd
Merge branch 'master' into confine-during-gameplay 2020-10-06 18:05:15 +09:00
Dean Herbert
b1a64f89d7 Increase backwards seek magnitude when the track is running
This matches osu-stable. When the track is running, seeking backwards
(against the flow) is harder than seeking forwards. Adding a mutliplier
makes it feel much better.

Note that this is additive not multiplicative because for larger seeks
the (where `amount` > 1) we don't want to jump an insanely huge amount -
just offset the seek slightly to account for playing audio.
2020-10-06 17:53:12 +09:00
Dean Herbert
3ce234d552 Seek at 4x normal speed when holding shift
This matches osu-stable 1:1. Not sure if it feels better or not but
let's stick with what people are used to for the time being.
2020-10-06 17:47:25 +09:00
Dean Herbert
7e8ab1cb95 Add description text 2020-10-06 17:36:18 +09:00
Dean Herbert
7a20a34aff Add support to EditorBeatmap to update all hitobjects 2020-10-06 17:36:18 +09:00
Dean Herbert
6d7f12ad4b Add basic difficulty setting sliders 2020-10-06 17:33:50 +09:00
Dean Herbert
13b67b93a5 Add difficulty section 2020-10-06 17:33:50 +09:00
Dean Herbert
e1a6f47d90 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:33:50 +09:00
Dean Herbert
505dd37a75 Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:33:50 +09:00
Dean Herbert
98fe5f78ee Split setup screen up into sections (and use a SectionContainer) 2020-10-06 17:29:08 +09:00
Dean Herbert
87bf3bdc16 Add the most basic implementation of LabelledSliderBar feasible 2020-10-06 17:26:06 +09:00
Dean Herbert
28756d862b Add placeholder text/colour when no beatmap background is specified yet 2020-10-06 17:21:01 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dan Balasescu
461fa22e74
Merge pull request #10381 from peppy/ios-update-notifications
Add update notifications for iOS builds
2020-10-06 14:36:49 +09:00
Dean Herbert
5e10ac418b Add update notifications for iOS builds 2020-10-06 13:19:52 +09:00
Dean Herbert
22b0105d62 Show a notification if checking for updates via button and there are none available 2020-10-06 13:00:02 +09:00
Dean Herbert
46f6e84a33 Fix disclaimer potentially running same code from two different threads 2020-10-06 12:33:57 +09:00
Dan Balasescu
783a463772
Merge branch 'master' into colourise-control-point-table 2020-10-05 20:47:06 +09:00
Dan Balasescu
54f1bcf2ce
Merge pull request #10313 from peppy/control-point-timeline-representation
Display all control point information on the main editor timeline
2020-10-05 20:46:52 +09:00
Dean Herbert
6bc0afdafb Fix remaining conflicts 2020-10-05 20:09:18 +09:00
Dan Balasescu
051ea7eda9
Merge pull request #10329 from peppy/editor-file-drop-support
Add drag-drop support in editor setup screen for audio and background images
2020-10-05 20:05:41 +09:00
Dan Balasescu
ef8e6b3d96
Merge pull request #10310 from peppy/osu-selection-flip-rotate-buttons
Add buttons to flip/rotate the current selection by known amounts
2020-10-05 20:02:09 +09:00
Dean Herbert
e20c28f166
Merge pull request #10306 from smoogipoo/dynamic-difficulty-icon 2020-10-05 19:40:18 +09:00
Dan Balasescu
a920342a09
Merge branch 'master' into editor-file-drop-support 2020-10-05 19:28:44 +09:00
Dan Balasescu
2b824787c1
Guard against potential nullref 2020-10-05 19:28:13 +09:00
Dean Herbert
ba55256fb4
Merge branch 'master' into control-point-timeline-representation 2020-10-05 19:24:28 +09:00
Dan Balasescu
6d50a1ed7d
Merge branch 'master' into osu-selection-flip-rotate-buttons 2020-10-05 19:17:33 +09:00
Dan Balasescu
08f7b18dbe
Merge pull request #10294 from peppy/osu-selection-scaling
Add selection scale and rotate support
2020-10-05 19:17:19 +09:00
Dan Balasescu
2df5ea8ba8
Merge branch 'master' into osu-selection-scaling 2020-10-05 18:47:17 +09:00
Dean Herbert
2ed43c14f8
Merge branch 'master' into editor-file-drop-support 2020-10-05 17:48:06 +09:00
Dean Herbert
365a38e92f
Merge branch 'master' into dynamic-difficulty-icon 2020-10-05 17:37:01 +09:00
Dan Balasescu
16a599850c
Merge branch 'master' into more-timeline-toggles 2020-10-05 17:33:18 +09:00
Dan Balasescu
12c84df208
Merge pull request #10371 from peppy/fix-gameplay-seek-sample-pausing
Fix seeking in replays not correctly pausing samples
2020-10-05 17:13:43 +09:00
Dan Balasescu
0c93de858e
Merge pull request #10373 from peppy/fix-hitobject-samples-cut-off
Don't stop non-looping samples immediately when pausing
2020-10-05 17:13:11 +09:00
Dean Herbert
c622adde7a Rename method back and add xmldoc 2020-10-05 16:24:02 +09:00
Dean Herbert
d43ea68709
Merge branch 'master' into fix-gameplay-seek-sample-pausing 2020-10-05 16:21:28 +09:00
Dean Herbert
0605bb9b8d Fix incorrect parent state transfer 2020-10-05 16:20:29 +09:00
Dan Balasescu
d3e1da5922
Merge branch 'master' into editor-timing-screen-change-handling 2020-10-05 15:40:43 +09:00
Dean Herbert
9f43dedf59 Fix missing line 2020-10-05 15:12:34 +09:00