1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 18:32:54 +08:00
Commit Graph

5773 Commits

Author SHA1 Message Date
Dean Herbert
276f6da483
Merge branch 'master' into better-room-participants 2020-02-28 16:42:31 +09:00
smoogipoo
b3220476d7 Rename methods 2020-02-27 20:05:12 +09:00
smoogipoo
085968dd7f Rename recent participants 2020-02-27 20:00:53 +09:00
smoogipoo
22862256c1 Increase time between polls 2020-02-27 19:42:19 +09:00
smoogipoo
fe10a64137 Improve participants list transforms 2020-02-27 19:37:07 +09:00
smoogipoo
97c07281d8 Make ParticipantsList use the new participants property 2020-02-27 19:24:13 +09:00
smoogipoo
99442ec9c3 Implement single-room multiplayer room polling 2020-02-27 19:23:50 +09:00
smoogipoo
101a587641 Disable triangles in triangles intro 2020-02-27 15:51:55 +09:00
smoogipoo
7ad6ad0bb0 Remove hacks that bypassed layout shortcomings 2020-02-27 13:32:23 +09:00
Dean Herbert
ed2bdd7106 Fix stutter when showing game HUD after being hidden for a while 2020-02-26 20:45:57 +09:00
smoogipoo
da89798765 Merge remote-tracking branch 'origin/master' into layout-rework 2020-02-26 15:06:40 +09:00
Dan Balasescu
92bbd71e60
Merge branch 'master' into chart-button-rankings 2020-02-26 09:10:39 +09:00
Lucas A
535a7989d6 Open rankings overlay on spotlights page. 2020-02-25 20:57:15 +01:00
Dean Herbert
d77420d58b
Merge pull request #7977 from peppy/expose-editor-save-to-mobil
Expose save option in editor to non-desktop platforms
2020-02-25 21:24:38 +09:00
Dean Herbert
9557a2cd96 Use object initialiser 2020-02-25 20:52:33 +09:00
Dean Herbert
d6046abe70 Only expose save for now 2020-02-25 18:59:16 +09:00
smoogipoo
f71c45cb1b Remove shallPropagate 2020-02-25 11:30:33 +09:00
smoogipoo
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
Dean Herbert
575946d923 Expose save and export options in editor to non-dekstop platforms 2020-02-23 20:47:14 +09:00
Dean Herbert
0c3286fa5e Merge branch 'judgement-line-performance' into follow-point-performance 2020-02-23 05:36:22 +09:00
Dean Herbert
560cf21b12 Add lenience to comparison
Noticed that they could still stack up on maps with hitcircles at the same point in time (centipede).
2020-02-23 05:29:17 +09:00
Dean Herbert
4949977d7e Merge branch 'judgement-line-performance' into follow-point-performance 2020-02-23 05:14:21 +09:00
Dean Herbert
8dbcdebd28 Use LoadingLayer at player loading screen 2020-02-23 05:00:08 +09:00
Dean Herbert
e8ebb31517 Expire old judgement lines if too many exist 2020-02-23 03:53:51 +09:00
Dean Herbert
3daa49f1bd Clean up old judgement lines if too many are already present 2020-02-23 03:39:12 +09:00
Dean Herbert
5aa5a1bbdd Reduce transform time of judgement lines (visually looks almost the same) 2020-02-23 03:36:15 +09:00
Lucas A
c9d600b69c Show RankingsOverlay when clicking on charts button 2020-02-22 11:55:34 +01:00
Dean Herbert
92f6f0207c Rename LoadingAnimation to LoadingSpinner 2020-02-21 15:33:31 +09:00
Dean Herbert
623b78d675 Combine all loading animation implementations 2020-02-21 15:32:46 +09:00
Dean Herbert
cd666166d5
Merge pull request #7809 from voidedWarranties/proposal-difficulty-icon-select
Allow selecting/playing a specific difficulty using the beatmapset difficulty icons
2020-02-21 10:24:12 +09:00
Dean Herbert
db4fe4f728
Merge branch 'master' into adjust-beatmap-overlay 2020-02-21 09:52:44 +09:00
Dean Herbert
3380dbbd71 Improve visual appearance of ProcessingOverlay 2020-02-20 19:49:22 +09:00
Dean Herbert
4a3f281855 Make buttons purple 2020-02-20 18:56:14 +09:00
Dean Herbert
a0b578082e Make ready button also have triangles 2020-02-20 18:56:00 +09:00
Dean Herbert
e7fca689b1 Change text on playlist add button to be nicer 2020-02-20 18:56:00 +09:00
Dean Herbert
76c57a695b Change create room button colouring to match design 2020-02-20 18:56:00 +09:00
Dean Herbert
a94a6eb94e
Merge pull request #7900 from smoogipoo/room-inspector-redesign
Update the multiplayer room inspector design
2020-02-20 18:55:03 +09:00
Dean Herbert
973093b522 Fix non-selectable playlist items not forwarding clicks to children 2020-02-20 18:32:34 +09:00
Dean Herbert
063fe191ef Add back missing using 2020-02-20 18:15:40 +09:00
Dean Herbert
e25e9b6164 Merge branch 'master' into multiplayer-header-background 2020-02-20 18:04:02 +09:00
Dean Herbert
a11862ba0d Improve transition between multiplayer screens (and share constants) 2020-02-20 18:03:53 +09:00
Dean Herbert
927115a085
Merge branch 'master' into room-inspector-redesign 2020-02-20 17:41:16 +09:00
smoogipoo
17b669fdf7 Refactor to detail the sizing mode setting 2020-02-20 14:32:16 +09:00
Dan Balasescu
51f03d0f07
Adjust comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-20 14:28:38 +09:00
smoogipoo
f53349ac9d Reduce size of participants tiles 2020-02-19 19:54:48 +09:00
smoogipoo
3338241632 Add back filter control background, adjust opacity 2020-02-19 19:48:34 +09:00
smoogipoo
e966689044 Add beatmap background to multiplayer 2020-02-19 19:42:25 +09:00
smoogipoo
ac416ae743 Implement new room inspector redesign 2020-02-19 17:47:59 +09:00
smoogipoo
ec73e8f0c7 Allow different sizing modes for OverlinedParticipants 2020-02-19 17:40:38 +09:00
smoogipoo
380d200b46 Allow different sizing modes for OverlinedDisplay 2020-02-19 17:34:47 +09:00
smoogipoo
e3d37b808d Move overlined displays to a higher namespace 2020-02-19 17:33:09 +09:00
Dean Herbert
b18f9e195e Merge branch 'master' into bindable-list-events 2020-02-18 18:47:06 +09:00
smoogipoo
f9145ce5b4 Fix playlist items added with the wrong IDs 2020-02-17 17:02:19 +09:00
smoogipoo
958c891d15 Update with framework-side bindable list changes 2020-02-17 15:06:14 +09:00
TheWildTree
64a9b9c6fb Remove redundant using directives 2020-02-16 21:52:08 +01:00
TheWildTree
4d180a685a Adjust font sizes and spacing in BeatmapSetOverlay 2020-02-16 21:43:33 +01:00
voidedWarranties
8c81f1e684 Move CarouselBeatmap access to private, test using indices 2020-02-15 17:51:55 -08:00
Dan Balasescu
268f3333bd
Merge pull request #7841 from peppy/update-inspectcode
Update inspectcode version and fix new issues
2020-02-16 00:53:04 +09:00
Dean Herbert
a51fdfb95e
Merge pull request #7839 from smoogipoo/match-subscreen-redesign
Redesign match subscreen to add playlist support
2020-02-15 21:11:39 +09:00
Dean Herbert
a8be437103 Fix failing tests 2020-02-15 20:29:38 +09:00
recapitalverb
2778c6617c
Merge branch 'master' into remove-duplicated-load 2020-02-15 15:13:35 +07:00
Dean Herbert
2e24ceb223 Move duration higher in match settings display 2020-02-15 16:58:35 +09:00
Dean Herbert
7c29327167 Fix download button being visible for already downloaded playlist items 2020-02-15 16:56:11 +09:00
Dean Herbert
e8f1335b47 Allow for easier selection by disabling clickability of contained elements until selected 2020-02-15 16:54:37 +09:00
Dean Herbert
e2e157b455 Add minimum size rules to fix overlap at non-wide resolutions 2020-02-15 15:52:27 +09:00
Dean Herbert
19d61c1255 Merge branch 'master' into match-subscreen-redesign 2020-02-15 15:29:33 +09:00
Dean Herbert
f54844d8a5 Schedule selection update handling in MatchSubScreen to avoid firing when not the current screen 2020-02-15 15:07:10 +09:00
Dean Herbert
637c1dc840 In the case of only one playlist item, update with current selection on select 2020-02-15 14:41:16 +09:00
recapitalverb
7c9569c9a3
Merge branch 'master' into remove-duplicated-load 2020-02-15 12:10:34 +07:00
Dean Herbert
da68ae5461 Merge branch 'master' into match-songselect-playlist-logic 2020-02-15 12:27:51 +09:00
Dean Herbert
bb541f5ae4 Update inspectcode version and fix new issues 2020-02-15 11:54:29 +09:00
Dean Herbert
a4215106ff Merge branch 'master' into match-detail-area 2020-02-15 11:46:29 +09:00
Dean Herbert
af8eda2d24
Merge pull request #7829 from smoogipoo/match-playlist
Implement a rearrangeable beatmap playlist control
2020-02-15 11:42:26 +09:00
Dean Herbert
0b90e732a9
Merge branch 'master' into match-playlist 2020-02-15 11:09:17 +09:00
voidedWarranties
8e1ecddb1d Add testing 2020-02-14 17:23:24 -08:00
smoogipoo
3b2e4ecb2d Merge branch 'match-playlist' into match-subscreen-redesign 2020-02-14 23:40:04 +09:00
smoogipoo
61d539dc67 Fix first playlist item not getting selected 2020-02-14 23:39:39 +09:00
recapitalverb
c46d828716 Preserve permitNulls 2020-02-14 20:59:51 +07:00
recapitalverb
10798aeab3 Fix code formatting 2020-02-14 20:30:27 +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
smoogipoo
25e399f11b Merge branch 'match-playlist' into match-detail-area 2020-02-14 17:04:22 +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
smoogipoo
5e871f9838 Make room playlist use the common rearrangeable design 2020-02-14 15:36:47 +09:00
smoogipoo
eb14dbcd77 Initial implementation of rearrangeable playlist 2020-02-14 15:01:45 +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
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
Dean Herbert
d7c71cd0c1
Merge branch 'master' into update-placement-more-often 2020-02-13 23:55:18 +09:00
Dean Herbert
4a04b434a9
Merge branch 'master' into remove-current-item 2020-02-13 21:41:23 +09: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
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
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
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
voidedWarranties
ad0de27964 Safer dependency injection and accessibility levels 2020-02-12 22:11:26 -08:00
smoogipoo
6f7196b0b8 Make beatmap detail area abstractable 2020-02-13 13:46:23 +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
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
Dean Herbert
b65e839bd2 Simplify blueprints by removing visible state 2020-02-13 10:00:09 +09:00
Dean Herbert
0fe41fd50a Fix blueprint showing even when mouse outside of container 2020-02-13 09:03:48 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness 2020-02-12 15:01:15 +09:00
voidedWarranties
2901ec9f26 Select specific difficulties using their icons 2020-02-11 20:05:26 -08:00
Dean Herbert
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
Dean Herbert
8186f72507 Remove unused using 2020-02-10 17:12:45 +09:00
smoogipoo
51e2a934bd Fix possible beatmap nullref in logo visualisation 2020-02-10 17:02:00 +09:00
Dean Herbert
66fb72cd8a Fix song select not showing active beatmap if it is filtered by local criteria 2020-02-10 16:59:54 +09:00
Dan Balasescu
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
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
Bartłomiej Dach
9bfd3a1a63 Make PercentageBreakInfoLine use FormatAccuracy 2020-02-08 00:11:19 +01:00
TheWildTree
2770fb71b2 Use SortedStatistics where needed 2020-02-07 21:12:21 +01:00
Dean Herbert
91203c2b12
Merge branch 'master' into placement-display-in-timeline 2020-02-08 01:50:24 +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
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
Dean Herbert
2082948f9a Make editor screens display below timeline 2020-02-07 18:23:59 +09: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
Dean Herbert
7460018cd3 Move combo colours to GlobalSkinColours 2020-02-07 14:58:07 +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
Dan Balasescu
108de6ac56
Merge branch 'master' into editor-slider-repeat 2020-02-06 14:48:45 +09:00
smoogipoo
6ae0efa40d Fix adjustment not working when dragged before object 2020-02-06 14:47:43 +09:00
smoogipoo
c138e3907e Move methods below ctor 2020-02-06 14:35:45 +09:00
Dean Herbert
fd71a53717 Fix test regression 2020-02-06 14:28:09 +09:00
Dean Herbert
a84386ba01 Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering 2020-02-06 14:22:52 +09:00
Dean Herbert
81cadb7875 Simplify the way multiple subscreens handle their disable states via a custom stack 2020-02-06 14:22:01 +09:00
Dean Herbert
114fd967c1 Revert "Remove leasing at a Multiplayer screen level"
This reverts commit 304a071e39.
2020-02-06 13:47:34 +09:00
Dean Herbert
d00b61de99 Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 13:38:27 +09:00
Dean Herbert
e548a4b8dd Fix missing bind causing regression in filter 2020-02-06 13:36:49 +09:00
Dean Herbert
94b6564b98 Merge branch 'master' into editor-slider-repeat 2020-02-06 13:16:39 +09:00
Dean Herbert
75eb9ca040
Merge pull request #7739 from peppy/fix-rooms-test-scene
Fix rooms test scene not displaying anything
2020-02-06 13:12:10 +09:00
Dean Herbert
061b8c389f Fix null search string causing an exception 2020-02-06 13:03:04 +09:00
Dean Herbert
1dc7fc4a33 Fix case where playlist is empty 2020-02-06 13:01:48 +09:00
Dan Balasescu
38bf14a06c
Merge branch 'master' into editor-beatmap-component 2020-02-06 12:25:33 +09:00
Dean Herbert
a79d6ff27a Change transition to better handle mass filter cases 2020-02-06 12:17:20 +09:00
Dean Herbert
304a071e39 Remove leasing at a Multiplayer screen level 2020-02-06 12:17:20 +09:00
Dean Herbert
50c4e34c92 Add ruleset to multiplayer filter criteria 2020-02-06 12:17:20 +09:00
Dean Herbert
00edc7e66f Fix RoomsContainer test scene not displaying 2020-02-06 12:14:17 +09:00
Dean Herbert
f5edad16e6 Improve visuals 2020-02-05 19:43:13 +09:00
Dean Herbert
98ab1f9862 Fix negative spinners 2020-02-05 18:35:31 +09:00
Dean Herbert
3d42973764 Allow scrolling via drag while dragging a hold note handle 2020-02-05 18:35:31 +09:00
Dean Herbert
cef45afbc8 Add a simple hover state 2020-02-05 18:35:31 +09:00
Dean Herbert
d56accaef1 Disallow negative / zero repeat counts (and fix off-by-one) 2020-02-05 18:35:31 +09:00
Dean Herbert
d04cc0123d Initial implementation of timeline blueprint dragbars 2020-02-05 18:35:31 +09:00
Dean Herbert
96986bf5fc Remove beat divisor from ctor and use DI instead 2020-02-05 17:48:21 +09:00
Dean Herbert
63c595ed97 Make EditorBeatmap a component and move UpdateHitObject to it 2020-02-05 17:48:21 +09:00
Dan Balasescu
27c24fb08a
Merge pull request #7721 from recapitalverb/display-accuracy
Add {ScoreInfo,UserStatistics}.Accuracy
2020-02-04 16:16:33 +09:00
Dan Balasescu
0e3c1ed0f7
Merge branch 'master' into fix-key-counter-visible-on-reshowing-hud 2020-02-04 14:06:23 +09:00
recapitalverb
79bb476f4c
Merge branch 'master' into display-accuracy 2020-02-04 11:39:47 +07:00
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing 2020-02-04 11:57:54 +09:00
Joehu
22e3150f68 Fix comment and remove magic numbers 2020-02-03 17:21:06 -08:00
Salman Ahmed
4cd4055e7c Rename to AlwaysVisible and add XMLDoc 2020-02-03 20:00:43 +03:00
Salman Ahmed
51ed289c59 Revert namings and behaviour changes 2020-02-03 19:59:58 +03:00
recapitalverb
9898a926b2 Use ScoreInfo.DisplayAccuracy everywhere 2020-02-03 22:11:36 +07:00
Salman Ahmed
351cb8ac1a Rename Visible to HasReplayLoaded and change default value
Doesn't make sense to be true by default
2020-02-03 15:47:52 +03:00
Salman Ahmed
443063263e Merge remote-tracking branch 'upstream/master' into fix-key-counter-visible-on-reshowing-hud 2020-02-03 15:18:25 +03:00
Dan Balasescu
c6e7603e5e
Merge branch 'master' into safe-screen-lease 2020-02-03 18:18:13 +09:00
Dan Balasescu
93952d438f
Merge pull request #7677 from peppy/decouple-mod-select-bindable
Decouple ModSelectOverlay from global SelectedMods
2020-02-03 16:27:47 +09:00
Dean Herbert
591c7b6250
Merge pull request #7682 from peppy/fix-timeline-tick-overrun
Fix too many ticks being displayed on beatmaps with multiple timing sections
2020-02-03 16:16:23 +09:00
Dean Herbert
9183c78319 Fix crash on exiting song select with ctrl-enter autoplay 2020-02-03 16:04:32 +09:00
Salman Ahmed
4cdf4b223c Rename to alwaysShow and add XMLDoc 2020-02-02 18:47:12 +03:00
Salman Ahmed
28e340c486 Inherit Container and fade the key flow instead of individual children 2020-02-02 18:46:27 +03:00
Dean Herbert
aa1daa0ad5
Merge pull request #7703 from bdach/beatmap-stats-precision
Apply precision when determining bar colour in difficulty statistics
2020-02-02 22:31:52 +09:00
Salman Ahmed
6a11c3a8f9 Expose ConfigVisibility bindable for testing purposes 2020-02-02 14:48:07 +03:00
Salman Ahmed
abccf05155 Update visibility of each key counter instead of this container
For isolating changing visibility of the key counter display based on config and internal values from just fading the container.
2020-02-02 14:47:14 +03:00
Bartłomiej Dach
434c0d92e4 Use Bindable{Float,Double}s everywhere
To avoid further floating-point comparison bugs, remove all usages of
Bindable<{float,double}>, replacing them with their
Bindable<Float,Double> counterparts.
2020-02-01 22:50:29 +01:00
Bartłomiej Dach
e894acf53c Make star filter range bindables BindableDoubles
Due to using Bindable<double>s previously, song select's filter control
would not apply tolerance when checking IsDefault, therefore wrongly
hiding maps with star ratings above 10.1.
2020-02-01 22:48:46 +01:00
Joehu
609ee26030 Fix mod select overlay not showing up in test 2020-02-01 11:41:41 -08:00
Joehu
2d42a83bb9 Fix mod select overlay overflowing toolbar at max ui scale 2020-02-01 11:24:29 -08:00
Bartłomiej Dach
0bfadfbbf1 Apply precision when comparing adjusted values
In some cases, applying the Difficulty Adjust mod without actually
changing any of the settings previously caused the bar in song select
beatmap details to appear red/blue instead of staying white.

