1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 20:47:26 +08:00
Commit Graph

19162 Commits

Author SHA1 Message Date
Dean Herbert
940d97a677
Merge pull request #9570 from smoogipoo/fix-catch-hd 2020-07-15 18:47:05 +09:00
Dean Herbert
afae79662c
Merge pull request #9566 from Joehuu/seek-replay/auto-with-arrow-keys 2020-07-15 18:46:44 +09:00
smoogipoo
e95a1beaef Update state after applying hitobject 2020-07-15 16:53:27 +09:00
Dan Balasescu
4a480d8563
Merge branch 'master' into comments-buttons 2020-07-15 16:42:17 +09:00
Dan Balasescu
ed38b589bb
Merge pull request #9563 from EVAST9919/rankings-spotlights-filter
Add filtering by friends to spotlights in RankingsOverlay
2020-07-15 16:41:44 +09:00
Dean Herbert
0125a7ef3b Fix single-frame glitch in SS grade display animation 2020-07-15 15:36:17 +09:00
Andrei Zavatski
0043bd74ba Rework SpotlightSelector header layout 2020-07-15 08:27:46 +03:00
Andrei Zavatski
df9ea5cc2f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-spotlights-filter 2020-07-15 08:08:02 +03:00
Dan Balasescu
3ae7104bfe
Merge pull request #9564 from Joehuu/fix-back-button-glow-mod-select
Fix back button not glowing when closing mod select with escape
2020-07-15 14:01:14 +09:00
smoogipoo
d1aedd15c4 Add noto-thai font 2020-07-15 13:35:40 +09:00
Dan Balasescu
b1c06c1e90
Merge branch 'master' into fix-screens-blocking-home/altf4 2020-07-15 13:17:53 +09:00
smoogipoo
d8ebb8e3eb Move override to a bit better location 2020-07-15 13:17:22 +09:00
smoogipoo
e2c043737d Reword xmldoc to specify intended usage 2020-07-15 13:08:57 +09:00
smoogipoo
350a4a153b Fix possible nullref 2020-07-15 12:59:31 +09:00
Joehu
ecbd8067e9 Add ability to seek replays/auto with arrow keys 2020-07-14 20:18:47 -07:00
Joehu
79f6092344 Fix back button not glowing when closing mod select with escape 2020-07-14 13:31:15 -07:00
Joehu
73e1bf0d89 Check sub screen's OnBackButton instead 2020-07-14 13:19:48 -07:00
Joehu
21ed9df1ea Add xmldoc for OnBackButton 2020-07-14 13:14:59 -07:00
Andrei Zavatski
85c8757572 Return true on click 2020-07-14 21:18:46 +03:00
Andrei Zavatski
e64604f335 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-14 21:18:34 +03:00
Andrei Zavatski
3d9e174ae8 Make sort changes affect request result 2020-07-14 18:09:09 +03:00
Andrei Zavatski
c2c80d2a98 Refactor SpotlightSelector layout 2020-07-14 17:34:01 +03:00
Dan Balasescu
c49ce65326
Merge pull request #9540 from peppy/gameplay-pause-via-middle-mouse
Allow pausing gameplay via middle mouse button
2020-07-14 21:13:31 +09:00
Andrei Zavatski
28006ac33f Remove unnecessary action from ShowRepliesButton 2020-07-14 15:12:18 +03:00
Andrei Zavatski
4c2294f0cd Refactor LoadRepliesButton to inherit LoadingButton 2020-07-14 15:02:29 +03:00
Andrei Zavatski
4b22832cc8 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-14 14:49:16 +03:00
Dean Herbert
290a07f1e4
Merge pull request #8802 from LittleEndu/always-combo-break
Allow user to always play first combo break sound regardless of lost combo count
2020-07-14 20:41:39 +09:00
Dan Balasescu
b64ddf061e
Remove whitespace 2020-07-14 20:37:21 +09:00
Dan Balasescu
3bae34653e
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 20:31:35 +09:00
Dean Herbert
2626ab41c3 Add implicit braces for clarity 2020-07-14 20:15:31 +09:00
Dean Herbert
956980ee90 Remove setting from gameplay settings screen 2020-07-14 20:12:58 +09:00
Dan Balasescu
f3a498482b
Merge pull request #9553 from peppy/difficulty-adjust-range-match-stabl
Change difficulty adjust mod to match stable range of 0-10
2020-07-14 20:12:28 +09:00
Dean Herbert
c7d3b025ad Rename variable and change default to true 2020-07-14 20:11:54 +09:00
Dean Herbert
690f2fd482 Merge branch 'master' into always-combo-break 2020-07-14 20:11:02 +09:00
Dan Balasescu
0e31982b4e
Merge pull request #9557 from peppy/fix-user-request-population
Fix some web requests retrieving the user too early
2020-07-14 17:56:31 +09:00
Dean Herbert
013eeaf8ed
Merge pull request #9558 from peppy/update-framework
Update framework
2020-07-14 17:55:19 +09:00
Dan Balasescu
f25bd329f7
Merge pull request #9555 from peppy/fix-local-online-lookups-when-logged-out
Fix local online cache database not being used when offline / logged out
2020-07-14 17:51:05 +09:00
Dean Herbert
304e518f7b Update framework 2020-07-14 17:30:20 +09:00
Joehu
36041fc245 Fix back button not working correctly with multi song select's mod select 2020-07-14 00:29:57 -07:00
Dean Herbert
8ace06fcc5 Fix continuations attaching to the BeatmapOnlineLookupQueue scheduler 2020-07-14 16:03:40 +09:00
Joehu
3573460d9c Fix multiplayer screens blocking home and alt f4 2020-07-14 00:02:01 -07:00
Joehu
daa7430fd8 Fix statistics screen blocking retry, home, and alt f4 2020-07-14 00:00:43 -07:00
Joehu
4caf4d31d4 Fix mod select blocking home and alt f4 in song select 2020-07-14 00:00:10 -07:00
Joehu
1a2f5cb477 Add OnBackButton bool to OsuScreen 2020-07-13 23:59:20 -07:00
Dean Herbert
21dc7b57d4
Merge branch 'master' into comments-buttons 2020-07-14 14:06:20 +09:00
Dean Herbert
7fe69bb199 Fix some web requests retrieving the user too early 2020-07-14 13:07:17 +09:00
Dean Herbert
e35e9df4e1 Fix local online cache database not being used when offline / logged out 2020-07-14 12:02:03 +09:00
Dean Herbert
8a77a3621e Update resources 2020-07-14 11:03:55 +09:00
Dean Herbert
42dfc47fe3 Merge branch 'master' into legacy-background 2020-07-14 11:03:47 +09:00
Dean Herbert
f36c23928b Merge branch 'master' into legacy-background 2020-07-14 11:02:24 +09:00
Andrei Zavatski
7c71cc6b61 Remove unneeded class from DrawableComment 2020-07-14 03:06:51 +03:00
Andrei Zavatski
56349e65f3 Rename arrow direction method 2020-07-14 03:01:14 +03:00
Andrei Zavatski
f6e4ecd960 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-14 02:46:29 +03:00
Dean Herbert
b59e4f8a7e Change difficulty adjust mod to match stable range of 0-10 2020-07-14 08:15:14 +09:00
Dean Herbert
064814f70a
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 07:39:02 +09:00
Dean Herbert
8411a36a0f
Merge pull request #9545 from smoogipoo/reset-judgement-animation 2020-07-14 07:35:53 +09:00
Dean Herbert
38e9b882b8 Update framework 2020-07-14 07:04:30 +09:00
Dan Balasescu
c13064efc4
Merge pull request #9539 from peppy/fix-carousel-filter-application
Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load
2020-07-13 21:25:43 +09:00
smoogipoo
8a3cadc111 Fix judgement animations not resetting on use 2020-07-13 21:21:59 +09:00
Dean Herbert
7b7b92aa10 Fix potential crash when trying to ensure music is playing 2020-07-13 17:28:16 +09:00
smoogipoo
0ea13dea55 Introduce legacy timing point fp errors 2020-07-13 17:06:00 +09:00
Dean Herbert
ef3ab7a858 Merge branch 'master' into fix-carousel-filter-application 2020-07-13 17:05:45 +09:00
smoogipoo
1116703e92 Fix potential out-of-order objects after conversion 2020-07-13 16:52:05 +09:00
Dan Balasescu
dfcb73131d
Merge pull request #9517 from vntxx/notification-keybind
Add notifications keybinding
2020-07-13 15:28:58 +09:00
Dan Balasescu
c476bc51ed
Merge pull request #9543 from Joehuu/multi-room-input-when-selected
Only allow link clicking and tooltips of multi room drawables when selected
2020-07-13 15:28:41 +09:00
Dan Balasescu
9ca3692cfd
Merge branch 'master' into notification-keybind 2020-07-13 14:32:23 +09:00
Dan Balasescu
744e695174
Merge pull request #9536 from Joehuu/select-mods-from-score
Add ability to select mods from a specific score in song select
2020-07-13 14:32:14 +09:00
Joehu
79ea6dbd5c Only allow link clicking and tooltips of multi room drawables when selected 2020-07-12 22:24:11 -07:00
Joehu
db6a9c9717 Move null check to menu item addition 2020-07-12 22:06:17 -07:00
Joehu
ac7252e152 Fix context menu not masking outside of leaderboard area 2020-07-12 22:04:00 -07:00
Dean Herbert
0718e9e4b6 Update outdated comment 2020-07-13 13:08:41 +09:00
Dean Herbert
f442df75a9 Add missing released conditional 2020-07-13 09:00:10 +09:00
Andrei Zavatski
6eec2f9429 Implement RankingsSortTabControl component 2020-07-13 01:22:05 +03:00
Joehu
9c039848bc Simplify and add null check 2020-07-12 12:04:53 -07:00
Dean Herbert
c1aafe83fa Add note about future behaviour 2020-07-12 23:05:47 +09:00
Dean Herbert
08696b9bca Allow pausing gameplay via middle mouse button 2020-07-12 23:03:03 +09:00
Dean Herbert
ab11a112b7 Fix correct filter criteria not being applied to beatmap carousel if beatmaps take too long to load 2020-07-12 22:33:41 +09:00
vntxx
d18609e900 Added notifications keybinding
Implementation of #9502
2020-07-12 12:44:00 +02:00
Andrei Zavatski
be36a4b768 Make ctor protected 2020-07-12 12:39:48 +03:00
Andrei Zavatski
c3524cbe57 Make icon private but expose a protected method 2020-07-12 12:32:26 +03:00
Andrei Zavatski
da40f29b44 Make button text a property 2020-07-12 12:27:26 +03:00
Andrei Zavatski
40aa6c7453 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-buttons 2020-07-12 12:18:10 +03:00
Dean Herbert
57cfdb82ce
Merge pull request #9514 from Joehuu/fix-multi-room-name-overflow 2020-07-12 13:02:20 +09:00
Joehu
681f001525 Convert icon to local variable 2020-07-11 19:19:34 -07:00
Joehu
4d7dc9f5eb Fix color and underline of tab control checkboxes when initially checked 2020-07-11 18:27:47 -07:00
Joehu
25d2d9ba5c Convert getMods reference to method group 2020-07-11 16:24:57 -07:00
Joehu
0d26ad9ddb Fix user top score not having a context menu 2020-07-11 16:22:01 -07:00
Joehu
9b4bed2ab2 Add ability to select mods from a specific score 2020-07-11 16:02:47 -07:00
Dean Herbert
fda45997db
Merge pull request #9530 from peppy/fix-memory-retention
Clean up HitEvents after use to avoid near-permanent memory retention
2020-07-12 01:27:38 +09:00
Dean Herbert
2bb0283a68 Clean up HitEvents after use to avoid near-permanent memory retention 2020-07-12 00:52:55 +09:00
smoogipoo
acfb6eecc6 Fix bonus judgements being required toward HP 2020-07-11 20:17:40 +09:00
Andrei Zavatski
024ccc75ee Adjust margins/paddings 2020-07-11 09:03:03 +03:00
Andrei Zavatski
84392d0d13 Add loading spinner 2020-07-11 08:50:35 +03:00
Andrei Zavatski
b1b2e961bc Update arrow colour on hover 2020-07-11 08:13:11 +03:00
Andrei Zavatski
42d3288f17 Update old buttons usage 2020-07-11 08:01:11 +03:00
Andrei Zavatski
0861ee0c8e Make Icon rotate when clicking ShowRepliesButton 2020-07-11 07:54:37 +03:00
Andrei Zavatski
da249abd19 Implement CommentRepliesButton 2020-07-11 07:47:17 +03:00
Andrei Zavatski
789c921af1 Move replies button to a new line 2020-07-11 06:47:52 +03:00
Joehu
fa0c2d7f84 Fix room name overflowing on multiplayer lounge 2020-07-10 10:42:41 -07:00
Dan Balasescu
3c9db923b4
Merge pull request #9431 from peppy/judgement-pooling
Add pooling support for osu! hit judgements
2020-07-10 21:43:00 +09:00
Dan Balasescu
895c129151
Merge pull request #9492 from peppy/ensure-music-playing-mainmenu-lounge
Ensure music playing when returning to lounge or main menu
2020-07-10 21:23:24 +09:00
Dan Balasescu
ee526666ca
Merge branch 'master' into judgement-pooling 2020-07-10 21:17:01 +09:00
Dan Balasescu
6345af6f3b
Merge pull request #9494 from peppy/playlist-results-button
Replace large "show results" button with embedded button each playlist item
2020-07-10 20:58:12 +09:00
Dan Balasescu
1ee0a8cd6d
Merge pull request #9495 from peppy/download-button-tooltips
Add tooltips to download buttons
2020-07-10 20:57:09 +09:00
Dan Balasescu
be2c892c30
Merge branch 'master' into ensure-music-playing-mainmenu-lounge 2020-07-10 20:48:16 +09:00
Dean Herbert
d3367bb0f1 Remove unused public property 2020-07-10 20:32:47 +09:00
Dean Herbert
840380e0de Fix LocallyAvailable state case getting cleared 2020-07-10 20:30:59 +09:00
Dean Herbert
c7b5c5aef4 Add tooltips to beatmap download button 2020-07-10 20:22:51 +09:00
Dean Herbert
9556166c1b Replace large "show results" button with embedded button each playlist item 2020-07-10 20:19:17 +09:00
smoogipoo
fe585611e7 Fix + simplify web request 2020-07-10 19:54:09 +09:00
Dean Herbert
64e8dce1ad Highlight spotlight rooms with a different colour 2020-07-10 19:38:33 +09:00
Dean Herbert
cf3251a950 Default to showing all rooms 2020-07-10 19:38:13 +09:00
Dean Herbert
24132c7cf9 Merge branch 'master' into multiplayer-categories 2020-07-10 19:00:57 +09:00
Dean Herbert
c9e54651d5
Merge branch 'master' into judgement-pooling 2020-07-10 18:51:42 +09:00
Dean Herbert
f872343bab Make Apply virtual to further simplify application process 2020-07-10 18:35:20 +09:00
Dean Herbert
8aff828dfe Move application of judgements to Apply method 2020-07-10 18:34:31 +09:00
Dean Herbert
f699a34c77 Rename variable for potential future expansion 2020-07-10 18:19:18 +09:00
Dean Herbert
4a1621bf98 Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 18:17:18 +09:00
Dean Herbert
1760cc2427 Fix behavioural regression by splitting methods out 2020-07-10 18:03:56 +09:00
smoogipoo
926279e39b Implement category dropdown for multiplayer 2020-07-10 17:26:42 +09:00
smoogipoo
ed926de77f Fix up/improve dropdown styling/positioning 2020-07-10 17:25:28 +09:00
smoogipoo
d0c2a1b9d3 Move dropdown out of display style selector 2020-07-10 17:25:07 +09:00
Dean Herbert
44fdb5b82e Ensure music starts when returning to lounge or main menu 2020-07-10 17:20:27 +09:00
Dean Herbert
49b88971d1 Display all usable beatmaps in playlist, including protected 2020-07-10 17:20:27 +09:00
Dean Herbert
632f333ce2 Add ability to return protected beatmaps in GetAllUsable call 2020-07-10 17:20:27 +09:00
Dean Herbert
59c7ac32b5
Merge branch 'master' into un-nest-overlined-display 2020-07-10 17:15:24 +09:00
Dean Herbert
3138cc455c
Merge branch 'master' into judgement-pooling 2020-07-10 17:15:19 +09:00
Dean Herbert
664ab6d5f6
Merge branch 'master' into add-textbox-samples-and-fix-distingushing-passwords 2020-07-10 17:14:46 +09:00
Dean Herbert
bc6f2199f3 Update framework 2020-07-10 16:49:11 +09:00
smoogipoo
1f2689f7cb Merge branch 'master' into un-nest-overlined-display 2020-07-10 15:37:43 +09:00
smoogipoo
2ed8d42d22 Remove whitespace 2020-07-10 15:37:13 +09:00
smoogipoo
a9faa11dcb Add back playlist header 2020-07-10 15:37:08 +09:00
Dan Balasescu
14eaf75009
Merge branch 'master' into un-nest-overlined-display 2020-07-10 14:41:31 +09:00
smoogipoo
1bcd673a55 Fix crash when switching rooms quickly 2020-07-10 12:09:34 +09:00
Dan Balasescu
e6a759334d
Merge pull request #9476 from peppy/lounge-scroll-selected-into-view
Scroll selected room into view on selection
2020-07-10 10:45:16 +09:00
Dan Balasescu
58de7a2e74
Merge branch 'master' into multiplayer-test-simplify 2020-07-10 09:58:58 +09:00
Dean Herbert
43624381bf Change multiplayer tests to have null room by default 2020-07-09 18:55:53 +09:00
Dean Herbert
25ddc5784d Change multiplayer tests to have null room by default 2020-07-09 18:55:10 +09:00
Dean Herbert
973b6c680a
Merge branch 'master' into un-nest-overlined-display 2020-07-09 18:26:23 +09:00
Dean Herbert
115bb40816 Select via select action 2020-07-09 18:25:14 +09:00
Dean Herbert
601101147e Allow keyboard selection of rooms at the multiplayer lounge 2020-07-09 18:25:14 +09:00
Dean Herbert
80f6f87e01 Scroll selected room into view on selection 2020-07-09 17:45:29 +09:00
Dean Herbert
69062a3ed1 Remove unused search container in lounge 2020-07-09 17:43:26 +09:00
Dean Herbert
f5e79d1bf3
Merge branch 'master' into opaque-toolbar 2020-07-09 16:04:50 +09:00
smoogipoo
7d59825851 Update framework 2020-07-09 15:16:40 +09:00
Dean Herbert
fce9eaaff9
Merge pull request #9470 from smoogipoo/dispose-task-scheduler 2020-07-09 15:14:27 +09:00
Dan Balasescu
fcf3d1ca89
Merge branch 'master' into opaque-toolbar 2020-07-09 15:00:17 +09:00
smoogipoo
04ce436f6a Dispose beatmap lookup task scheduler 2020-07-09 14:46:58 +09:00
Dean Herbert
f231b5925f Add "show converted" checkbox to song select for convenience 2020-07-09 13:47:23 +09:00
Dean Herbert
bbbe8d6f68 Remove group selector for now, tidy up code somewhat 2020-07-09 13:47:11 +09:00