1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 01:07:42 +08:00
Commit Graph

24489 Commits

Author SHA1 Message Date
Dean Herbert
4c7a4239f8 Fix AllowGameplayOverlays potentially not working for outro skip overlay 2021-05-04 16:36:07 +09:00
Dean Herbert
b30145de40 Specify explicit primitive type 2021-05-04 16:35:50 +09:00
Dean Herbert
ffc88db47a Implement Duration via the interface 2021-05-04 16:04:59 +09:00
Dean Herbert
bb9fa1a25e
Merge branch 'master' into play-storyboard-outro 2021-05-04 14:01:34 +09:00
Dean Herbert
4f12ae2711 Merge branch 'master' into split-BufferedWedgeInfo 2021-05-04 13:28:42 +09:00
Gagah Pangeran Rosfatiputra
63381ff4f2
change heading font weight
h1 and h2 : Semi Bold (600)
- 376cac43a0/resources/assets/less/bem/osu-md.less (L111)
- 376cac43a0/resources/assets/less/bem/osu-md.less (L135)

The rest of heading : Bold (700)
- 376cac43a0/resources/assets/less/bem/osu-md.less (L97)
2021-05-04 09:34:21 +07:00
Gagah Pangeran Rosfatiputra
bfc328c5ab
change font weight for bold text 2021-05-04 09:09:51 +07:00
Dean Herbert
b28e1569ca Remove no-longer-relevant matching comment 2021-05-03 20:09:50 +09:00
Dean Herbert
fdd0713988 Merge branch 'fix-selection-handler-visibility' into skin-bindables 2021-05-03 17:40:03 +09:00
Dean Herbert
3268a75f05 Remove intermediate container to fix tests 2021-05-03 17:35:56 +09:00
Dean Herbert
839ac968a9 Fix tooltips displaying for hidden SelectionHandler content 2021-05-03 17:28:24 +09:00
Dean Herbert
4cfa858dc4 Fix tooltips displaying for hidden SelectionHandler content 2021-05-03 15:37:15 +09:00
Dean Herbert
15603de6e9 Change scale multiplier to be closer to expectations 2021-05-03 15:25:18 +09:00
Dean Herbert
7d8be8cd83 Add comment about why we are running checkForComponents on a timer 2021-05-03 15:20:00 +09:00
Dean Herbert
a298a93070 Remove redundant storage of blueprint's related item 2021-05-03 15:18:18 +09:00
Dean Herbert
df8609b3dc Move private field for skin editor overlay to where others exist 2021-05-03 15:17:04 +09:00
Dean Herbert
f36684a070 Guard against non-threadsafe transformation logic in ScalingContainer- 2021-05-03 15:17:04 +09:00
Dean Herbert
51f4077b27 Reorder methods in SkinSelectionHandler to follow standards 2021-05-03 15:15:00 +09:00
Dean Herbert
a2faa0b74c Remove dead code 2021-05-03 15:13:53 +09:00
Dean Herbert
01984de9c7 Use existing GetStateFromSelection helper function 2021-05-03 15:13:32 +09:00
Dean Herbert
3dd4b7b746 Fix use of non-existent word in OsuFocusedOverlayContainer xmldoc 2021-05-03 15:08:34 +09:00
Dean Herbert
f3b305bbe6 Rename and improve xmldoc of SkinEditorOverlay 2021-05-03 14:58:25 +09:00
Dean Herbert
8c9cfb6301 Remove unsafe access to Composer.HitObjects 2021-05-03 14:28:35 +09:00
Gagah Pangeran Rosfatiputra
3e7df3bf02
change heading font size
Heading 1 : 30px
- 31579d45aa/resources/assets/less/base.less (L12-L16)

Heading 2 : 26px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L133-L134)
- 31579d45aa/resources/assets/less/variables.less (L169)

Heading 3 : 20px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L147-L148)
- 31579d45aa/resources/assets/less/variables.less (L170)
- 31579d45aa/resources/assets/less/variables.less (L154)

Heading 4 : 18px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L160-L161)
- 31579d45aa/resources/assets/less/variables.less (L171)
- 31579d45aa/resources/assets/less/variables.less (L153)

Heading 5 : 16px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L174-L175)
- 31579d45aa/resources/assets/less/variables.less (L172)
- 31579d45aa/resources/assets/less/variables.less (L152)

Heading 6 : 14px
- 31579d45aa/resources/assets/less/bem/osu-md.less (L183-L184)
- 31579d45aa/resources/assets/less/variables.less (L173)
- 31579d45aa/resources/assets/less/variables.less (L150)
2021-05-03 09:35:59 +07:00
Gagah Pangeran Rosfatiputra
b497785416
add OsuMarkdownHeading 2021-05-03 09:35:55 +07:00
Gagah Pangeran Rosfatiputra
8a2926c0b5
change default font size to 14
Reference :
- 31579d45aa/resources/assets/less/bem/osu-md.less (L9)
- 31579d45aa/resources/assets/less/variables.less (L161)
2021-05-03 09:18:45 +07:00
Salman Ahmed
943c497397 Return back removed using 2021-05-03 02:02:14 +03:00
Salman Ahmed
b2130fc600 Fix replay frames sort instability 2021-05-03 01:58:44 +03:00
Joseph Madamba
cc056088bd Update profile subsections to use counters instead of missing text in line with web 2021-05-02 14:44:20 -07:00
Joseph Madamba
3e74d61dab Add best count from api 2021-05-02 13:33:25 -07:00
Joseph Madamba
59cb5f4679 Get recent count from api instead 2021-05-02 13:33:25 -07:00
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
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
e4f895b490 Fix editor buttons inheriting from TriangleButton when they have no need to 2021-04-30 14:48:37 +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
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