h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 06:47:24 +08:00
Code Issues Releases Wiki Activity
39,250 Commits 3 Branches 648 Tags 270 MiB
baa4089364
Commit Graph

24708 Commits

Author SHA1 Message Date
Gagah Pangeran Rosfatiputra
18bfcd7b22
add hover colour to OsuMarkdownLinkText 2021-05-02 22:41:11 +07:00
Gagah Pangeran Rosfatiputra
88aaa9b332
add inline code colour 
Reference : 31579d45aa/resources/assets/less/bem/osu-md.less (L12-L17)
 2021-05-02 22:35:30 +07:00
Salman Ahmed
3aa18e19c9 Revert "Bump Humanizer from 2.8.26 to 2.9.9" 
This reverts commit 1e7feff49d.
 2021-05-02 11:30:44 +03:00
Dean Herbert
a8db63498a
Merge pull request #12650 from frenzibyte/selection-box-use-aabb 
Compute selection box area using the bounding box of the blueprints instead
 2021-05-02 13:30:01 +09:00
Dean Herbert
2e24b69d62
Merge pull request #12617 from Joehuu/fix-pp-column-approved-maps 
Fix approved maps not displaying pp column on score table
 2021-05-02 13:27:39 +09:00
Salman Ahmed
b83aa0bd76 Avoid LINQ in update 2021-05-02 06:21:14 +03:00
Salman Ahmed
0aa17e7c95 Rewrite selection box computation logic with RectangleF's helper methods 2021-05-02 02:51:06 +03:00
Salman Ahmed
07fe99025f Use bounding box of blueprint for computing selection box area 2021-05-02 02:36:40 +03:00
Joseph Madamba
137be5dc97 Use equality operator instead of null coalescing 
Co-Authored-By: Salman Ahmed <frenzibyte@gmail.com>
 2021-05-01 14:14:07 -07:00
Dean Herbert
a551958eeb Move caching of IBeatmap to base DrawableRuleset 2021-05-01 21:32:45 +09:00
Justus Franklin Tumacder
0d077b7a5d Fix GetClosestBeatDivisor returning the wrong divisor 2021-05-01 14:13:42 +08:00
Justus Franklin Tumacder
fdf8c12947 Replace BeatDivisorFinder with GetClosestBeatDivisor 2021-05-01 11:57:47 +08:00
Justus Franklin Tumacder
ecb053b0de Merge branch 'master' of https://github.com/ppy/osu into justusft/mania-color-snap 2021-05-01 11:20:28 +08:00
Dean Herbert
cbc7753f23
Merge pull request #12564 from Joehuu/fix-beatmap-info-download-button-content-scaling 
Fix beatmap info download button content not scaling on mouse down
 2021-05-01 10:43:59 +09:00
Bartłomiej Dach
9cb55ca245
Merge branch 'master' into barrel-roll 2021-04-30 22:27:27 +02:00
Bartłomiej Dach
eef135f8dc
Merge branch 'master' into remove-unused-triangles 2021-04-30 21:51:23 +02:00
Joseph Madamba
786ab163f6 Rename extension and move to bottom of file 2021-04-30 12:40:16 -07:00
Salman Ahmed
b145f46a0a
Merge branch 'master' into skin-components-list 2021-04-30 21:10:55 +03:00
Dan Balasescu
e6eea73b8b
Merge branch 'master' into basic-compose-checks 2021-04-30 23:41:46 +09:00
Dean Herbert
64b244d0ba
Merge branch 'master' into skin-bindables 2021-04-30 20:56:16 +09:00
Dan Balasescu
c303043841
Merge branch 'master' into simpler-editor-move-events 2021-04-30 18:55:39 +09:00
Dan Balasescu
5285b71ecb
Merge pull request #12596 from peppy/abstract-blueprint-handling 
Make editor blueprint/selection components abstract
 2021-04-30 18:55:20 +09:00
Dean Herbert
e663629bc6 Match button appearance to that of the beatmap editor 2021-04-30 15:22:51 +09:00
Dean Herbert
e4f895b490 Fix editor buttons inheriting from TriangleButton when they have no need to 2021-04-30 14:48:37 +09:00
Dean Herbert
a1e64f4e3c Use the existing toolbox design 2021-04-30 14:41:06 +09:00
Gagah Pangeran Rosfatiputra
fc4fa4f696
use ListBlock IsOrdered to determine ordered or unordered list 2021-04-30 11:48:37 +07:00
Gagah Pangeran Rosfatiputra
11d0f12455
change create text marker to virtual 2021-04-30 11:36:51 +07:00
Dean Herbert
bde72faa7c Limit components list height to better align with actual viewport 2021-04-30 13:10:42 +09:00
Dean Herbert
20ff05c9ff Fix crosstalk between notification/setting overlay nudge padding and skin overlay position adjust 2021-04-30 13:10:42 +09:00
Dean Herbert
8b82a07914 Move skin-related interfaces out of HUD namespace 2021-04-30 13:10:42 +09:00
Dean Herbert
5585a7d438 Add basic interfaces for skinnable target containers 2021-04-30 13:10:42 +09:00
Dean Herbert
ae9d1dc40b Add component list to main editor interface and enable basic placement 2021-04-30 13:10:42 +09:00
Dean Herbert
6442fb819f Split out component from test scene and fix SongProgress 2021-04-30 13:10:42 +09:00
Dean Herbert
cdef07b2ee Fix blueprints not hiding when deleting elements 2021-04-30 13:09:57 +09:00
Gagah Pangeran Rosfatiputra
cf53a05dfd
change marker size and position for ordered list 2021-04-30 10:59:23 +07:00
Gagah Pangeran Rosfatiputra
e6579352f9
add left padding for ordered list 
In osu-md.less, this rule style[1] removes padding left in ordered list.
But in this rule style[2], pseudo element `::before` is used as marker
or counter and has minimal width 30px. So we use this as left padding
size.

