1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 20:02:58 +08:00
Commit Graph

31579 Commits

Author SHA1 Message Date
smoogipoo
3cb22fad82 Fix mods sharing bindable instances 2020-08-13 19:48:31 +09:00
Dean Herbert
662281d727 Adjust legacy spinners to fade in later
Matches stable 1:1 for legacy skins. I've left lazer default as it is
because changing to use the shorter apperance looks bad. This will
probably change as we proceed with the redesign of the default skin.
2020-08-13 18:20:46 +09:00
Dean Herbert
9e7a28002d Merge branch 'master' into beatmap-track-rework 2020-08-13 17:56:50 +09:00
Dean Herbert
52374ac9c9
Merge pull request #9833 from bdach/fix-spun-out-mod-rate-dependency 2020-08-13 17:52:13 +09:00
Dean Herbert
ab56980f8c
Merge branch 'master' into fix-spun-out-mod-rate-dependency 2020-08-13 17:24:11 +09:00
Dean Herbert
2067e1ce44
Merge pull request #9798 from EVAST9919/dashboard-news 2020-08-13 17:23:54 +09:00
Dan Balasescu
4467a5599a
Merge pull request #9840 from peppy/update-fastlane
Update fastlane and plugins
2020-08-13 14:40:34 +09:00
Dean Herbert
c71ee0877f Update fastlane and plugins 2020-08-13 14:07:07 +09:00
Dean Herbert
cf9bda6c19 Add coverage of early exit with null and non-null player 2020-08-13 13:05:13 +09:00
Dean Herbert
fd7bf70b7d Remove weird "after load" action
This was pretty pointless anyway and from its usages, doesn't look to
need to exist.
2020-08-13 13:03:18 +09:00
Dean Herbert
5b536aebe7 Add missing null checks and avoid cross-test pollution 2020-08-13 12:53:37 +09:00
Dean Herbert
99bea6b8e9 Add missing null check (player construction is potentially delayed now) 2020-08-13 12:52:35 +09:00
Dean Herbert
27cd9e119a Delay beatmap load until after transition has finished
Previously the beatmap would begin loading at the same time the
`PlayerLoader` class was. This can cause a horribly visible series of
stutters, especially when a storyboard is involved.

Obviously we should be aiming to reduce the stutters via changes to the
beatmap load process (such as incremental storyboard loading,
`DrawableHitObject` pooling, etc.) but this improves user experience
tenfold in the mean time.
2020-08-13 12:04:32 +09:00
Dan Balasescu
1c771471d5
Merge pull request #9837 from peppy/update-framework
Update framework and resources
2020-08-13 00:41:58 +09:00
smoogipoo
91e28b849d Fix incorrect BeatmapManager construction 2020-08-13 00:29:23 +09:00
smoogipoo
45876bc55a Fix reference to non-existent variable 2020-08-12 23:50:33 +09:00
Dean Herbert
429ad783cf Merge branch 'update-framework' into beatmap-track-rework 2020-08-12 23:35:46 +09:00
Dean Herbert
00f8bb7c3e Update resources 2020-08-12 23:28:45 +09:00
Dean Herbert
b10cddf625 Update framework 2020-08-12 23:28:08 +09:00
Dean Herbert
05b06e7451
Merge branch 'master' into fix-skinnable-sound-mute 2020-08-12 22:01:04 +09:00
Andrei Zavatski
f3202fb123 Naming adjustments 2020-08-12 11:24:26 +03:00
Andrei Zavatski
9b112baa88 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-news 2020-08-12 11:15:58 +03:00
Bartłomiej Dach
4f3f95540b Check for zero rate to prevent crashes on unpause 2020-08-11 22:34:46 +02:00
Bartłomiej Dach
bcaaf25278 Fix Spun Out mod being affected by rate-changing mods 2020-08-11 22:04:18 +02:00
Bartłomiej Dach
25f59e0489 Add failing test cases 2020-08-11 21:55:50 +02:00
Bartłomiej Dach
8fe5775ecb Allow testing mod combinations in ModTestScenes 2020-08-11 21:55:20 +02:00
Bartłomiej Dach
b78ccf8a34 Rewrite Spun Out test scene 2020-08-11 21:28:00 +02:00
Dan Balasescu
85182b19fe
Merge pull request #9831 from peppy/fix-informational-overlays
Fix informational overlays not hiding each other correctly
2020-08-12 02:18:34 +09:00
Andrei Zavatski
84655b0798 Change hover colour for news title 2020-08-11 20:17:29 +03:00
Andrei Zavatski
fdfda453c7 Merge remote-tracking branch 'refs/remotes/ppy/master' into dashboard-news 2020-08-11 20:14:52 +03:00
smoogipoo
c0031955c9 Update with further framework changes 2020-08-12 01:50:18 +09:00
smoogipoo
e47a1eb313 Use adjustable ITrack 2020-08-12 01:41:21 +09:00
smoogipoo
688e447950 Fix potential hierarchy mutation from async context 2020-08-12 01:33:06 +09:00
smoogipoo
eec94e1f53 Make track not-null in GameplayClockContainer/FailAnimation 2020-08-12 00:51:43 +09:00
smoogipoo
b66f303e71 Add annotation 2020-08-12 00:48:45 +09:00
smoogipoo
070d71ec27 More cleanups 2020-08-12 00:48:38 +09:00
Dean Herbert
8bfe6ba27c Fix informational overlays not hiding each other correctly 2020-08-11 23:15:08 +09:00
smoogipoo
031d29ac34 Inspect current track directly 2020-08-11 13:53:23 +09:00
smoogipoo
faff0a70c4 Privatise BMWB 2020-08-11 13:48:57 +09:00
smoogipoo
338c01fa43 Remove track store reference counting, use single instance stores 2020-08-11 13:16:06 +09:00
smoogipoo
6aafb3d271 Cleanup TestSceneScreenNavigation 2020-08-11 13:14:20 +09:00
smoogipoo
322d08af1b Remove more local music controller caches 2020-08-11 13:11:59 +09:00
smoogipoo
7d35893ecd Make MusicController non-nullable 2020-08-11 12:40:58 +09:00
smoogipoo
c66a14e9c5 Remove beatmap from FailAnimation 2020-08-11 12:37:48 +09:00
smoogipoo
b64142dff9 Fix incorrect load state being used 2020-08-11 12:37:00 +09:00
smoogipoo
20197e2768 Remove locally-cached music controller 2020-08-11 12:27:32 +09:00
Dan Balasescu
c86798f8b2
Merge pull request #9829 from peppy/fix-multiple-assembly-loaded-crash
Fix crash when same ruleset loaded more than once
2020-08-11 12:09:44 +09:00
Dan Balasescu
8b7e715c2b
Merge pull request #9818 from peppy/improve-token-fail-error-messaging
Improve messaging when timeshift token retrieval fails
2020-08-11 11:31:52 +09:00
Dean Herbert
471ed968e3 Fix crash when same ruleset loaded more than once
If the same ruleset assembly was present more than once in the current
AppDomain, the game would crash. We recently saw this in Rider EAP9.
While this behaviour may change going forward, this is a good safety
measure regardless.
2020-08-11 11:09:02 +09:00
Dean Herbert
dd2f677aa4
Merge pull request #9633 from Joehuu/fix-keybind-clearing 2020-08-11 11:01:03 +09:00