1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-13 04:57:19 +08:00

17783 Commits

Author SHA1 Message Date
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
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
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