1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 08:27:49 +08:00
Commit Graph

59209 Commits

Author SHA1 Message Date
Dean Herbert
044b0604b2 Move OmitFirstBarLine to TimingControlPoint 2023-02-28 19:29:31 +09:00
Dean Herbert
1250c1f0c1 Update test assertions to match stable expectations
These changes were taken from https://github.com/ppy/osu/pull/22582.

Minor adjustments were applied to match stable expectations, which is to
say there cannot be an inherited control point with omit barline
specification (in the editor the setting is greyed out when inheritance
is turned on).
2023-02-28 19:28:21 +09:00
Dean Herbert
3c45ab677a
Merge pull request #22751 from peppy/update-framework
Update framework
2023-02-28 16:40:18 +09:00
Dean Herbert
89e20a7962 Update resources 2023-02-28 14:47:51 +09:00
Dean Herbert
bd1460a8d5 Update framework 2023-02-28 14:32:58 +09:00
Bartłomiej Dach
ca47d55f10
Merge pull request #22748 from OpenSauce04/patch-1
Fix grammar mistake in taiko relax mod description
2023-02-27 20:17:14 +01:00
Bartłomiej Dach
4e9d25957a
Merge pull request #22717 from peppy/skin-editor-depth-changing
Add ability to send selected skin components to front or back
2023-02-27 19:56:21 +01:00
Bartłomiej Dach
92edb0f868
Merge branch 'master' into skin-editor-depth-changing 2023-02-27 19:24:53 +01:00
OpenSauce
8d747f2402
Fixed grammar mistake in Taiko Relax mod description 2023-02-27 16:06:33 +00:00
Dean Herbert
dc3c1150b8 Set better defaults for SkinBlueprint transforms 2023-02-23 21:10:15 +09:00
Dean Herbert
c48aceb055 Fix undo history not being batched correctly for depth change operations 2023-02-23 20:03:36 +09:00
Bartłomiej Dach
d679703fa2
Merge pull request #22659 from peppy/fix-taiko-drum-nested-sample-detection
Fix `GameplaySampleTriggerSource` not considering nested objects when determining the best sample to play
2023-02-22 18:56:59 +01:00
Dean Herbert
a8c692a215
Merge pull request #22635 from peppy/use-overlays-container-more
Use `Overlays` container rather than `KeyBindingInputManager` for flashlight
2023-02-22 18:30:21 +09:00
Dean Herbert
32a9c066df Add test coverage of bring-to-front / send-to-back operations 2023-02-22 18:17:20 +09:00
Dean Herbert
90ca635a17 Fix weird nullability in TestSceneSkinEditor 2023-02-22 18:17:20 +09:00
Dean Herbert
16c8a392a1 Add ability to send selected skin components to front or back 2023-02-22 18:17:20 +09:00
Dean Herbert
f61fbcf3fc Update assertion to also check GameplayClockContainer's current time 2023-02-22 15:26:09 +09:00
Dean Herbert
a511e64fa5 Seek using GameplayClockContainer 2023-02-22 14:41:20 +09:00
Dean Herbert
4f9f4b3970
Merge pull request #22674 from peppy/skin-editor-layer-select
Add the ability to select a target layer in the skin editor
2023-02-22 12:51:15 +09:00
Bartłomiej Dach
051eb18b33
Merge branch 'master' into skin-editor-layer-select 2023-02-21 21:38:51 +01:00
Bartłomiej Dach
ab97b02235
Remove contradictory remark from xmldoc 2023-02-21 21:05:46 +01:00
Bartłomiej Dach
d59d153654
Fix test compile failures from Audio hoisting 2023-02-21 21:03:00 +01:00
Bartłomiej Dach
3d2fcb0cca
Merge branch 'master' into fix-taiko-drum-nested-sample-detection 2023-02-21 20:53:06 +01:00
Bartłomiej Dach
eb0c3ca174
Merge pull request #22650 from peppy/skin-editor-clipboard
Add skin editor clipboard support
2023-02-21 20:10:32 +01:00
Bartłomiej Dach
ec1bf7b0b2
Merge branch 'master' into skin-editor-clipboard 2023-02-21 19:35:58 +01:00
Dean Herbert
9384687d6d Switch ModMuted to add its metronome to components rather than overlays 2023-02-21 19:04:06 +09:00
Dean Herbert
1acc536248 Move DrawableRuleset.Audio to a less generic level 2023-02-21 19:03:52 +09:00
Dean Herbert
af062e7a68 Change placeComponent to only add to selection, not clear an existing selection 2023-02-21 14:11:18 +09:00
Dean Herbert
9321ec29dc Update slider sample source asserts to match expected behaviour
As pointed out in review, if the current time is after the end of the
slider, the correct hit object to use for sample retrieval is the object
itself, not any nested object.
2023-02-21 14:04:38 +09:00
Dean Herbert
e686b4393e Add wait steps to ensure frame-stable clock has caught up before checking state 2023-02-21 14:04:19 +09:00
Dean Herbert
5ba6059911 Merge branch 'master' into fix-taiko-drum-nested-sample-detection 2023-02-21 13:58:15 +09:00
Dean Herbert
ee87a29376
Merge pull request #22543 from Cwazywierdo/hitcircle-late-miss-fade
Fix hit circle late-miss fading differences compared to stable
2023-02-21 13:56:57 +09:00
Dean Herbert
0d229d959b Remove unnecessary TriggerChange call 2023-02-21 13:50:19 +09:00
Bartłomiej Dach
6799492596
Merge branch 'master' into skin-editor-layer-select 2023-02-20 21:33:48 +01:00
Bartłomiej Dach
8818341047
Merge pull request #22673 from peppy/skin-per-ruleset-layouts
Add support for per-ruleset skin layouts
2023-02-20 21:33:28 +01:00
Bartłomiej Dach
86a7f4dfd0
Do not serialise SkinLayoutInfo.AllDrawables
- It is entirely derived from `SkinLayoutInfo.DrawableInfo`, which is
  the actual primary thing we want to serialise.
