h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 14:23:20 +08:00
Code Issues Releases Wiki Activity
23,558 Commits 3 Branches 661 Tags 357 MiB
2d3fadc1a8
Commit Graph

23558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
58f19217f7
Fix drag box being incorrectly positioned for 1 frame (#6589) 
Fix drag box being incorrectly positioned for 1 frame

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-24 23:16:54 +09: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
Bartłomiej Dach
a89ea78a7a Add extended testing for Markdown links 
While reviewing #6542 it became apparent that there was another Markdown
link format variant, used in comments that came from the web API, called
the "inline link" style. It allows to specify the tooltip title within
the actual URL portion, as such:

    [link text](https://osu.ppy.sh "tooltip text")

Add tests with a couple of easy and trickier examples of such a format.
Moreover, add a new edge case of a Markdown link with a link inside
the display text, which during tests was detected to be problematic.
 2019-10-24 15:52:55 +02:00
smoogipoo
a6458fdeab Re-use slider type 2019-10-24 19:04:24 +09:00
smoogipoo
b7af4acdbf Allow not having a composer 2019-10-24 19:04:00 +09:00
smoogipoo
0af5706db6 Snap path during control point movement 2019-10-24 19:02:59 +09: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
Dean Herbert
ef4dd3e028
Merge pull request #6580 from smoogipoo/remove-controlpoint-snap 
Don't snap slider control point placement
 2019-10-24 10:27:16 +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
8250e94ad8
Merge pull request #6581 from smoogipoo/fix-grid-update 
Fix distance snapping grid not updating on scroll
 2019-10-23 18:20:15 +09:00
smoogipoo
436941cda3 Add comment 2019-10-23 17:58:44 +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
Dean Herbert
02efd0e943
Merge pull request #6556 from smoogipoo/fix-slider-stack-change 
Fix sliders not moving with stacking changes
 2019-10-23 17:48:06 +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
smoogipoo
b903edca45 Don't snap slider control point placement 2019-10-23 16:03:16 +09:00
smoogipoo
54f23cbd0d Update stacking test case values 2019-10-23 15:49:36 +09:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill 2019-10-23 15:41:54 +09:00
Dean Herbert
1c6a775338
Merge pull request #6575 from smoogipoo/apply-framework-fixes 
Apply adjustments for framework changes
 2019-10-23 15:33:41 +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
Dean Herbert
75beba66d5
Merge pull request #6574 from Joehuu/fix-registration-textbox-focus 
Fix registration textboxes always focusing after pressing escape
 2019-10-23 12:18:08 +09:00
Joehu
7b7a87afa8 Put back mobile conditional 2019-10-22 19:51:29 -07:00
Dean Herbert
c06f142433 Fix some spacing and references 2019-10-23 11:22:55 +09:00
Dean Herbert
6866d27634 Merge remote-tracking branch 'upstream/master' into editor-timing-screen 2019-10-23 11:18:42 +09:00
Joehu
8154cc1b16 Fix registration textboxes always focusing after pressing escape 2019-10-22 14:40:56 -07:00
Dean Herbert
e7290c433b
Implement day divider for chat (#6569) 
Implement day divider for chat

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-23 01:06:46 +09:00
Dean Herbert
c3375071ad Fix formatting issue 2019-10-23 00:26:47 +09:00