[1] 5b0e3ac3ff/resources/assets/less/bem/osu-md.less (L196-L200)
[2] 5b0e3ac3ff/resources/assets/less/bem/osu-md.less (L210-L219)
 2021-04-30 10:56:41 +07:00
Gagah Pangeran Rosfatiputra
c0d9f9f8c6
use order number as marker for ordered list 2021-04-30 10:48:12 +07:00
Gagah Pangeran Rosfatiputra
2a3479f30d
add order in OsuMarkdownListItem for ordered list 2021-04-30 10:47:51 +07:00
Gagah Pangeran Rosfatiputra
781064ba96
create list marker based on its level 2021-04-30 10:40:06 +07:00
Gagah Pangeran Rosfatiputra
f676526cf4
add level in OsuMarkdownListItem 2021-04-30 10:39:48 +07:00
Gagah Pangeran Rosfatiputra
e3cc4561ab
add bullet marker in OsuMarkdownListItem 2021-04-30 10:35:40 +07:00
Gagah Pangeran Rosfatiputra
010c51e6ed
change OsuMarkdownListItem to composite drawable 2021-04-30 10:12:43 +07:00
Gagah Pangeran Rosfatiputra
1e8b3f3a8c
handle list padding in OsuMarkdownListItem 
Reference : 5b0e3ac3ff/resources/assets/less/bem/osu-md.less (L193-L194)
 2021-04-30 09:47:25 +07:00
Gagah Pangeran Rosfatiputra
a24a279404
use OsuMarkdownListItem for ListItemBlock 2021-04-30 09:43:21 +07:00
Gagah Pangeran Rosfatiputra
820408757a
add OsuMarkdownListItem 2021-04-30 09:43:05 +07:00
Dean Herbert
e69ec91c07 Add xmldoc for CurrentRotation 2021-04-30 11:25:39 +09:00
Dean Herbert
3b2243fa24
Merge pull request #12610 from PercyDan54/export-precision-loss 
Fix possible precision loss on exporting legacy replays
 2021-04-30 11:19:27 +09:00
Andrei Zavatski
7bf3498e2a Calculate playfield scale locally 2021-04-30 02:49:19 +03:00
Andrei Zavatski
25e0fb1cf9 Refactor OsuModBarrelRoll to allow it's usage by other rulesets 2021-04-30 01:59:59 +03:00
Joseph Madamba
9952a5bfdb Revert "Fix button being recreated on importing state" 
This reverts commit c9967f7b74.
 2021-04-29 14:24:29 -07:00
Joseph Madamba
cfbf95b433 Add HasPerformancePoints extension method 2021-04-29 14:11:35 -07:00
Dean Herbert
8d056ff38f Remove redundant parenthesis 2021-04-29 18:23:22 +09:00
PercyDan54
e716162ac2
Fix formatting 2021-04-29 17:19:25 +08:00
Dean Herbert
63435ba548 Ensure toolbar doesn't overlap editor content 2021-04-29 17:41:07 +09:00
Dean Herbert
fb64f6faf2 Add ability to exit using game "back" binding 2021-04-29 17:40:58 +09:00
Dean Herbert
a7982787d4 Add basic header text 2021-04-29 17:40:48 +09:00
Dean Herbert
b936043956 Add the skin editor to the game 2021-04-29 17:20:22 +09:00
Dean Herbert
141d3af302 Add the ability to temporarily disable user scaling on a ScalingContainer 2021-04-29 17:19:47 +09:00
Dean Herbert
b460181f15 Add note about rotation not working as expected 2021-04-29 16:16:52 +09:00
Dean Herbert
1516e2ffef Update blueprint implementation in line with #12625. 2021-04-29 16:12:31 +09:00
Dean Herbert
434e63d629 Add skin customisation support to song progress display 2021-04-29 16:12:15 +09:00
Dean Herbert
3c84b0d8c6 Fix selection screen point being wrong since recent refactors 2021-04-29 16:12:15 +09:00
Dean Herbert
de73ac7cec Allow skin editor to be invoked from any context 
This is kind of how I see things working going forward, where the editor
can be applied to anything in the game which supports it (ie. a results
screen, gameplay screen, etc.) and it will immediately allow changing
the interface.

