1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:02:54 +08:00
Commit Graph

39121 Commits

Author SHA1 Message Date
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
Salman Ahmed
b145f46a0a
Merge branch 'master' into skin-components-list 2021-04-30 21:10:55 +03: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
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
Gagah Pangeran Rosfatiputra
3681db491c
add long mixed list test
Copied from https://github.com/ppy/osu-wiki/blob/master/wiki/Tournaments/OWC/2020/en.md#tournament-rules
2021-04-30 11:21:20 +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
4770a64709 Add proof of concept components list 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
1582b0da88
add ordered list test 2021-04-30 10:43:19 +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