Commit Graph

17351 Commits

Author SHA1 Message Date
e03b29947a Merge branch 'master' into correct-trail-animation-frame 2020-03-16 11:16:56 +09:00
bd05462a7f Merge branch 'master' into carousel-selection-fallback-improvement 2020-03-16 10:53:10 +09:00
25a35a1370 Merge branch 'master' into always-apply-ruleset-filter 2020-03-16 10:32:36 +09:00
12293bea1d Merge branch 'master' into fix-chat-tabs 2020-03-16 09:57:01 +09:00
acd280c855 Add System channel type and use it for the ChannelSelectorTab 2020-03-15 22:13:26 +01:00
8952eb2a01 Merge branch 'master' into correct-trail-animation-frame 2020-03-15 15:24:26 +01:00
0b788065b4 Update resources package 2020-03-15 01:00:25 +09:00
cd604785a8 Ignore italics specification for now 2020-03-15 00:38:27 +09:00
62ce503126 Fix changelog alignment and italics usage 2020-03-15 00:36:21 +09:00
735396c6d6 Merge branch 'master' into torus 2020-03-14 23:40:55 +09:00
cd0f1c98ba Update framework 2020-03-14 16:17:14 +09:00
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
8991e88039 Fix active tab closing behaviour 2020-03-13 18:34:51 +01:00
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
c45f9cafd4 Add medium -> regular fallback for torus 2020-03-13 13:43:48 +09:00
288470c313 Remove exo specification completely 2020-03-13 13:43:48 +09:00
ae112cf14f Reorder torus loading to provide regular as default 2020-03-13 13:43:48 +09:00
4a774d02e0 Remove exo font loading 2020-03-13 13:43:37 +09:00
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
04f1da04db Remove incorrect xmldoc from SelectBeatmap function 2020-03-13 10:52:08 +09:00
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
c8ea922577 Update osu.Game/Skinning/LegacySkinExtensions.cs
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-12 04:18:57 -07:00
317bb5d0a4 Fallback on invalid AnimationFramerate for legacy skins 2020-03-12 03:55:45 -07:00
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
a69fabbd1f Update framework 2020-03-12 18:58:07 +09:00
604ce37064 Merge remote-tracking branch 'upstream/master' into video-start-from-zero 2020-03-12 18:57:53 +09:00
ca9cfbe51d Move selection fallback logic out of BeatmapCarousel to SongSelect 2020-03-12 18:42:08 +09:00
1b5cb3893a Merge branch 'master' into fix-carousel-test-loading-beatmaps 2020-03-12 18:14:27 +09:00
fc058f8896 Remove unnecessary this. prefix 2020-03-12 18:03:18 +09:00
933a8ffc8a Add test coverage 2020-03-12 17:10:51 +09:00
28ac5af91c Fix beatmap carousel tests loading beatmap manager beatmaps in test browser 2020-03-12 16:53:23 +09:00
63edcddaf1 Apply ruleset filter in all cases (even when bypassing filter for selection purposes) 2020-03-12 15:06:26 +09:00
fd21e87670 Disable adjusting volume via "select next" and "select previous" as fallbacks 2020-03-12 11:28:45 +09:00
40ab860ab5 Remove unused using 2020-03-11 18:23:30 +09:00
9667934ed9 Remove unlimited timing points in difficulty calculation 2020-03-11 18:17:32 +09:00
758bb3711f Add more sane limit for maximum slider length 2020-03-11 18:07:11 +09:00
8eb8572c73 Apply osu!-side video sprite changes 2020-03-11 18:00:39 +09:00
35ae8aa29f Merge pull request #8108 from EVAST9919/friends-update-streams
Implement FriendsOnlineStatusControl component
2020-03-11 15:35:23 +09:00
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
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
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
d3c0deb381 Merge branch 'master' into friends-update-streams 2020-03-11 14:09:27 +09:00
f8f8e3628f Merge branch 'master' into always-scroll-to-selection 2020-03-11 13:38:28 +09:00
9119e32f63 Merge branch 'master' into better-filter-bypass 2020-03-11 13:37:55 +09:00
93aec4e692 Improve english
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-11 13:23:26 +09:00
638a9a24aa Initial disclaimer updates 2020-03-11 13:03:27 +09:00
afcbc5b789 Merge branch 'master' into fix-cross-thread-operation 2020-03-11 12:45:18 +09:00
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
a2d3f20409 Merge branch 'master' into better-filter-bypass 2020-03-11 02:55:14 +09:00
53e083f329 Merge branch 'master' into show-loved-pp 2020-03-11 01:08:13 +09:00