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
bb6f28d76b
Merge pull request #12632 from EVAST9919/barrel-roll
2021-04-30 23:03:56 +02:00
Bartłomiej Dach
9cb55ca245
Merge branch 'master' into barrel-roll
2021-04-30 22:27:27 +02:00
Bartłomiej Dach
0d1a89cb60
Merge pull request #12634 from peppy/remove-unused-triangles
2021-04-30 22:26:29 +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
Dan Balasescu
34a8a75f07
Merge pull request #12588 from Naxesss/basic-compose-checks
...
Add unsnapped and concurrent object checks
2021-05-01 00:20:02 +09: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
872c52b35f
Merge pull request #12625 from peppy/simpler-editor-move-events
...
Refactor `SelectionBlueprint` and `MoveSelectionEvent` to work in screen-space coordinates
2021-04-30 19:37:31 +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
e4f895b490
Fix editor buttons inheriting from TriangleButton when they have no need to
2021-04-30 14:48:37 +09:00
Dean Herbert
cdef07b2ee
Fix blueprints not hiding when deleting elements
2021-04-30 13:09:57 +09: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
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