This adds a test scene which shows this working with gameplay.
 2021-04-29 16:12:15 +09:00
Dean Herbert
4f9e1e4945 Check for new components every one second to handle late loaders 2021-04-29 16:12:15 +09:00
Dean Herbert
fd587a82ff Replace abstract class with interface, attached to the actual components (not skinnable wrapper) 2021-04-29 16:12:15 +09:00
Dean Herbert
defa350aa7 Set defaults on SkinnableHUDComponent to cancel out relative size default 
Specifying locally on each HUD component looks to make more sense.
 2021-04-29 16:12:15 +09:00
Dean Herbert
2540d6029c Use AutoSize for SkinnableHudComponents 2021-04-29 16:12:15 +09:00
Dean Herbert
59339aa4fd Add support for x/y position and scale back in 2021-04-29 16:12:15 +09:00
Dean Herbert
1cb8fc9a24 Extract editor classes out of test namespace and add anchor support 2021-04-29 16:12:15 +09:00
Dean Herbert
74fb7cd180 Extract storable attributes to bindables 2021-04-29 16:12:15 +09:00
Dean Herbert
fca173225a Refactor editor selection/blueprint components to be generic 2021-04-29 16:12:14 +09:00
Dean Herbert
2d17219c8f Setup basic test and classes for scale adjustment 2021-04-29 16:12:14 +09:00
Dean Herbert
9c62c90cfc Refactor SelectionBlueprint and MoveSelectionEvent to work in screen-space coordinates 
Until now, the implementation of the overrides in `SelectionBlueprint`
have been confusing to the point where I would just implement by
trial-and-error (or copying from an existing implementation). This was
due to a combination of using "object" space coordinates
(ie. the thing the `Blueprint` is operating on) and screen-space coordinates.

This change switches all event related coordinates to screen-space,
which is how we already handle rotation/scale operations. With the
introduction of other editor types where the related objects are
drawables, this also makes a lot more sense.
 2021-04-29 16:10:42 +09:00
Dean Herbert
5b009c21bb Merge branch 'master' into abstract-blueprint-handling 2021-04-29 16:10:22 +09:00
Dean Herbert
d845f82876 Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-5.0.5' 2021-04-29 14:22:39 +09:00
Dean Herbert
721e7f22da Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.MessagePack-5.0.5' 2021-04-29 14:22:17 +09:00
Dean Herbert
73e029da13 Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-5.0.5' 2021-04-29 14:21:55 +09:00
Dean Herbert
f5435cd2d2 Merge remote-tracking branch 'upstream/dependabot/nuget/Humanizer-2.9.9' 2021-04-29 14:21:51 +09:00
Dean Herbert
20782e69b1 Merge remote-tracking branch 'upstream/dependabot/nuget/NUnit-3.13.2' 2021-04-29 14:21:46 +09:00
Dean Herbert
80fc7ae89d Merge remote-tracking branch 'upstream/dependabot/nuget/Sentry-3.3.4' 2021-04-29 14:20:38 +09:00
dependabot[bot]
1b3b07d6a9
Bump NUnit from 3.13.1 to 3.13.2 
Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.2/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.1...v3.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:51:12 +00:00
dependabot[bot]
1e7feff49d
Bump Humanizer from 2.8.26 to 2.9.9 
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.26 to 2.9.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/main/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.8.26...v2.9.9)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:51:08 +00:00
dependabot[bot]
5b071c68e7
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson 
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:51:04 +00:00
dependabot[bot]
437e9201ba
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack 
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:51:00 +00:00
dependabot[bot]
6c51bf523c
Bump SharpCompress from 0.28.1 to 0.28.2 
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.28.1 to 0.28.2.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.28.1...0.28.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:50:56 +00:00
dependabot[bot]
5720e255c9
Bump Sentry from 3.2.0 to 3.3.4 
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.2.0 to 3.3.4.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.2.0...3.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:50:53 +00:00
dependabot[bot]
921d451047
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.4 to 5.0.5 
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.4...v5.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-29 03:50:49 +00:00
Joseph Madamba
243605728d Fix approved maps not displaying pp column on score table 2021-04-28 11:44:05 -07:00
PercyDan54
4fe1497f63
Add comment & remove lastF 2021-04-28 20:39:06 +08:00
PercyDan54
126056c436
Fix precision loss on exporting legacy replays 2021-04-28 19:27:18 +08:00
Dean Herbert
6cadbd48dc
Merge pull request #12603 from smoogipoo/fix-score-processor-base-score 
Fix bonus-only maps having only 700K base score
 2021-04-28 17:30:58 +09:00