This was caused by not accounting for floating-point imprecisions when
determining bar colour in AdvancedStats. To resolve, first check
equality with tolerance, and only then apply blue/red colours if that
equality check does not hold.
2020-02-01 16:16:15 +01:00
Bartłomiej Dach
a74d22d9e5 Extract beatmap stats test to separate scene 2020-02-01 15:50:33 +01:00
Dean Herbert
ed368e44ea
Merge branch 'master' into safe-screen-lease 2020-02-01 02:11:18 +09:00
Dean Herbert
c5422743e2
Merge branch 'master' into decouple-mod-select-bindable 2020-02-01 02:06:23 +09:00
Dean Herbert
90caa61245
Reverse comparison for readability
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-02-01 02:05:26 +09:00
Dean Herbert
a66cdee5e9 Fix missed issues 2020-01-31 21:36:19 +09:00
Dean Herbert
19f516e710 Ensure OsuScreen level leases are taken out synchronously 2020-01-31 19:10:44 +09:00
Dean Herbert
a547d2ed5c Don't least at Player just yet 2020-01-31 18:37:16 +09:00
Dean Herbert
2f61d3f5ad Fix song select remaining issue locally 2020-01-31 17:35:53 +09:00
Dean Herbert
5f48affcba Centralise screen exit logic to ScreenTestScene 2020-01-31 14:19:29 +09:00
Dean Herbert
f51cfa2220 Fix too many ticks being displayed on beatmaps with multiple timing sections
Closes https://github.com/ppy/osu/issues/7681.
2020-01-31 00:24:00 +09:00
Dean Herbert
7bf2e9b369 Decouple ModSelectOverlay from global SelectedMods 2020-01-30 17:38:15 +09:00
Dan Balasescu
09f6c57b0f
Merge branch 'master' into fix-import-different-ruleset 2020-01-30 15:08:25 +09:00
Dan Balasescu
c18b1b302c
Merge branch 'master' into editor-match-accessibility 2020-01-30 13:49:56 +09:00
Dean Herbert
c158570249
Fix typo in comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-01-30 11:31:34 +09:00
Dean Herbert
f72de235cc Remove unnecessary length specifications 2020-01-30 11:00:14 +09:00
Dean Herbert
37ecf8a060 Remove commented line 2020-01-30 10:50:48 +09:00
Dean Herbert
bea20efb64
Merge branch 'master' into mod_content_centering 2020-01-30 10:34:46 +09:00
Bartłomiej Dach
f130e48c9e Remove leftover negative margin 2020-01-29 19:17:07 +01:00
Bartłomiej Dach
c9dda78ded Refactor drawable hierarchy to center properly
* Use FillFlowContainer.Spacing instead of manually applying margins.
* Use Update() for calculating button padding to preserve it after
  mod button expansion and adjust FooterButtonRandom to use this method
  while avoiding flickering.
