1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 07:53:38 +08:00
Commit Graph

17525 Commits

Author SHA1 Message Date
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
voidedWarranties
7e4f58c2d3 Internalize both looping and stopping 2020-03-13 16:42:05 -07: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
Dean Herbert
ce5d01ed19 Allow filtered difficulty icons to be clicked 2020-03-12 18:42:08 +09:00
Dan Balasescu
1b5cb3893a
Merge branch 'master' into fix-carousel-test-loading-beatmaps 2020-03-12 18:14:27 +09:00
Dean Herbert
fc058f8896 Remove unnecessary this. prefix 2020-03-12 18:03:18 +09:00
Dean Herbert
933a8ffc8a Add test coverage 2020-03-12 17:10:51 +09:00
Dean Herbert
28ac5af91c Fix beatmap carousel tests loading beatmap manager beatmaps in test browser 2020-03-12 16:53:23 +09:00
Dean Herbert
63edcddaf1 Apply ruleset filter in all cases (even when bypassing filter for selection purposes) 2020-03-12 15:06:26 +09:00
voidedWarranties
1d314a1f4b Prevent playback from going beyond song end 2020-03-11 22:40:08 -07:00
Dean Herbert
fd21e87670 Disable adjusting volume via "select next" and "select previous" as fallbacks 2020-03-12 11:28:45 +09:00
smoogipoo
40ab860ab5 Remove unused using 2020-03-11 18:23:30 +09:00
smoogipoo
9667934ed9 Remove unlimited timing points in difficulty calculation 2020-03-11 18:17:32 +09:00
smoogipoo
758bb3711f Add more sane limit for maximum slider length 2020-03-11 18:07:11 +09:00
smoogipoo
8eb8572c73 Apply osu!-side video sprite changes 2020-03-11 18:00:39 +09:00
smoogipoo
424f9afbf4 Fix incorrect offset with custom clock 2020-03-11 17:55:20 +09:00
Dan Balasescu
35ae8aa29f
Merge pull request #8108 from EVAST9919/friends-update-streams
Implement FriendsOnlineStatusControl component
2020-03-11 15:35:23 +09:00
Dan Balasescu
1d556bfc5f
Merge branch 'master' into video-offset 2020-03-11 15:13:18 +09:00
smoogipoo
ae7245a51b Refactor + fix fade in too late 2020-03-11 15:11:54 +09:00
voidedWarranties
6de244389b Use OffsetClock instead of ManualClock 2020-03-10 22:50:20 -07:00
Dan Balasescu
e6685c88fc
Merge pull request #8205 from peppy/always-scroll-to-selection
Fix changing ruleset at song select not scrolling the current selection back into view
2020-03-11 14:38:57 +09:00
Dean Herbert
6f7a6a5a59
Merge pull request #8133 from peppy/better-filter-bypass
Reapply filters on next change after a forced beatmap display
2020-03-11 14:36:28 +09:00
Dan Balasescu
c3fd8e294a
Merge pull request #8211 from peppy/new-disclaimer
Update text on disclaimer screen (and add tips)
2020-03-11 14:24:58 +09:00
Dan Balasescu
d3c0deb381
Merge branch 'master' into friends-update-streams 2020-03-11 14:09:27 +09:00
Dan Balasescu
f8f8e3628f
Merge branch 'master' into always-scroll-to-selection 2020-03-11 13:38:28 +09:00
Dan Balasescu
9119e32f63
Merge branch 'master' into better-filter-bypass 2020-03-11 13:37:55 +09:00
Dean Herbert
93aec4e692
Improve english
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-11 13:23:26 +09:00
Dean Herbert
ec88f7a712 Update tests and delay push animation until loader is done disappearing 2020-03-11 13:20:31 +09:00
Dean Herbert
4012e878b0 Update loader look 2020-03-11 13:05:33 +09:00
Dean Herbert
638a9a24aa Initial disclaimer updates 2020-03-11 13:03:27 +09:00
Dan Balasescu
afcbc5b789
Merge branch 'master' into fix-cross-thread-operation 2020-03-11 12:45:18 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dean Herbert
a2d3f20409
Merge branch 'master' into better-filter-bypass 2020-03-11 02:55:14 +09:00
Dean Herbert
53e083f329
Merge branch 'master' into show-loved-pp 2020-03-11 01:08:13 +09:00
Dean Herbert
0be423183d Rename data class 2020-03-11 00:36:56 +09:00
Dean Herbert
66a0f3334d
Merge branch 'master' into fix-perfect-judgements 2020-03-10 23:50:57 +09:00
Dean Herbert
dbfbcca29c
Merge pull request #8195 from smoogipoo/fix-storyboard-crashes
Fix crashes on some storyboards
2020-03-10 22:28:35 +09:00
Dean Herbert
ad7cda8735 Fix download failures causing a non-safe drawable change 2020-03-10 20:11:06 +09:00
Dean Herbert
8294dd0b71 Fix changing ruleset at song selectnot scrolling the current selection back into view 2020-03-10 19:59:49 +09:00
smoogipoo
e6858bf130 Fix crashes on some storyboards 2020-03-10 11:58:33 +09:00
Dean Herbert
059af2a986 Update framework 2020-03-10 10:43:06 +09:00
voidedWarranties
5aa99d8b34 Hide background image when video is present 2020-03-09 16:04:23 -07:00
Dean Herbert
c1ac800473
Merge pull request #8186 from Joehuu/fix-textbox-backspace-animation
Fix textbox characters not animating when typing/backspacing
2020-03-09 14:03:33 +09:00
Joehu
3903423a37 Fix textbox characters not animating when typing/backspacing 2020-03-08 19:43:53 -07:00
Dan Balasescu
a04b651fea
Merge pull request #8170 from peppy/tournament-base-changes
Apply tournament client usability changes
2020-03-09 10:15:10 +09:00
Dan Balasescu
ae42c32c86
Merge pull request #8182 from Game4all/fix-hit-error-ticks-outside-bounds
Fix hit error ticks getting out of the hit error meter
2020-03-09 09:45:48 +09:00
Dan Balasescu
2eb8f245da
Merge branch 'master' into tournament-base-changes 2020-03-09 09:24:46 +09:00
Dan Balasescu
5b8035052f
Merge branch 'master' into fix-hit-error-ticks-outside-bounds 2020-03-09 09:16:51 +09:00
Dan Balasescu
0c868f54bc
Merge branch 'master' into score-counter-flexibility 2020-03-09 08:56:39 +09:00
voidedWarranties
4624582703 Revert position offset change for separate pull 2020-03-08 14:40:36 -07:00
voidedWarranties
22dd93a4f6 Code quality, read position offsets 2020-03-08 14:02:39 -07:00
Dean Herbert
460bd993ca
Merge pull request #8047 from TheWildTree/adjust-most-played
Adjust most played beatmaps section to better match osu-web
2020-03-09 02:20:02 +09:00
Lucas A
0953751d24 Clamp relative position of judgement ticks in range [0;1] 2020-03-08 15:51:57 +01:00
Bartłomiej Dach
c803de2b49 Fix player instantiation
Since ModTestScene.CreatePlayer would apply mods in addition to
instantiating the player, overriding it could lead to mistakenly also
overriding the code that was supposed to set up the test via
currentTestData.