Dean Herbert
859898d98f Refactor lookup methods to avoid linq and reduce TimingPointAt calls 2021-04-28 17:16:05 +09:00
Dean Herbert
c5186b6a69 Revert return values to non-rounded doubles 2021-04-28 16:59:49 +09:00
Dean Herbert
f3c7694eeb Rename methods to match generally how these find-methods are named elsewhere 2021-04-28 16:57:52 +09:00
Dan Balasescu
53d93fecd1
Merge branch 'master' into fix-download-button-import-cancel-state 2021-04-28 16:51:31 +09:00
Dean Herbert
48d6c9ac4b Move snap/divisor helper methods to inside ControlPointInfo 2021-04-28 16:47:30 +09:00
Dean Herbert
74bf4323d1
Merge pull request #12602 from smoogipoo/setting-source-custom-control 
Add support for custom controls to SettingSourceAttribute
 2021-04-28 16:39:17 +09:00
Dean Herbert
05e3a73a7d Fix import cancellation not correctly being forwarded to import notification 2021-04-28 16:09:50 +09:00
Dean Herbert
e0906daebf Change one remaining instance of incorrect terminology in xmldoc 2021-04-28 13:49:41 +09:00
Dean Herbert
4c9e94da2b Move context menu logic to base class 2021-04-28 13:43:16 +09:00
Gagah Pangeran Rosfatiputra
c09067c3d5
add OsuMarkdownTable 2021-04-28 10:53:12 +07:00
Gagah Pangeran Rosfatiputra
2252d308c8
add OsuMarkdownTableCell 
Reference :
d56352aeef/resources/assets/less/bem/osu-md.less (L254-L277)
 2021-04-28 10:53:00 +07:00
Gagah Pangeran Rosfatiputra
736eace00a
add OsuMarkdownQuoteBlock 
Reference:
d56352aeef/resources/assets/less/base.less (L7-L10)
 2021-04-28 10:11:29 +07:00
Dean Herbert
532ec40395 Remove unnecessary newline 2021-04-28 12:04:48 +09:00
Dean Herbert
43772f4303 Remove duplicated call to initially select blueprint 2021-04-28 12:03:41 +09:00
Dean Herbert
e4f2e0131c Rename AllowDeselection to better match use case 2021-04-28 12:02:55 +09:00
Dean Herbert
a9a5809e94 Fix incorrect xmldoc in MoveSelectionEvent 2021-04-28 11:46:52 +09:00
Dean Herbert
d0be8f9fb3 Remove one more out-of-date comment 2021-04-28 11:45:36 +09:00
Dean Herbert
bc455005a5 Fix incorrect coordinate space mention in xmldoc 2021-04-28 11:44:50 +09:00
Dean Herbert
61d4eb1777 Remove unnecessary and out-of-place xmldoc 2021-04-28 11:44:19 +09:00
Dean Herbert
aa1cb65eaa Rename region to be more inclusive 2021-04-28 11:42:22 +09:00
Gagah Pangeran Rosfatiputra
6a921af085
add OsuMarkdownSeparator 
Reference
d56352aeef/resources/assets/less/bem/osu-md.less (L19-L21)
 2021-04-28 09:23:05 +07:00
smoogipoo
05bd6ee50c Add back ctor doc 2021-04-28 03:54:42 +09:00
smoogipoo
04454062b7 Fix up xmldoc 2021-04-28 03:52:59 +09:00
smoogipoo
61b7dc1e06 Fix bonus-only maps having 700K base score 2021-04-28 03:42:29 +09:00
smoogipoo
4e3ee77396 Add support for custom controls to SettingSourceAttribute 2021-04-28 02:51:24 +09:00
Dan Balasescu
5fc731967b
Merge pull request #12592 from ekrctb/fix-entry-lifetime 
Fix Setting DHO's lifetime doesn't update its entry lifetime
 2021-04-28 01:38:19 +09:00
smoogipoo
1281993f1f Fix bonus score not calculated from the correct statistics 2021-04-27 22:42:58 +09:00
Dean Herbert
5dadfd04e7 Update framework 2021-04-27 22:36:25 +09:00
Naxess
200352b750 Rename unsnap check templates 2021-04-27 13:56:05 +02:00
ekrctb
b87446a577 Simplify HitObjectLifetimeEntry logic a bit 2021-04-27 19:37:01 +09:00
Dean Herbert
2adc751e04
Merge pull request #12585 from LumpBloom7/Reset-DHO-Transforms-method 
Add method to safely refresh DrawableHitObject transforms
 2021-04-27 19:15:12 +09:00
