1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:02:55 +08:00
Commit Graph

33781 Commits

Author SHA1 Message Date
Dean Herbert
11c18952e3 Allow children to be added in base class 2020-11-05 18:12:06 +09:00
Dean Herbert
64e3325b41 Abstract out common part of legacy spinner implementations
Some elements going forward will be shared, so it makes sense to have a
common base class to add these shared elements.
2020-11-05 18:00:27 +09:00
Dean Herbert
82d8c1bbea Add support for spinner glow 2020-11-05 17:27:41 +09:00
Dean Herbert
7d33dc3dea Reorder spinner tests to promote hit being the first to display 2020-11-05 17:27:41 +09:00
Dean Herbert
019d286ce8 Merge branch 'drawable-hit-object-hit-state-fix' into add-spinner-glow 2020-11-05 17:27:38 +09:00
Dean Herbert
8aa0a698d9 Avoid errors due to second set 2020-11-05 17:26:41 +09:00
Dean Herbert
9c91f16e3a Update sizing as early as possible in addition to scheduling (to handle any dependent edge cases) 2020-11-05 17:24:59 +09:00
Dean Herbert
8293846afc Merge branch 'master' into fix-skinnable-test-scene 2020-11-05 17:24:24 +09:00
Dean Herbert
0cadb31947 Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-05 17:07:52 +09:00
Dean Herbert
0b683c8c74
Merge pull request #10694 from peppy/fix-pausable-skinnable-sound-for-the-last-time
Fix paused samples potentially getting stuck in a playing state in rapid toggling
2020-11-05 16:54:25 +09:00
Dean Herbert
4a4fa96fef
Merge pull request #10692 from smoogipoo/followpointrenderer-hitobject 2020-11-05 16:39:05 +09:00
Dean Herbert
2d0c62dce2 Fix SkinnableTestScene's autosize propagation
Regressed with recent DrawableHitObject changes (moving of
RelativeSizeAxes specifications out of constructors).
2020-11-05 16:37:48 +09:00
Dean Herbert
54775ccacf
Merge pull request #10690 from smoogipoo/osu-remove-hitobject-references 2020-11-05 16:22:13 +09:00
Dean Herbert
414daab1dc Fix paused samples potentially getting stuck in a playing state in rapid toggling
Closes #10693. Should be obvious why.
2020-11-05 16:14:23 +09:00
Dean Herbert
a43166e8a9
Merge branch 'master' into followpointrenderer-hitobject 2020-11-05 15:42:09 +09:00
Dean Herbert
54f927ee11 Move casts to DrawableHitObject instead 2020-11-05 15:41:55 +09:00
Dean Herbert
c26fd4dc3d
Merge pull request #10691 from smoogipoo/osu-lighting-colour-reuse
Remove AccentColour binding from judgement lighting
2020-11-05 15:37:28 +09:00
Dean Herbert
e2d028908a Fix one more case of local variable preference 2020-11-05 15:25:20 +09:00
Dean Herbert
4457e363d3 Bring back local variables to reduce two-level-deep variable access 2020-11-05 15:22:40 +09:00
Dean Herbert
7fd21b8d57
Merge branch 'master' into osu-remove-hitobject-references 2020-11-05 15:10:37 +09:00
Dean Herbert
ec01de807c
Merge pull request #10689 from smoogipoo/osu-bdl-load 2020-11-05 15:09:12 +09:00
smoogipoo
9c1c9945af Make FollowPointRenderer use hitobject models 2020-11-05 15:01:45 +09:00
smoogipoo
9ac822beed Remove AccentColour binding from judgement lighting 2020-11-05 14:49:15 +09:00
smoogipoo
400fcedf0f Remove stored hitobject references from skinnable components 2020-11-05 14:40:48 +09:00
smoogipoo
9a7fcadabc Use BDL for top-level osu! DHOs 2020-11-05 13:51:46 +09:00
Dean Herbert
a3dc1d5730 Update existing implementations 2020-11-04 17:14:23 +09:00
Dean Herbert
68b7efe4d5 Change order of execution to be chronological 2020-11-04 17:14:23 +09:00
Dean Herbert
831325978a Always execute UpdateHitStateTransforms (even for idle) 2020-11-04 17:14:23 +09:00
Dan Balasescu
a386765a9d
Merge pull request #10684 from peppy/ios-editor-crash-fix
Fix crash on entering the editor on iOS
2020-11-04 17:02:09 +09:00
Dean Herbert
3b6cf95f49 Remove parameter from StartTime method and add obsoleted previous version 2020-11-04 16:39:52 +09:00
Dean Herbert
7f30140b7e Add new method handling hit state specifically
Until now UpdateStateTransforms was applying results offsets to
StartTime. This didn't cover the case of a HitObject with duration,
where the call would be made with `StartTime + hitOffset` rather than
`EndTime + hitOffset`.

