RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 08:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,700 Commits 6 Branches 666 Tags 362 MiB
1516e2ffef
Commit Graph

38700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
74c6fdc4b8 Add DrawableRuleset to the skin editor test to get a hit error meter to display 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
99b428ee4b Add very basic skin editor test 2021-04-29 16:12:14 +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
Dean Herbert
2e277255e5
Merge pull request #12614 from ppy/dependabot/add-v2-config-file 
Upgrade to GitHub-native Dependabot
 2021-04-29 12:50:19 +09:00
dependabot-preview[bot]
6d7eef3f5a
Upgrade to GitHub-native Dependabot 2021-04-28 16:45:57 +00: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
71e44a0841
Merge pull request #12609 from peppy/fix-download-button-import-cancel-state 
Fix import cancellation not correctly being forwarded to import notification
 2021-04-28 17:28:59 +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
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
e71dbfd730 Add inline comment regarding remaining issues with classic scoring 2021-04-28 16:37:48 +09:00
Dean Herbert
8598a0968f
Update calculations in comments to match new logic 
Mostly look to be errors that existed before this PR.

Co-authored-by: Endrik <enduslittlecomputer@gmail.com>
 2021-04-28 16:29:23 +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
ac1534cda2 Add test covering existing button actually changing to LocallyAvailable state 2021-04-28 15:54:40 +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
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