Dean Herbert
42255f8d33 Rename and xmldoc selection completed method 2021-04-27 19:01:29 +09:00
Dean Herbert
7ec5ea1eb5 Remove hitobject terminology from base classes 2021-04-27 19:01:29 +09:00
Dean Herbert
ff06a27a12 Revert changes to OnBlueprint methods and handle select-on-addition locally 2021-04-27 19:01:29 +09:00
Dean Herbert
f97b14a20a Fix binding direction of selected items 2021-04-27 19:01:29 +09:00
Dean Herbert
dd3d8e5d03 Make SelectionHandler abstract to ensure things get implemented 2021-04-27 19:01:29 +09:00
Dean Herbert
32416e4e31 Move model selection handling to base SelectionHandler class 2021-04-27 19:01:29 +09:00
Dean Herbert
eac139ca0e Allow BlueprintContainer to perform movement without an ISnapProvider 2021-04-27 19:01:29 +09:00
Dean Herbert
f2e56bd306 Refactor editor selection/blueprint components to be generic 2021-04-27 19:01:29 +09:00
Derrick Timmermans
3ea55314f2
Update osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs 
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2021-04-27 11:29:16 +02:00
Gagah Pangeran Rosfatiputra
6959f2a8cc
add OsuMarkdownFencedCodeBlock 
Reference :
d56352aeef/resources/assets/less/bem/osu-md.less (L41-L45)
 2021-04-27 16:01:32 +07:00
ekrctb
3899e500d3 Adopt framework change of LifetimeEntry 
Override SetLifetimeStart/SetLifetimeEnd separately to track individual assignment. It is necessary to ensure real lifetime is not lost when lifetime is partially updated.
 2021-04-27 17:54:18 +09:00
Gagah Pangeran Rosfatiputra
6cccbabad8
override CreateTextFlow in OsuMarkdownContainer 2021-04-27 14:19:16 +07:00
Gagah Pangeran Rosfatiputra
c686c5224b
add OsuMarkdownTextFlowContainer 2021-04-27 14:17:51 +07:00
Gagah Pangeran Rosfatiputra
aa07482cbb
Add OsuMarkdownLinkText 
Color from
d56352aeef/resources/assets/less/functions.less (L159-L165)
 2021-04-27 14:15:19 +07:00
Gagah Pangeran Rosfatiputra
b75b9a97ed
add OsuMarkdownContainer 
All of the markdown file in osu-wiki have YAML frontmatter. This YAML is
parsed as common markdown paragraph. So we add `UseYamlFrontMatter()` in
markdown pipeline builder to parse YAML as `YamlFrontMatterBlock`.
 2021-04-27 14:09:58 +07:00
ekrctb
c9e6ca5378 Use now-public Entry.SetLifetime method 2021-04-27 15:25:05 +09:00
ekrctb
a2c0951d94 Use overriding instead of hiding in HitObjectLifetimeEntry 
Hidden properties are used when the type is the base class. It caused issues when `DrawableHitObject` logic is factored out to `PoolableDrawableWithLifetime` because it is using the base `LifetimeEntry`, not `HitObjectLifetimeEntry`.
 2021-04-27 15:23:33 +09:00
Dan Balasescu
ea3c5aed2f
Merge pull request #12590 from peppy/editor-minor-refactors 
Fix a couple of inspections in editor code
 2021-04-27 14:09:36 +09:00
Dean Herbert
ec1c336b0a Fix a couple of inspections 2021-04-27 13:23:14 +09:00
Naxess
7a6e9e5070 Change category of unsnap check to timing 
Makes more sense, as this is typically the result of timing changes.
 2021-04-27 02:32:57 +02:00
Naxess
9e49ecb573 Remove unused virtual keywords 
Added these in a previous iteration, where I had the mania variant inherit this class.

No longer necessary as `IHasColumn` was used to make this check more generic.
 2021-04-27 02:23:06 +02:00
Naxess
a3c1b1fd52 Fix accessibility of areConcurrent 2021-04-27 01:24:38 +02:00
Naxess
217ff8238e Add snapping time comment 2021-04-27 01:23:03 +02:00
Naxess
6d5883abcb Return result of local variable instead 2021-04-27 01:19:38 +02:00
Naxess
ce258febf6 Rename CheckUnsnaps -> CheckUnsnappedObjects 
Will potentially have `CheckUnsnappedKiai` or similar later, so this is worth specifying.

Also consistent with `CheckConcurrentObjects`, which will likely have a `CheckConcurrentLines` later.
 2021-04-26 20:32:44 +02:00
Naxess
b9e4f73f78 Add concurrent objects check to BeatmapVerifier 2021-04-26 20:28:59 +02:00
Naxess
a3570e18dd Add concurrent objects check 
Here we use `IHasColumn` to support rulesets with columns, and so I moved that interface out into `osu.Game` from `osu.Game.Rulesets.Mania`.

We also use the same threshold as the unsnap check to ensure that no problems slip through. Specifically where an object is simultaneously not concurrent and not unsnapped but still on the same tick.
 2021-04-26 20:17:18 +02:00
Derrick Timmermans
08a232f7fa
Add method to safely refresh DrawableHitObject transforms 2021-04-26 20:08:40 +02:00
Naxess
9b9c473616 Remove redundant string formatting 2021-04-26 16:17:38 +02:00
Naxess
7b9ed924be Rename snapping methods 
Further separates them from `IBeatSnapProvider`'s `SnapTime`, and groups them together more, to prevent confusion between the two interfaces.

Also changes the xmldoc of the reference time to that of `IBeatSnapProvider` for consistency.
 2021-04-26 16:07:30 +02:00
