Dean Herbert
b52be3d639
Merge branch 'control-point-grouping' into no-auto-gen
2019-10-26 01:20:08 +09:00
Dean Herbert
d25f7f4c27
Correctly clear other lists
2019-10-26 01:19:23 +09:00
Dean Herbert
c031aeb14c
Fix inspection
2019-10-26 00:06:05 +09:00
Dean Herbert
eefa411182
Merge branch 'control-point-grouping' into no-auto-gen
2019-10-25 23:15:25 +09:00
Dean Herbert
d4fed43be7
Merge branch 'equivalent-to' into control-point-grouping
2019-10-25 23:15:15 +09:00
Dean Herbert
e39016bf01
Fix known non-nulls
2019-10-25 20:04:27 +09:00
Dean Herbert
8baf569f59
Remove necessity of AutoGenerated flag
2019-10-25 19:58:42 +09:00
Dean Herbert
e987db37ec
Add grouping of ControlPoints
2019-10-25 19:52:02 +09:00
Dean Herbert
e2f2638212
Replace local Equatable implementations with abstract EquivalentTo
2019-10-25 19:44:28 +09:00
Dan Balasescu
c2f6cd9c24
Merge branch 'master' into comments-vote-pill
2019-10-25 19:19:44 +09:00
Dan Balasescu
c9505f89dd
Merge branch 'master' into markdown-inline-links
2019-10-25 18:52:11 +09:00
Dan Balasescu
3692846367
Merge branch 'master' into snapping-refactor
2019-10-25 18:26:14 +09:00
smoogipoo
ae011e8ee8
Fix distance snap grid test scenes
2019-10-25 17:25:46 +09:00
smoogipoo
4ca6a5a0cc
Interface the distance snap provider
2019-10-25 16:50:21 +09:00
smoogipoo
607b4d874a
Refactor flow of snapping through HitObjectComposer
2019-10-25 16:40:30 +09:00
Dean Herbert
e5b5d286fd
Increase spacing to closer match the design
2019-10-25 12:48:34 +09:00
Dean Herbert
07f7944fc6
Fix DateTime display sizing on results screen
2019-10-25 12:22:19 +09:00
Bartłomiej Dach
661dfbefaf
Change containment check to overlap
...
Due to scenarios wherein a formatted link ended up as part of a larger
raw link after parsing, change the containment check to an overlap check
and add appropriate tests for these edge cases.
2019-10-25 00:42:58 +02:00
Andrei Zavatski
85769982a0
Refactor LoadingButton
2019-10-24 17:49:34 +03:00
Andrei Zavatski
4f79ac8095
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill
2019-10-24 17:38:50 +03:00
Dean Herbert
0b3c7f28af
Merge branch 'master' into fix-dragbox-first-frame
2019-10-24 23:01:32 +09:00
Dean Herbert
fa3350ce2d
Refactor blueprint movement and selection events ( #6588 )
...
Refactor blueprint movement and selection events
2019-10-24 22:58:03 +09:00
Bartłomiej Dach
cbd99cc767
Resolve link-in-link edge case
...
Testing with #6542 surfaced a crash scenario, caused by formatted links
that had URLs in the display text, for example
[mean example - https://osu.ppy.sh ](https://osu.ppy.sh )
In that case the outer Markdown link would get picked up once, and then
reduced to the link text when looking for other links, leading to it
being picked up again the second time when the raw link is found.
Add a check in the raw link parsing path that ensures that the found
URL is not a part of a bigger, pre-existing link.
2019-10-24 15:52:55 +02:00
Bartłomiej Dach
24b7160522
Add support for parsing Markdown inline links
...
Extend the Markdown parsing regex to allow parsing so-called inline
links. Within the parenthesis () part of the Markdown URL syntax,
introduce a new capturing group:
(
\s+ // whitespace between actual URL and inline title
(?<title> // start of "title" named group
"" // opening double quote (doubled inside @ string)
(
[^""] // any character but a double quote
| // or
(?<=\\) // the next character should be preceded by a \
"" // a double quote
)* // zero or more times
"" // closing double quote
)
)? // the whole group is optional
This allows for parsing the inline links as-provided by web. Correctness
is displayed by the passing tests.
2019-10-24 15:52:55 +02:00
smoogipoo
a969914d6e
Mention coordinate space
2019-10-24 18:24:22 +09:00
smoogipoo
d83b9ef0e4
Rename grid snapping methods
2019-10-24 18:18:04 +09:00
smoogipoo
f45f17339c
Implement slider path distance snapping
2019-10-24 18:17:30 +09:00
smoogipoo
7a71352684
Fix drag box being positioned incorrectly for 1 frame
2019-10-24 17:22:14 +09:00
smoogipoo
fb88001c0e
Reorder blueprint addition/removal + add regions
2019-10-24 16:53:34 +09:00
smoogipoo
45bd91f63f
Add special cases for click-selection
2019-10-24 16:14:29 +09:00
smoogipoo
8e4a21bee7
Separate out mouse down/click/up handling
2019-10-24 15:58:22 +09:00
smoogipoo
a07e5a269b
Extract drag events into multiple methods
2019-10-24 15:33:08 +09:00
smoogipoo
f128e99fb2
Remove unused methods
2019-10-24 15:07:04 +09:00
smoogipoo
e04c77178c
Move selection events to BlueprintContainer
2019-10-24 14:58:02 +09:00
smoogipoo
714c89faa4
Move selection drag events to BlueprintContainer
2019-10-24 14:57:58 +09:00
Andrei Zavatski
b310fd9d44
Adjust naming inside the LoadingButton
2019-10-23 13:39:42 +03:00
Andrei Zavatski
a6d5a2024a
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill
2019-10-23 13:27:45 +03:00
smoogipoo
cef2318cf5
Move drag box drag handling to BlueprintContainer
2019-10-23 18:38:06 +09:00
Dean Herbert
fa9690d16c
Merge pull request #6582 from smoogipoo/grid-centre
...
Show centre point of distance snap grid
2019-10-23 18:28:05 +09:00
Dean Herbert
f61d7e4fbe
Add smoothing and tidy code a touch
2019-10-23 17:56:09 +09:00
smoogipoo
c03fa01fd9
Remove unnecessary set
2019-10-23 17:51:16 +09:00
smoogipoo
2c9b11cdfd
Move variable outside of if block
2019-10-23 17:49:21 +09:00
smoogipoo
c9fec50f63
Remove unnecessary whitespace
2019-10-23 17:00:17 +09:00
smoogipoo
97383b4a37
Show centre point of distance snap grid
2019-10-23 16:58:56 +09:00
smoogipoo
64682611bb
Fix distance snapping grid not updating on scroll
2019-10-23 16:39:14 +09:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill
2019-10-23 15:41:54 +09:00
Dean Herbert
e836364add
Update framework
2019-10-23 15:13:52 +09:00
Dean Herbert
21e0bd2a5a
Merge branch 'fix-wave-container' into apply-framework-fixes
2019-10-23 15:13:41 +09:00
smoogipoo
851773a842
Apply adjustments for framework changes
2019-10-23 14:04:06 +09:00
Joehu
7b7a87afa8
Put back mobile conditional
2019-10-22 19:51:29 -07:00
Joehu
8154cc1b16
Fix registration textboxes always focusing after pressing escape
2019-10-22 14:40:56 -07:00
Dean Herbert
c3375071ad
Fix formatting issue
2019-10-23 00:26:47 +09:00
Dean Herbert
e9aa7f3218
Subclass and use yellow for stand-alone chat display
2019-10-23 00:24:19 +09:00
Dean Herbert
3b4823abe7
Use foreach
2019-10-23 00:17:37 +09:00
Dean Herbert
0ba287a7fd
Rename variable
2019-10-23 00:14:22 +09:00
Dean Herbert
7084aa7b81
Merge branch 'master' into chat-day-separator
2019-10-22 15:48:42 +09:00
Dean Herbert
001eae2c02
Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable
2019-10-22 15:04:16 +09:00
Dean Herbert
5d0d83b6bf
Add basic xmldoc
2019-10-22 15:04:10 +09:00
Andrei Zavatski
09b2f11bd5
Remove unused variable
2019-10-22 03:14:20 +03:00
Andrei Zavatski
b1eac6b400
Apply suggested changes
2019-10-22 03:11:19 +03:00
Andrei Zavatski
e9ae838f46
CI fixes
2019-10-22 02:16:52 +03:00
Joehu
f7924d3bad
Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox"
2019-10-21 16:00:09 -07:00
Andrei Zavatski
2896ed90e2
Fix incorrect date comparison
2019-10-22 01:55:26 +03:00
Andrei Zavatski
bb7af1e39c
Fix some margin/padding issues
2019-10-22 01:45:04 +03:00
Andrei Zavatski
d19041fa53
Implement DaySeparator class
2019-10-22 01:30:37 +03:00
Andrei Zavatski
75f444e431
Basic implementation
2019-10-22 00:44:58 +03:00
Dean Herbert
0bf35faae8
Update incorrect reference
2019-10-21 19:25:56 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration
2019-10-21 18:44:34 +09:00
Dean Herbert
ed8b8e3ad0
Merge pull request #6557 from smoogipoo/fix-hitcircle-selection-size
...
Fix hitcircle selection area being too large
2019-10-21 18:43:48 +09:00
Dean Herbert
9f004186d5
Ensure DrawableHitObject's HitObject is not null
2019-10-21 17:56:39 +09:00
Dean Herbert
fa95422755
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:53:25 +09:00
Dean Herbert
c8f4e8b52c
Update framework
2019-10-21 17:24:32 +09:00
Dean Herbert
b157aaead1
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
smoogipoo
fc7e4680a7
Split on multiple lines
2019-10-21 14:08:28 +09:00
smoogipoo
74b6e691d8
Remove unnecessary schedule
2019-10-21 14:01:52 +09:00
smoogipoo
dc222b5e4d
Add common path for duplicated code
2019-10-21 13:52:55 +09:00
Andrei Zavatski
266f9a065f
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill
2019-10-18 19:25:05 +03:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
smoogipoo
190a83da6e
Refresh the grid after a placement
2019-10-18 19:04:08 +09:00
Dean Herbert
07286c0cfc
Fix editor's clock not being processed unless composer is loaded
2019-10-18 18:21:53 +09:00
smoogipoo
31313ec9e1
Fix potential nullref
2019-10-18 17:56:31 +09:00
Dean Herbert
b391b8542d
Merge pull request #6537 from smoogipoo/fix-hitcircle-accent
...
Fix hitobject combo colour potentially not getting adjusted
2019-10-18 17:55:59 +09:00
smoogipoo
89f50b26f7
Fix hitobject combo colour potentially not getting adjusted
2019-10-18 17:32:11 +09:00
Dean Herbert
6b0976ff1e
Remove a weird unicode charcter from file
2019-10-18 16:55:42 +09:00
Dean Herbert
99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
...
Implement osu!'s beat snapping grid
2019-10-18 16:27:03 +09:00
Dean Herbert
50d4a9d726
Merge pull request #6534 from smoogipoo/placement-blueprint-starttime
...
Make BeginPlacement() set the hitobject start time
2019-10-18 16:25:38 +09:00
Dean Herbert
b30c84778f
Update WaveContainer to support framework changes
2019-10-18 16:13:01 +09:00
smoogipoo
f1d7e7e7f6
Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration
2019-10-18 13:49:09 +09:00
smoogipoo
463079e148
Implement placement snapping
2019-10-18 13:48:59 +09:00
smoogipoo
5d3d25d3b6
Make method private for now
2019-10-18 13:24:28 +09:00
smoogipoo
cb301a4661
Improve performance of intra-frame updates/deletions
2019-10-18 13:18:57 +09:00
smoogipoo
9a896d52bf
Fix nested hitobjects not updating
2019-10-18 13:18:41 +09:00
smoogipoo
b047e05d86
Fix bad variable names
2019-10-18 13:18:16 +09:00
smoogipoo
ba4402207a
Implement selection time snapping
2019-10-18 12:53:38 +09:00
smoogipoo
1dc7c59853
Implement selection position snapping
2019-10-18 12:53:27 +09:00
smoogipoo
c4704f6a29
Add beat snap grid to the composer
2019-10-18 12:47:52 +09:00
smoogipoo
d3e38f5e5a
Make the editor beatmap protected
2019-10-18 12:40:31 +09:00
smoogipoo
bc76a9cb8c
Expose selection changed event from BlueprintContainer
2019-10-18 12:40:27 +09:00
smoogipoo
c5ee533524
Merge branch 'dho-apply' into beatsnap-grid-integration
2019-10-18 12:38:29 +09:00
