1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Commit Graph

17606 Commits

Author SHA1 Message Date
Andrei Zavatski
9482fc5b99 Refactor grouping logic 2020-03-22 20:13:54 +03:00
Dean Herbert
68b501b032
Merge branch 'master' into show-mod-settings-tooltip 2020-03-22 13:36:31 +09:00
Andrei Zavatski
2b0c267cb9 Expose Fetch method 2020-03-21 20:37:21 +03:00
Andrei Zavatski
d241f7c55f Better variable naming 2020-03-21 20:32:55 +03:00
Andrei Zavatski
f8169e9712 Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-layout-split 2020-03-21 20:31:38 +03:00
Dean Herbert
febf9adabd
Merge pull request #8329 from Fuewburvpoa/MyBranch
Fix beat divisor control selecting invalid divisors on drag end
2020-03-22 02:21:13 +09:00
Dean Herbert
d8041a0dcb Increase sample concurrency to better match stable 2020-03-22 02:16:28 +09:00
Dean Herbert
29009c85c0
Fix typo in comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-22 00:32:53 +09:00
Dean Herbert
729e006c3a
Merge branch 'master' into video-offset 2020-03-21 20:03:46 +09:00
Liam DeVoe
4907fb8fd1 remove another ToString statement 2020-03-20 17:04:22 -04:00
Liam DeVoe
eab705a9b6 remove another ToString statement 2020-03-20 17:00:36 -04:00
Liam DeVoe
ac202ba7ea remove unused using directive 2020-03-20 16:57:37 -04:00
Liam DeVoe
55568ee6a5 remove extra parentheses 2020-03-20 16:44:38 -04:00
Liam DeVoe
6a63ba1bb8 use humanizer for ModEasy lives setting 2020-03-20 16:42:35 -04:00
Liam DeVoe
cda1efef0b move overridability to SettingDescription method 2020-03-20 16:34:36 -04:00
Liam DeVoe
7bdbdd25f8 Revert "use SettingSource to define IconTooltip format"
This reverts commit 5a6d8f1932.
2020-03-20 16:05:12 -04:00
Liam DeVoe
3d95592130
use var for list declaration
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-20 14:37:31 -04:00
Liam DeVoe
52469fccbe
Merge branch 'master' into show-mod-settings-tooltip 2020-03-20 13:41:04 -04:00
Liam DeVoe
9e3bff3b97 oops, missed a newline 2020-03-20 13:36:16 -04:00
Liam DeVoe
9dc8146811 fix style issues 2020-03-20 13:21:44 -04:00
Liam DeVoe
5a6d8f1932 use SettingSource to define IconTooltip format 2020-03-20 12:47:17 -04:00
OctopuSSX
157f05c3e5
Update osu.Game/Users/Drawables/DrawableAvatar.cs
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-20 14:35:27 +03:00
OctopuSSX
b813c0aff1
Don't open profile if it's Autoplay 2020-03-20 14:26:26 +03:00
Dean Herbert
9b60b535e5 Fix selection not occurring when switching from empty ruleset on first load 2020-03-20 15:01:26 +09:00
Dean Herbert
e64a100e8b
Merge branch 'master' into fix-carousel-restore-previous-selection 2020-03-20 13:03:18 +09:00
Dean Herbert
be4a97c289 Correctly bypass last selected when it is filtered 2020-03-20 13:01:24 +09:00
Dan Balasescu
2b5d4a7cb7
Merge branch 'master' into fix-invalid-push-from-player 2020-03-19 22:31:41 +09:00
Dean Herbert
43c1f27f24 Update framework 2020-03-19 20:19:50 +09:00
Dean Herbert
8f9e97b4cc Fix carousel not remembering last selection correctly 2020-03-19 18:07:39 +09:00
Dean Herbert
855f0a4253 Fix bracket style 2020-03-19 14:38:49 +09:00
Dean Herbert
17c3455b36 Fix potentially invalid push in player while already exiting 2020-03-19 14:10:59 +09:00
Liam DeVoe
18bf7c913b show mod settings in ModIcon tooltip 2020-03-18 23:43:26 -04:00
Liam DeVoe
e59d7fee26 fix comment grammar 2020-03-18 23:42:14 -04:00
Dean Herbert
c50784da93 Show 'D' rank badge on accuracy circle 2020-03-19 11:58:52 +09:00
Fuewburvpoa
648e9fa21f
Merge branch 'master' into MyBranch 2020-03-18 21:18:17 +02:00
Dean Herbert
90e1f6efbf
Merge pull request #8341 from smoogipoo/score-panel-scrolling
Make score panel scroll if off-screen
2020-03-18 19:00:48 +09:00
Dean Herbert
7cece7ce1b
Merge pull request #8339 from smoogipoo/update-rank-colours
Update rank badge colours
2020-03-18 18:59:45 +09:00
Dean Herbert
25983cfe0e
Merge pull request #8340 from smoogipoo/results-date-played
Add date played to score panel
2020-03-18 18:55:26 +09:00
Dean Herbert
6c45694f01
Merge pull request #8338 from smoogipoo/colourise-hit-statistics
Colourise results screen hit statistics
2020-03-18 18:55:10 +09:00
smoogipoo
1d211cb563 Make score panel scroll if off-screen 2020-03-18 18:28:42 +09:00
smoogipoo
63531a8564 Add date played to score panel 2020-03-18 17:59:44 +09:00
smoogipoo
b91dc15dbf Update rank badge colours 2020-03-18 17:37:03 +09:00
smoogipoo
66558ca8c5 Colourise hit result statistics 2020-03-18 17:26:17 +09:00
smoogipoo
5f09c70f75 Move judgement colours to OsuColour 2020-03-18 17:21:36 +09:00
Dan Balasescu
e1e0c40020
Merge branch 'master' into fix-perfect-display 2020-03-18 17:04:52 +09:00
Dean Herbert
ed419216f0
Merge pull request #8323 from skielred/acc-circle-use-osucolour
Re-use colors defined for each rank in result screen accuracy circle
2020-03-18 16:29:24 +09:00
Dean Herbert
fdcb60706b Use TryGetValue to make tests happy 2020-03-18 15:49:24 +09:00
Dean Herbert
44cfed8af1 Fix perfect display showing when misses are present 2020-03-18 15:03:01 +09:00
Dan Balasescu
514e72bffb
Merge branch 'master' into update-loader-animation 2020-03-18 11:36:29 +09:00
Dan Balasescu
27f7808a86
Merge pull request #8320 from recapitalverb/fix-mapper-alignment
Fix mapper info alignment in score panel
2020-03-18 10:59:05 +09:00
Joehu
3c07f73c7b Fix results' beatmap title and artist language setting being swapped 2020-03-17 17:32:58 -07:00
Fuewburvpoa
6c825eb744
Update osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-18 00:04:03 +02:00
Fuewburvpoa
bee8e22d18 Fix BeatDivisorControl allow to select value outside of VALID_DIVISORS 2020-03-17 22:27:11 +02:00
Andrei Zavatski
e951979a12 Remove assert from online test 2020-03-17 22:34:46 +03:00
Andrei Zavatski
4d376636c3 Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-layout-split 2020-03-17 22:12:48 +03:00
recapitalverb
139ae2bc1e Use existing variables instead 2020-03-18 01:24:58 +07:00
Tina
100c9d422f Re-use colors defined for each rank in result screen accuracy circle 2020-03-17 18:55:30 +01:00
recapitalverb
431571dfa0 Check nulls 2020-03-18 00:15:43 +07:00
recapitalverb
d18b21ba32 Use local variable for metadata instead 2020-03-17 23:23:51 +07:00
recapitalverb
99409fb7d1 Fix mapper info alignment in score panel 2020-03-17 23:02:39 +07:00
recapitalverb
592d8cbd13 Fix mapper name in score panel 2020-03-17 22:45:28 +07:00
Dean Herbert
dd3a6c5673 Use working beatmap to retrieve metadata for now 2020-03-17 23:13:31 +09:00
Dean Herbert
27cc68152d Fix potentially missing metadata on local score display 2020-03-17 22:54:02 +09:00
Dean Herbert
24b944fc8e Make footer buttons wider 2020-03-17 22:24:28 +09:00
Dean Herbert
48cbec7a31 Add scroll view because 2020-03-17 22:21:16 +09:00
Dean Herbert
2d6dcb3ba9 Merge branch 'master' into results-screen 2020-03-17 22:03:36 +09:00
Dean Herbert
b27bb4aeae Merge branch 'master' into results-middle-content 2020-03-17 21:37:23 +09:00
Dean Herbert
75695938e2
Merge branch 'master' into results-top-content 2020-03-17 20:42:02 +09:00
Dean Herbert
3b9c64b76f
Merge branch 'master' into results-scorepanel 2020-03-17 20:06:11 +09:00
Dean Herbert
01fd52e9d8
Merge branch 'master' into update-framework 2020-03-17 19:23:42 +09:00
Dean Herbert
8396fcfd35
Merge pull request #8304 from smoogipoo/results-circle
Implement a circle that displays the user's accuracy
2020-03-17 18:59:40 +09:00
Dean Herbert
7a6a7c28c1
Merge pull request #8305 from smoogipoo/fix-score-population
Fix replay scores not being populated via player
2020-03-17 18:59:20 +09:00
Dean Herbert
df119eb95a Adjust animations 2020-03-17 18:04:38 +09:00
Dean Herbert
f06c170d63 Display SS badge earlier (when entering virtual ss area) 2020-03-17 18:04:15 +09:00
smoogipoo
6f569d1485 Fix colour conflicts for expert-plus 2020-03-17 18:01:46 +09:00
smoogipoo
3628814e4e Merge branch 'fix-score-population' into results-screen 2020-03-17 17:48:39 +09:00
smoogipoo
86a336d585 Add back retry overlay 2020-03-17 17:45:25 +09:00
smoogipoo
1c4296f5e7 Implement the new results screen 2020-03-17 17:43:16 +09:00
smoogipoo
afed01d781 Merge branch 'results-middle-content' into results-screen 2020-03-17 17:35:40 +09:00
smoogipoo
946746f5f5 Merge branch 'results-top-content' into results-screen 2020-03-17 17:35:34 +09:00
smoogipoo
6f801e1695 Add xmldoc 2020-03-17 17:35:14 +09:00
smoogipoo
2ee480f1d8 Add xmldocs / cleanup 2020-03-17 17:34:16 +09:00
smoogipoo
1521f25c96 Implement middle panel contents 2020-03-17 17:25:24 +09:00
smoogipoo
3792d3645f Merge branch 'add-back-black-font' into results-middle-content 2020-03-17 17:18:41 +09:00
smoogipoo
e56d0f2eea Add black font weighting 2020-03-17 17:16:10 +09:00
smoogipoo
19106daf8b Merge branch 'results-circle' into results-middle-content 2020-03-17 17:09:15 +09:00
smoogipoo
7cc1a6040f Implement top panel contents 2020-03-17 17:01:38 +09:00
smoogipoo
05789e6fe4 Implement the score panel 2020-03-17 16:59:34 +09:00
Dean Herbert
d322c8c2d7 Update framework 2020-03-17 16:47:23 +09:00
smoogipoo
daa5e63d0d Fix replay scores not being populated via player 2020-03-17 16:42:55 +09:00
smoogipoo
dca2e1d816 Implement the accuracy circle 2020-03-17 16:37:56 +09:00
smoogipoo
e586249db7 Expose GetRankName from DrawableRank 2020-03-17 16:25:51 +09:00
smoogipoo
d77b0acd90 Move rank colour to OsuColour 2020-03-17 16:25:41 +09:00
smoogipoo
9e7c388202 Expose Spacing and UseFullGlyphHeight 2020-03-17 16:24:49 +09:00
Andrei Zavatski
4ac740b12b Remove APIFriend 2020-03-17 08:51:54 +03:00
Dean Herbert
5e3668b2ea
Merge pull request #8260 from smoogipoo/add-workingbeatmap-timeout
Add beatmap loading timeout to prevent runaway loading scenarios
2020-03-17 11:17:35 +09:00
Joehu
f7ea20a926 Limit font weight to bold 2020-03-16 16:32:25 -07:00
Andrei Zavatski
d9d812a8fe Fix status icon flash on first status change 2020-03-17 02:10:20 +03:00
Andrei Zavatski
f816479ff8 Simplify order by rank 2020-03-17 02:03:57 +03:00
Andrei Zavatski
bd84980aa6 Simplify order by last visit 2020-03-17 01:56:10 +03:00
Andrei Zavatski
da97a02e66 Remove pointless flag 2020-03-17 01:53:53 +03:00
Andrei Zavatski
6a151b8e75 Add online test 2020-03-17 01:50:19 +03:00
Andrei Zavatski
6ec01a67af Use cast in SocialOverlay 2020-03-17 01:38:45 +03:00
Andrei Zavatski
544dfe7dd3 Implement FriendsLayout component 2020-03-16 09:42:21 +03:00
Dan Balasescu
0245bab7c6
Merge branch 'master' into user-cards-update 2020-03-16 14:27:21 +09:00
smoogipoo
58fc947be3 Privatise some setters 2020-03-16 14:06:42 +09:00
Dan Balasescu
e835f88c0c
Merge pull request #8255 from peppy/fix-carousel-scroll-while-import
Fix carousel scrolling being inoperable during beatmap import
2020-03-16 12:50:45 +09:00
Dan Balasescu
3e65f13c67
Merge branch 'master' into fix-carousel-scroll-while-import 2020-03-16 12:06:50 +09:00
Dean Herbert
9bb3a6c677 Merge branch 'master' into click-group-difficulty-icons 2020-03-16 12:01:09 +09:00
Dan Balasescu
7e5f6c4e7f
Merge pull request #8247 from peppy/click-disabled-difficulty-icons
Add the ability to click filtered difficulty icons
2020-03-16 11:56:37 +09:00
smoogipoo
9c5423734a Throw timeout exceptions instead 2020-03-16 11:33:26 +09:00
Dean Herbert
d6be8eec0c Merge branch 'master' into click-disabled-difficulty-icons 2020-03-16 11:30:57 +09:00
Dan Balasescu
f390c1995d
Apply comment suggestions
Co-Authored-By: Dean Herbert <pe@ppy.sh>
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-16 11:29:28 +09:00
Dan Balasescu
e03b29947a
Merge branch 'master' into correct-trail-animation-frame 2020-03-16 11:16:56 +09:00
Dan Balasescu
bd05462a7f
Merge branch 'master' into carousel-selection-fallback-improvement 2020-03-16 10:53:10 +09:00
Dan Balasescu
25a35a1370
Merge branch 'master' into always-apply-ruleset-filter 2020-03-16 10:32:36 +09:00
Dan Balasescu
12293bea1d
Merge branch 'master' into fix-chat-tabs 2020-03-16 09:57:01 +09:00
TheWildTree
acd280c855 Add System channel type and use it for the ChannelSelectorTab 2020-03-15 22:13:26 +01:00
Bartłomiej Dach
8952eb2a01 Merge branch 'master' into correct-trail-animation-frame 2020-03-15 15:24:26 +01:00
Dean Herbert
340d362d69 Appease inspectcode 2020-03-15 03:51:30 +09:00
Dean Herbert
12b7727af6 Update framework 2020-03-15 03:25:01 +09:00
Dean Herbert
4e8e222996 Merge branch 'master' into fix-carousel-scroll-while-import 2020-03-15 03:24:19 +09:00
Dean Herbert
0b788065b4 Update resources package 2020-03-15 01:00:25 +09:00
Dean Herbert
cd604785a8 Ignore italics specification for now 2020-03-15 00:38:27 +09:00
Dean Herbert
62ce503126 Fix changelog alignment and italics usage 2020-03-15 00:36:21 +09:00
Dean Herbert
735396c6d6 Merge branch 'master' into torus 2020-03-14 23:40:55 +09:00
Dean Herbert
cd0f1c98ba Update framework 2020-03-14 16:17:14 +09:00
Dean Herbert
fcbf83cd74
Merge pull request #8217 from smoogipoo/limit-max-slider-length
Add more sane limit for maximum slider length
2020-03-14 15:08:39 +09:00
TheWildTree
8991e88039 Fix active tab closing behaviour 2020-03-13 18:34:51 +01:00
TheWildTree
097bd37e37 Fix SelectorTab crashing tests after a reload
For some reason, the default channel type (Public) caused the channel manager to attempt to connect to an API, which was null at that time, after hot reloading the test environment (via dynamic compilation). Changing the channel type seems to fix that.
2020-03-13 18:34:51 +01:00
voidedWarranties
c27751050b Switch back to strings and update setting labels 2020-03-12 23:29:11 -07:00
smoogipoo
c33ca6e99c Decorate usages with exception management 2020-03-13 14:28:11 +09:00
smoogipoo
f7c036726a Add beatmap loading timeout 2020-03-13 13:52:40 +09:00
Dean Herbert
c45f9cafd4 Add medium -> regular fallback for torus 2020-03-13 13:43:48 +09:00
Dean Herbert
288470c313 Remove exo specification completely 2020-03-13 13:43:48 +09:00
Dean Herbert
ae112cf14f Reorder torus loading to provide regular as default 2020-03-13 13:43:48 +09:00
Dean Herbert
4a774d02e0 Remove exo font loading 2020-03-13 13:43:37 +09:00
Dean Herbert
8fb41e4c67
Merge pull request #8219 from smoogipoo/remove-unlimited-timingpoints
Remove unlimited timing points in difficulty calculation
2020-03-13 12:34:02 +09:00
Dean Herbert
ac70fcc544 Change logic to be more resilient by identifying user scroll events 2020-03-13 12:30:27 +09:00
Dean Herbert
5f8d180b5e Fix carousel scrolling being inoperable during beatmap import 2020-03-13 11:51:26 +09:00
Dean Herbert
04f1da04db Remove incorrect xmldoc from SelectBeatmap function 2020-03-13 10:52:08 +09:00
Dean Herbert
3f8b454ff4
Reword comment to match new filtering behaviour
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-13 10:01:28 +09:00
Bartłomiej Dach
d24fa18bc2
Merge branch 'master' into video-offset 2020-03-12 19:58:45 +01:00
Kelvin
c8ea922577
Update osu.Game/Skinning/LegacySkinExtensions.cs
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-12 04:18:57 -07:00
Kelvin
317bb5d0a4 Fallback on invalid AnimationFramerate for legacy skins 2020-03-12 03:55:45 -07:00
Dean Herbert
08dc4a0e8b
Merge pull request #8216 from smoogipoo/video-start-from-zero
Apply osu!-side video sprite changes
2020-03-12 19:46:46 +09:00
Dean Herbert
a69fabbd1f Update framework 2020-03-12 18:58:07 +09:00
Dean Herbert
604ce37064 Merge remote-tracking branch 'upstream/master' into video-start-from-zero 2020-03-12 18:57:53 +09:00
Dean Herbert
ca9cfbe51d Move selection fallback logic out of BeatmapCarousel to SongSelect 2020-03-12 18:42:08 +09:00
Dean Herbert
6e11c3014c Allow grouped difficulty icons to be clicked 2020-03-12 18:42:08 +09:00