smoogipoo
630a6dc46a Fix missing dependency 2021-04-26 22:23:44 +09:00
smoogipoo
ed93e26e52 Use single method for starting/restarting spectator screen 2021-04-26 21:56:15 +09:00
smoogipoo
7e11d520d5 Remove finished players from multi spectator screen 2021-04-26 21:25:46 +09:00
smoogipoo
213ac88a8b Fix exported scores not being compatible with osu-stable 2021-04-26 20:52:20 +09:00
smoogipoo
6560dc2d1f Fix exported replays being wrapped in zip packages 2021-04-26 20:46:44 +09:00
smoogipoo
94d0b06493 Expose mute adjustment instead 2021-04-26 19:01:30 +09:00
Dan Balasescu
6d2a5b614c
Merge branch 'master' into drawable-object 2021-04-26 18:33:44 +09:00
smoogipoo
4c5a5c449a Merge branch 'multiplayer-spectator-screen' of https://github.com/smoogipoo/osu into multiplayer-spectator-screen 2021-04-26 17:35:37 +09:00
smoogipoo
d7618b63fa Fix test failure 2021-04-26 17:35:13 +09:00
smoogipoo
6626e70c95 Pass in master clock instead of slave clock 2021-04-26 17:30:27 +09:00
Dean Herbert
120fb8974d Combine more instances of test player IDs 2021-04-26 17:22:16 +09:00
smoogipoo
5b4cb71cc7 Change terminology from "slave" to "player clock" 2021-04-26 17:19:44 +09:00
Dean Herbert
aa99c192d0 Fix type in inline comment 2021-04-26 16:21:12 +09:00
smoogipoo
fd5fbaf0db Rename ruleset wrapper class 2021-04-26 15:37:42 +09:00
Dean Herbert
3b876a43c2
Merge branch 'master' into multiplayer-spectator-screen 2021-04-26 14:12:35 +09:00
Naxess
049e42fa85 Move snapping responsibility to IBeatmap 
Seems `EditorBeatmap` already implements a different kind of `SnapTime` from `IBeatSnapProvider`, so method names here aren't great.

This is very similar to what https://github.com/ppy/osu/pull/12558 is doing, so may need to do some duplicate resolution later, especially surrounding `ClosestBeatSnapDivisor`.

Worth noting that this change makes 1/7, 1/5, etc unsupported for now, as we now rely on `BindableBeatDivisor.VALID_DIVISORS`.
 2021-04-26 05:07:24 +02:00
ekrctb
6561a7c7d6 Rename DrawableObject -> PoolableDrawableWithLifetime 2021-04-26 12:06:21 +09:00
ekrctb
20e3cadd30 freeIfInUse -> free, and add comments 2021-04-26 12:04:59 +09:00
ekrctb
e6474e6ff7 Remove redundant statement (lifetime is set in base) 2021-04-26 11:47:38 +09:00
Justus Franklin Tumacder
8bb1fcd39b Add tests for BeatDivisorFinder 2021-04-26 07:07:32 +08:00
Salman Ahmed
485da47d89 Revert "Inherit VisibilityContainer and make duration constant protected" 
This reverts commit c58ef4230d. Uhh, how did I push this..
 2021-04-26 01:41:42 +03:00
Salman Ahmed
b252485e1a Remove protected expose of HandlingMouse setter 
Regardless of `OnDragEnd()`, `OnMouseUp()` will still be called resetting the value of that state back.
 2021-04-25 20:13:23 +03:00
Salman Ahmed
7390a12e4b SelectionBoxDragHandleDisplay -> SelectionBoxDragHandleContainer 2021-04-25 20:03:15 +03:00
Salman Ahmed
c58ef4230d Inherit VisibilityContainer and make duration constant protected 2021-04-25 20:03:15 +03:00
Salman Ahmed
79e2b232d8
Improve English 
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2021-04-25 19:26:53 +03:00
Bartłomiej Dach
33a5c156a1 Use existing snap list from BindableBeatDivisor 2021-04-25 17:52:11 +02:00
Bartłomiej Dach
e14255f395 Rename {Snap -> BeatDivisor}Finder 2021-04-25 17:44:26 +02:00
Salman Ahmed
a8c460f7df Replace separated top-centered rotation button with rotation drag handles 2021-04-25 10:17:36 +03:00
Salman Ahmed
77f7d4c963 Add composite managing display of selection box drag handles 2021-04-25 10:17:36 +03:00
Salman Ahmed
ab71782674 Use colour fade transform for selection box controls 
To become harminous with the fade transforms of the rotation control
 2021-04-25 10:14:31 +03:00