- It will never get read out from any serialised files anyway (corollary
  of the previous point - it is a get-only property derived from another).
- It is only used in tests.

All of the three reasons above make serialising the property out to skin
files nothing more than a waste of space.
2023-02-20 20:37:48 +01:00
Bartłomiej Dach
c9999bdeb1
Merge branch 'master' into skin-per-ruleset-layouts 2023-02-20 20:14:38 +01:00
Bartłomiej Dach
43724472c4
Clarify comment to avoid playing pronoun game 2023-02-20 20:09:24 +01:00
Dean Herbert
6382314af1
Merge pull request #22697 from ggliv/tablet-area-drag
Allow tablet area to be dragged
2023-02-20 23:37:25 +09:00
Dean Herbert
43d33d45ca Only add valid placed components to selected collection on paste 2023-02-20 20:02:43 +09:00
Dean Herbert
b68562b033 Make placeComponent resilient to missing dependencies 2023-02-20 20:00:12 +09:00
Dean Herbert
a9c7edd087 Remove copy pasted comment 2023-02-20 19:57:16 +09:00
Dean Herbert
7a585e1fa1
Merge pull request #22669 from EVAST9919/mod-overlay-triangles
Add triangles animation to mod select overlay headers
2023-02-20 19:54:21 +09:00
Dean Herbert
ec12186d63 Remove unnecesasry null check on content 2023-02-20 19:53:04 +09:00
Dean Herbert
18700b4daa Add note about skin migrations being on read and remove an older deprecation notice 2023-02-20 19:51:54 +09:00
Dean Herbert
1629c86b5d
Mark constant identifier as non-localisable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-20 19:48:39 +09:00
Dean Herbert
0ddda018fd
Add xmldoc for SkinComponentsContainerLookup.Ruleset
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-20 19:48:18 +09:00
Dean Herbert
5f7a6d13c3 Remove unused GetSerialisableIdentifier for now 2023-02-20 19:47:17 +09:00
Gabe Livengood
c86c1a9029 allow tablet area to be dragged 2023-02-20 00:06:20 -05:00
Bartłomiej Dach
b5dda407a8
Merge pull request #22291 from ekrctb/revert-result-in-playfield
Move judgement result revert logic to Playfield
2023-02-19 17:06:08 +01:00