Make ModTestScene.CreatePlayer sealed, which ensures that mod &
autoplay changes are applied, and expose ModTestScene.CreateModPlayer
instead which has the expected semantics.
2020-03-08 14:18:45 +01:00
Bartłomiej Dach
cc5cae4db9 Do not transition to result screen 2020-03-08 14:08:49 +01:00
Bartłomiej Dach
d5dda05d98 Merge branch 'master' into fix-perfect-judgements 2020-03-08 14:06:18 +01:00
Dean Herbert
0102aaf32a Move chat expand/contract logic local to tournament 2020-03-08 18:11:57 +09:00
Dean Herbert
979988235d Increase flexibility of StarCounter component 2020-03-08 15:56:22 +09:00
Dean Herbert
aed52179f0 Fix weird reverse logic 2020-03-08 15:32:22 +09:00
voidedWarranties
48282dea8b Remove individual setting to disable videos, fix tests 2020-03-07 22:08:38 -08:00
voidedWarranties
76c832518f Render video as a part of the storyboard 2020-03-07 21:32:03 -08:00
voidedWarranties
d68d7edea3 Start background video playback based on provided offset 2020-03-07 14:08:13 -08:00
Andrei Zavatski
e886c155e6 Adjust text size values 2020-03-07 04:05:17 +03:00
Andrei Zavatski
66f40f7f6e Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update 2020-03-07 04:01:36 +03:00
Dean Herbert
3295f8657a Restore clamp behaviour 2020-03-06 22:44:11 +09:00
Dean Herbert
fa8e7adf07 Merge branch 'master' into fix-testscene-rate 2020-03-06 22:40:02 +09:00
Dan Balasescu
28c665e7a6
Merge branch 'master' into add-load-delay-for-avatars 2020-03-06 22:09:47 +09:00
Dean Herbert
16cc49daa0 Update framework 2020-03-06 18:47:31 +09:00
Dean Herbert
a59c3d997d Refactor implementation to better match what already existed 2020-03-06 18:00:17 +09:00
Dean Herbert
90dbb90470 Merge branch 'master' into disable-keycounter-breaks 2020-03-06 17:53:10 +09:00
Dean Herbert
8ff3370273 Add a short load delay for avatars to avoid unnecessary fetching 2020-03-06 16:27:38 +09:00
Bartłomiej Dach
5b0846cb69 Handle hover explicitly 2020-03-05 23:15:53 +01:00
Bartłomiej Dach
bd1dbea6f4 Centralise background colour updates 2020-03-05 23:10:14 +01:00
Bartłomiej Dach
f5e6f92ac6 Merge branch 'master' into adjust-most-played 2020-03-05 22:37:09 +01:00
Dean Herbert
c3ad08f230 Remove wild writeline 2020-03-06 02:18:35 +09:00
Dean Herbert
ebc86c1075 Fix random test failure 2020-03-06 02:14:16 +09:00
Dean Herbert
e3509c742c Track time in a simpler way in TrackVirtualManual 2020-03-06 02:03:19 +09:00
Dean Herbert
ece263131b Update to follow new naming/structure 2020-03-06 00:36:05 +09:00
Dean Herbert
5b8aaba4a6 Merge branch 'master' into fix-perfect-judgements 2020-03-06 00:18:05 +09:00
Dean Herbert
2b89fb68f7
Merge branch 'master' into fix-testscene-rate 2020-03-05 23:38:33 +09:00
Dean Herbert
0477ef6c13 Force a selection after filtering to ensure correct difficulty is selected 2020-03-05 21:45:19 +09:00
Dean Herbert
332f56a7f8 Fix nullref in tests 2020-03-05 20:34:24 +09:00
Dean Herbert
371a543645 Update framework 2020-03-05 20:25:38 +09:00
Dean Herbert
e085aa8c1d Merge branch 'master' into better-filter-bypass 2020-03-05 20:19:08 +09:00
Dan Balasescu
aafdfbca1f
Merge pull request #8129 from peppy/fix-dummy-track-completion-feedback
Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap
2020-03-05 17:57:57 +09:00