Salman Ahmed
62bcc5f76d Add property for tracking whether control is during operation 2021-04-25 10:14:31 +03:00
Naxess
6fd77e536d Add unsnap check 2021-04-25 05:34:54 +02:00
Justus Franklin Tumacder
211bff6a8f Fix cake errors 2021-04-25 09:21:25 +08:00
Justus Franklin Tumacder
1f48378ce7 Add xmldoc to SnapFinder 2021-04-25 08:53:45 +08:00
Justus Franklin Tumacder
e0ca44c908 Move SnapFinder from mania ruleset to osu.Game 2021-04-25 07:35:53 +08:00
Joseph Madamba
c9967f7b74 Fix button being recreated on importing state 2021-04-24 08:37:37 -07:00
Joseph Madamba
46c44c576d Fix beatmap info download button content not scaling on mouse down 2021-04-24 08:23:27 -07:00
Bartłomiej Dach
e937b778f6 Fix potential failure in ensureSourceClockSet() 
`ensureSourceClockSet()` was intended to only run when the adjustable
source hasn't been set at all yet. As it turns out permitting it to run
unconditionally can break the state of the underlying interpolated
clock. This is caused by the following factors:

* While the decoupleable clock is running, its `CurrentTime` does not
  come from either the source clock, or the internal stopwatch; it is
  instead calculated using the base `InterpolatingFramedClock` logic.

* A source change of a decoupleable clock seeks the provided source
  clock to the decoupleable's current time.

* When an interpolating clock is seeked (decoupleable clock is also
  an interpolating one), its interpolation state
  (`{Last,Current}InterpolatedTime`) are reset to 0.

* If the interpolating clock determines that its current time is too
  far away from the source's time (which was set when the source is
  changed), it will ignore the source and instead continue to use
  its current time until the source clock has caught up.

Overall, the source change is not really necessary if a source is
already there. The only reason to ensure it was set was to make sure
the first seek of the gameplay clock wasn't performed in decoupled
mode. Therefore, add a guard to make sure the source is only set if
there isn't one already.
 2021-04-24 14:19:39 +02:00
Denrage
59ae5ab913 Added transition in StarRatingDisplay 2021-04-24 13:25:29 +02:00
Bartłomiej Dach
34fa51dee9 Merge branch 'master' into gcc-change-source-on-reset 2021-04-24 13:23:02 +02:00
Dean Herbert
2ae144be8e Update framework 2021-04-24 14:38:00 +09:00
Salman Ahmed
206fc94b8c Add rotation drag handle component 2021-04-24 08:00:36 +03:00
Salman Ahmed
4bfa9cd6b6 Change inheritance of selection box buttons to base control instead 2021-04-24 08:00:29 +03:00
Salman Ahmed
decd8803bc Abstract base appearence and hover update from drag handles 2021-04-24 07:45:53 +03:00
Bartłomiej Dach
fdb5490e51 Attempt to explain source initialisation better 2021-04-23 21:56:08 +02:00
smoogipoo
63a9484255 Expose WaitingOnFrames as mutable bindable 2021-04-23 19:11:47 +09:00
smoogipoo
575ec7c528 Document + refactor max player limitation 2021-04-23 19:11:35 +09:00
smoogipoo
ae2fd2f2e1 Ensure source is set on reset 2021-04-23 18:46:59 +09:00
Denrage
713344ebad Reorganize methods 2021-04-23 10:31:49 +02:00
Dean Herbert
3b77d02752
Merge pull request #12537 from smoogipoo/fix-initial-playingusers 
Fix current match playing users not updated on room join
 2021-04-23 12:00:33 +09:00
Dean Herbert
fbb9cb3f6f Fix broken merge resolution 2021-04-23 11:01:48 +09:00
Dean Herbert
a9a24bd481
Merge branch 'master' into ruleset-switch-sounds 2021-04-23 10:50:41 +09:00
smoogipoo
90ecda91af Fix exception 2021-04-23 00:06:54 +09:00
smoogipoo
4f0857f946 Xmldocs and general refactorings 2021-04-22 23:52:22 +09:00
smoogipoo
ee25949751 Rename classes 2021-04-22 23:39:02 +09:00
smoogipoo
8a0ba3a055 Merge GameplayIsolationContainer into PlayerInstance, remove track 2021-04-22 23:38:51 +09:00
smoogipoo
4aceb75eb2 Disable spectate button on closed rooms 
Doesn't have an effect normally - only for safety purposes in case we
allow entering the match subscreen after a match has finished in the
future.
 2021-04-22 23:37:45 +09:00
smoogipoo
fd0b030cf4 Refactor gameplay screen creation 2021-04-22 23:37:33 +09:00
smoogipoo
f8f9cf9412 Merge branch 'fix-initial-playingusers' into multiplayer-spectator-screen 2021-04-22 23:25:25 +09:00
smoogipoo
f593d9e42c Fix playing users not being updated on room join 2021-04-22 23:23:43 +09:00
smoogipoo
0ee73b8e53 Add failing test 2021-04-22 23:22:44 +09:00
Dean Herbert
b4f492ca4c Update framework 2021-04-22 23:06:46 +09:00
smoogipoo
22a3f3ad3e Revert unnecessary BeatmapManager change 2021-04-22 23:04:54 +09:00
smoogipoo
64579d50ac Use only single PlayerInstance for hit sample playback 2021-04-22 22:59:47 +09:00
smoogipoo
6588859c32 Remove loggings 2021-04-22 22:29:18 +09:00
Dan Balasescu
93b53f54fa
Merge pull request #12531 from peppy/editor-add-nudge-shortcuts 
Add simple key based time nudging support to editor
 2021-04-22 21:14:51 +09:00