To resolve this, a new method has been added which should be used to
handle hit-specific state transforms.
2020-11-04 16:13:14 +09:00
Dan Balasescu
3322c2bbc5
Merge branch 'master' into ios-editor-crash-fix 2020-11-04 15:56:40 +09:00
Dan Balasescu
8045ea200e
Merge pull request #10655 from peppy/ios-disable-spectator
Downgrade SignalR package to avoid startup crashes on iOS
2020-11-04 15:47:40 +09:00
Dean Herbert
ce1743ab28 Fix missed usage in test scene 2020-11-04 15:35:42 +09:00
Dean Herbert
487a5ecdba Replace all usage of IBindableList.GetBoundCopy 2020-11-04 15:29:14 +09:00
Dan Balasescu
c4076cad4b
Merge pull request #10667 from peppy/fix-editor-play-after-drag
Fix editor clock not always remaining stopped when dragging timeline
2020-11-04 15:24:22 +09:00
Dean Herbert
9343f84a68 Add IBindableList.GetBoudCopy to banned symbols for now 2020-11-04 15:21:23 +09:00
Dean Herbert
8b1dd31bb4 Add gitignore ruile for new msbuild generated editorconfig file 2020-11-04 15:20:41 +09:00
Dean Herbert
7d0a7f170c
Avoid overwriting inherited nowarns
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2020-11-04 14:57:47 +09:00
Dean Herbert
d1829820e0 Remove local changes from csproj 2020-11-04 14:53:29 +09:00
Dean Herbert
6c4acb4d11 Move to props and ignore downgrade warning 2020-11-04 14:45:52 +09:00
Dean Herbert
70b762744e Merge branch 'master' into ios-disable-spectator 2020-11-04 14:45:51 +09:00
Dan Balasescu
42c543f5b9
Merge branch 'master' into fix-editor-play-after-drag 2020-11-04 14:45:20 +09:00
Dan Balasescu
98c992004b
Merge pull request #10660 from peppy/fix-song-select-first-track-looping
Fix looping mode not being set on first track after entering song select
2020-11-04 14:37:27 +09:00
Dean Herbert
5316d4c369 Force using older signalr version for iOS 2020-11-04 14:27:13 +09:00
Dean Herbert
1d90f5fc08 Revert "Disable spectator streaming connection logic on iOS to avoid startup crash"
This reverts commit c9b96a1829.
2020-11-04 14:27:13 +09:00
Dan Balasescu
c6779b414e
Merge pull request #10611 from peppy/spectator-listing
Add "currently playing" player listing and spectator UI flow
2020-11-04 14:08:11 +09:00
Dan Balasescu
9b2f396006
Merge pull request #10678 from peppy/fix-load-async-after-disposal-beatmap-wedge
Fix LoadComponentAsync calls potentially occuring after beatmap wedge disposal
2020-11-04 13:10:41 +09:00
Dean Herbert
cfe3218239 Move scheduler call to inside method itself for added safety 2020-11-04 10:23:06 +09:00
Dean Herbert
29e8e5ab94 Merge branch 'master' into fix-load-async-after-disposal-beatmap-wedge 2020-11-04 10:23:05 +09:00