24294 Commits

Author SHA1 Message Date
voidedWarranties
f587781058 Allow LoungeSubScreen to be null (fix test) 2020-08-15 14:27:49 -07:00
Craftplacer
1448c9e381 Merge remote-tracking branch 'upstream/master' into combo-colors 2020-08-15 23:01:38 +02:00
voidedWarranties
7a33a6b08a Merge remote-tracking branch 'upstream/master' into duplicate-multi-room 2020-08-15 13:07:12 -07:00
voidedWarranties
9e4b9188e1 Cache LoungeSubScreen, separate method, rename option 2020-08-15 13:06:16 -07:00
Craftplacer
c4a7fac760 Add required parameters and other various changes 2020-08-15 22:03:24 +02:00
Bartłomiej Dach
a426ff1d5b Refactor gameplay menu overlay to fix regression 2020-08-15 14:18:50 +02:00
Dean Herbert
e39b2e7218 Update framework 2020-08-14 21:53:18 +09:00
Dan Balasescu
a2119fd9e3
Merge pull request #9849 from peppy/fix-beatmap-cover-permaload
Fix beatmap covers not being unloaded in most overlays
2020-08-14 20:24:36 +09:00
Dean Herbert
e465afa280 Merge branch 'master' into beatmap-track-rework 2020-08-14 20:02:43 +09:00
Dean Herbert
c3757a4660 Fix beatmap covers not being unloaded in most overlays
Eventually we'll probably want something smarter than this, but for the
time being this helps stop runaway memory usage.
2020-08-14 19:22:26 +09:00
Dan Balasescu
b7ae70ff96
Merge branch 'master' into fix-skinnable-sound-mute 2020-08-14 19:01:32 +09:00
Dean Herbert
671141ec61 Load menu backgrounds via LargeTextureStore to reduce memory usage 2020-08-14 18:05:05 +09:00
Dan Balasescu
626cd4042f
Merge branch 'master' into delay-beatmap-load 2020-08-14 15:09:30 +09:00
Dean Herbert
2c6afce524
Merge pull request #9843 from smoogipoo/fix-playlist-mods 2020-08-14 11:11:13 +09:00
smoogipoo
0500d82b5b Fix playlist items sharing mod instances 2020-08-13 19:48:41 +09:00
smoogipoo
3cb22fad82 Fix mods sharing bindable instances 2020-08-13 19:48:31 +09:00
Lucas A
84cb36b6a8 Defer subscriptions for updateOverlayActivationMode() to OnEntering() 2020-08-13 10:57:18 +02:00
Dean Herbert
9e7a28002d Merge branch 'master' into beatmap-track-rework 2020-08-13 17:56:50 +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
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
smoogipoo
91e28b849d Fix incorrect BeatmapManager construction 2020-08-13 00:29:23 +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
Craftplacer
69590113d6 Temporary changes 2020-08-12 06:40:21 +02:00
Craftplacer
8ffaa49839 Handle additional null case 2020-08-12 06:40:21 +02:00
Craftplacer
139c0c75f8 Add documentation for constructor 2020-08-12 06:40:21 +02:00
Bartłomiej Dach
8fe5775ecb Allow testing mod combinations in ModTestScenes 2020-08-11 21:55:20 +02: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
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
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