Dan Balasescu
50f37ef09c
Merge pull request #12519 from peppy/editor-hit-animation-toggle 
Add editor hit animation toggle
 2021-04-22 20:49:21 +09:00
Dan Balasescu
be8fe47f2c
Merge branch 'master' into editor-add-nudge-shortcuts 2021-04-22 20:38:34 +09:00
smoogipoo
6df23f1301 Merge branch 'master' into multiplayer-spectator-screen 2021-04-22 20:29:24 +09:00
Dean Herbert
891a6a83d2
Merge branch 'master' into ruleset-switch-sounds 2021-04-22 20:17:21 +09:00
Dean Herbert
d20a8694e4 Update resources 2021-04-22 19:55:06 +09:00
Dan Balasescu
739d83da2a
Merge pull request #12515 from frenzibyte/legacy-scores-classic-mod 
Apply "classic" mod to all legacy scores
 2021-04-22 19:52:09 +09:00
Dan Balasescu
b774f5b72b
Merge pull request #12526 from peppy/fix-system-message-ordering 
Fix system messages always being displayed above standard messages
 2021-04-22 18:51:25 +09:00
Dan Balasescu
0e24f2eb59
Merge pull request #12529 from peppy/editor-placement-right-click-delete 
Allow shift+right-click deletion when in placement mode
 2021-04-22 18:50:20 +09:00
Dean Herbert
a5364b224f Add simple key based time nudging support to editor 2021-04-22 18:47:04 +09:00
smoogipoo
d4d78f7434 Merge branch 'master' into legacy-scores-classic-mod 2021-04-22 18:44:20 +09:00
smoogipoo
8a6267580a Fix nullref 2021-04-22 18:44:14 +09:00
Dean Herbert
1884c18a2c Ignore movement operations which have no offset 2021-04-22 18:12:03 +09:00
Dean Herbert
daafa41dc1
Merge branch 'master' into fix-initial-spectator-state-callback 2021-04-22 16:22:04 +09:00
Dean Herbert
68807a90ec
Merge pull request #12448 from smoogipoo/gcc-abstraction 
Make GameplayClockContainer abstract and add MasterGameplayClockContainer
 2021-04-22 16:20:52 +09:00
Dean Herbert
9a7bf8109f Allow certain mouse input to pass through PlacementBlueprints to the selection logic 2021-04-22 15:44:12 +09:00
Dean Herbert
3befb49ea9 Fix system messages always being displayed above standard messages 
Closes https://github.com/ppy/osu/issues/12509.
 2021-04-22 14:52:01 +09:00
Jamie Taylor
21f34be19f Add support for per-ruleset sample playback when switching rulesets (via toolbar) 2021-04-22 14:43:36 +09:00
Dean Herbert
60b702549d Update framework 2021-04-22 14:20:49 +09:00
smoogipoo
1ca2152e61 Privatise + rename to SlaveGameplayClockContainer 2021-04-21 23:22:36 +09:00
smoogipoo
2bea625613 Fix initial playback states not being correct 2021-04-21 23:22:11 +09:00
Denrage
56a69ed956 Codestyle fixes 2021-04-21 15:53:28 +02:00
Denrage
0dfd0bb59d Refactored background of BeatmapInfoWedge 2021-04-21 15:46:11 +02:00
Denrage
d6928e91fd Removed BeatmapInfo in StarRatingDisplay 2021-04-21 15:43:48 +02:00
Denrage
9fba87f67a Moved Info and Background into own container 2021-04-21 15:43:29 +02:00
Denrage
de04caeace Fixed race condition in StarRatingDisplay 2021-04-21 13:53:08 +02:00
Dean Herbert
9d8f0c854d Setup configuration item for editor hit animations 2021-04-21 18:05:40 +09:00
Dean Herbert
c6c91cd9a5 Refactor WaveformOpacityMenuItem to not receive whole config 2021-04-21 18:05:26 +09:00
ekrctb
b877a29737 Factor out pooling and lifetime management logic of DHO to a base class 2021-04-21 17:37:42 +09:00
ekrctb
bbf2ec369b Remove SkinReloadableDrawable inheritance from DHO 2021-04-21 17:34:57 +09:00
Dean Herbert
deeb9e3765 Update framework 2021-04-21 17:27:00 +09:00
smoogipoo
f32d00c0d9 Fix post-merge errors 2021-04-21 17:13:01 +09:00
smoogipoo
e78ef05fcf Merge branch 'gcc-abstraction' into multiplayer-spectator-screen 2021-04-21 17:11:14 +09:00