* Expose mod display margin to clear it in the footer button.
2020-01-29 18:59:51 +01:00
Dean Herbert
da6952407e Allow null DI 2020-01-29 23:01:57 +09:00
Dean Herbert
13eb32fea2 Fix editor being accessible for multiplayer song select 2020-01-29 22:20:34 +09:00
smoogipoo
76af8bea5d Fix percentage-formatted displays containing a space 2020-01-29 19:51:24 +09:00
Dean Herbert
7588c574a2 Fix presenting a beatmap from a different ruleset not working 2020-01-29 19:37:54 +09:00
Dan Balasescu
db3e360229
Merge branch 'master' into fix-carousel-missing-import 2020-01-29 18:06:27 +09:00
Dean Herbert
77c06b1c6e Fix beatmap carousel potentially missing beatmap imports 2020-01-29 17:09:12 +09:00
Dan Balasescu
66b8d38d42
Merge branch 'master' into selection-composition-conformity 2020-01-29 16:52:45 +09:00
Dan Balasescu
e553a9b9e0
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 16:09:35 +09:00
Dan Balasescu
63501c188a
Merge pull request #7644 from peppy/standardise-zoom-levels
Standardise editor timeline zoom across maps of all lengths
2020-01-29 16:04:25 +09:00
Dan Balasescu
018c005c71
Merge branch 'master' into distance-snap-grid-correct-colouring 2020-01-29 15:33:07 +09:00
Dan Balasescu
0d6fd0a54a
Merge branch 'master' into standardise-zoom-levels 2020-01-29 15:32:57 +09:00
Dan Balasescu
65ac412ff8
Merge branch 'master' into fix-beat-snap 2020-01-29 15:32:27 +09:00
smoogipoo
391681b7af Separate calculation to follow other examples 2020-01-29 15:16:48 +09:00
Dean Herbert
7d05840ee0
Merge branch 'master' into select-tool 2020-01-29 15:04:22 +09:00
Dan Balasescu
ea2ee53ee3
Merge branch 'master' into timline-beat-lines 2020-01-29 14:44:07 +09:00
smoogipoo
9a47428bfd Remove out of date comment 2020-01-29 14:40:42 +09:00
Dan Balasescu
abe0041b65
Merge branch 'master' into select-tool 2020-01-29 14:29:12 +09:00
Dan Balasescu
4d43833db4
Merge branch 'master' into timline-beat-lines 2020-01-29 14:12:00 +09:00
Dan Balasescu
b10143fdf2
Merge branch 'master' into fix-key-count-mod-affect 2020-01-29 14:11:59 +09:00
Dean Herbert
12ff51f686 Fix key count being incorrectly adjusted by hard/easy mods 2020-01-28 17:21:50 +09:00
Dean Herbert
40379a5e22 Use foreach 2020-01-28 16:04:13 +09:00
Dean Herbert
dbb89cfde7 Merge remote-tracking branch 'upstream/master' into timline-beat-lines 2020-01-28 16:03:50 +09:00
Dean Herbert
8e2159e4eb Ensure selection tool correctly matches selection state
- When a selection is made (via the timeline) the selection tool should become the select tool.
- When the selection tool is changed to anything *but* the select tool, the selection should be cleared.
2020-01-28 15:13:12 +09:00
Dean Herbert
e81d3c51ed Move select tool to an actual tool implementation
Also tidies up radio button action firing so calling Select actually fires the associated action in all cases.
2020-01-28 15:05:29 +09:00
Dean Herbert
596a01661c Remove 1ms offset and update tests 2020-01-28 13:42:22 +09:00
unknown
aa264cd2a8 allow tooltip to show as percentage as needed 2020-01-28 12:32:30 +08:00
Dean Herbert
4bb33046ca Standardise editor timeline zoom across maps of all lengths 2020-01-28 13:03:06 +09:00
Dean Herbert
58654f28b6 Fix beat snap implementation being incorrect 2020-01-28 12:48:24 +09:00
Dean Herbert
29daabb40a Fix distance snap grid showing incorrect colouring
Now matches timeline colours (based on timing point).
2020-01-28 11:59:21 +09:00
Dean Herbert
d5fda053f4 Use centre origin/anchors 2020-01-27 18:09:54 +09:00
Dean Herbert
493390b750 Rename class to TimelineTickDisplay 2020-01-27 18:08:01 +09:00
Dean Herbert
084fa2f04a Add timeline beat display 2020-01-27 17:38:50 +09:00
Dean Herbert
e24c4ab901 Adjust zoom defaults for timeline to be more useful 2020-01-27 17:34:40 +09:00
Dean Herbert
df665c3a3c Move beat index colour retrieval to static function 2020-01-27 17:34:40 +09:00
Dean Herbert
508b92e611 Update beat divisor colours to be more distinguishable
Close to osu-stable
2020-01-27 17:34:40 +09:00
Dean Herbert
7aa5e8c23e Limit input propagation correctly 2020-01-27 14:55:47 +09:00
Dean Herbert
1c64b70b06 Revert "Fix crash due to misordered selection events"
This reverts commit 2d74609f50.
2020-01-27 14:53:24 +09:00
Dean Herbert
2d74609f50 Fix crash due to misordered selection events 2020-01-26 19:06:50 +09:00
Salman Ahmed
8aec9e4500 Fix NullReferenceException on main menu for mobile game hsots 2020-01-25 11:41:26 +03:00
Dean Herbert
92a5fbe948
Merge branch 'master' into star-filtering 2020-01-24 23:28:36 +09:00
smoogipoo
45a25214ab Make upper and lower bounds inclusive 2020-01-24 19:39:21 +09:00
Dan Balasescu
9be3d7a161
Merge pull request #7591 from peppy/improve-song-select-uiscale
Improve song select display on ultrawide displays (or when UI scale is set low)
2020-01-24 19:14:46 +09:00
smoogipoo
9e0e7be8d0 Modernise filter implementation 2020-01-24 18:57:17 +09:00
smoogipoo
12cc97ca31 Merge remote-tracking branch 'origin/master' into star-filtering
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
#	osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
#	osu.Game/Screens/Select/FilterControl.cs
#	osu.Game/Screens/Select/FilterCriteria.cs
2020-01-24 18:30:52 +09:00
Dan Balasescu
368587fc06
Merge branch 'master' into timeline-maybe 2020-01-24 18:08:29 +09:00
smoogipoo
811ddb02a4 General refactoring 2020-01-24 17:50:36 +09:00
smoogipoo
28727bbafd Fix crash when deselecting via ctrl+click 2020-01-24 17:30:37 +09:00
Dean Herbert
f9e93e2a6a Fix regressed input handling order 2020-01-24 17:15:05 +09:00
Dean Herbert
827f48c29b Adjust fade 2020-01-24 16:32:39 +09:00
Dean Herbert
6f44f8a1ad Ensure only run once when not current screen 2020-01-24 16:27:49 +09:00
Dean Herbert
f9a54dfb1d Tidy up implementation and show on returning with new song 2020-01-24 16:27:37 +09:00
Dean Herbert
3f6fa93365 Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker 2020-01-24 16:08:34 +09:00
Dean Herbert
f5a3de3187 Merge remote-tracking branch 'upstream/master' into improve-song-select-uiscale 2020-01-24 15:44:40 +09:00
Dean Herbert
fdde4a6858 Tidy up song select hierarchy to be more readable 2020-01-24 15:44:31 +09:00
Dean Herbert
c0a233e8bb Align background wedge with carousel 2020-01-24 15:00:10 +09:00
Dean Herbert
997b49f6dc Change display to always show progress bar, only hiding seeking handle instead 2020-01-24 14:21:22 +09:00
Dean Herbert
da65fff48e Merge remote-tracking branch 'upstream/master' into collapse-graph-option 2020-01-24 13:55:42 +09:00
Dean Herbert
ea2271c905 Merge branch 'master' into timeline-maybe 2020-01-24 13:39:51 +09:00
Dean Herbert
e4702ffe9e Fix editor rate adjustment polluting global beatmap rate 2020-01-24 13:10:02 +09:00
Dean Herbert
eb5abcab8c Rename and simplify circle logic 2020-01-24 12:01:40 +09:00