h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 19:43:31 +08:00
Code Issues Releases Wiki Activity
23,335 Commits 3 Branches 653 Tags 359 MiB
9a00898c0d
Commit Graph

14818 Commits

Author SHA1 Message Date
Dean Herbert
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
Dean Herbert
5899bbd8a6 Fix merge regressions 2019-10-30 18:45:50 +09:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen 2019-10-30 18:42:20 +09:00
smoogipoo
cf2d885099 Fix control points being flushed too late 2019-10-30 18:02:18 +09:00
smoogipoo
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Dan Balasescu
3045ba4bf4
Merge branch 'master' into bindable-control-point-properties 2019-10-30 16:02:39 +09:00
Dan Balasescu
ced6042b3e
Use internal type name 2019-10-30 15:51:09 +09:00
smoogipoo
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events (#6636) 
Make OsuButton correctly block hover events
 2019-10-30 12:38:16 +09:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement 2019-10-30 12:10:52 +09:00
Ganendra Afrasya
5c2917d303 Place sign in button inside ShakeContainer 2019-10-30 00:50:04 +07:00
Dean Herbert
04b0916196
Merge branch 'master' into fix-day-separator-purging 2019-10-29 18:44:39 +09:00
Dean Herbert
f4c4523034 Merge branch 'update-framework' into fix-chat-scroll-to-bottom 2019-10-29 18:17:41 +09:00
Dean Herbert
342dfc26d2 Merge remote-tracking branch 'upstream/master' into fix-chat-scroll-to-bottom 2019-10-29 18:17:38 +09:00
Dean Herbert
3f192ca915
Fix song progress not displaying correctly (#6640) 
Fix song progress not displaying correctly

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-10-29 18:16:54 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default (#6641) 
Fix PlayerSettingsOverlay being shown by default
 2019-10-29 18:16:33 +09:00
Dean Herbert
89d3f461e0
Fix download tracking components getting stuck on import failur… (#6639) 
Fix download tracking components getting stuck on import failures
 2019-10-29 18:16:23 +09:00
Dan Balasescu
f4ae65c3e8
Merge branch 'master' into fix-song-progress-display 2019-10-29 18:06:58 +09:00
Dean Herbert
97c1a6e86b Update framework 2019-10-29 18:05:32 +09:00
Dan Balasescu
f0f58c22d3
Merge branch 'master' into labelled-component-bindables 2019-10-29 16:32:57 +09:00
Dean Herbert
54befb6f8f Remove adjacent day separators 2019-10-29 15:45:41 +09:00
Dean Herbert
b06e70e546 Add failing test showing issue with day separator logic 2019-10-29 15:27:08 +09:00
Dean Herbert
09a6d1184a Tidy up order of scroll changes 2019-10-29 14:33:05 +09:00
Dean Herbert
d1c6e3f620 Add test for scroll to end when max history is exceeded 2019-10-29 14:32:52 +09:00
Dan Balasescu
c25a243d5b
Merge branch 'master' into fix-triangles-performance 2019-10-29 13:31:33 +09:00
Dean Herbert
e93e9067a1
Fix beatmap carousel sorting instability (#6630) 
Fix beatmap carousel sorting instability
 2019-10-29 01:19:42 +09:00
Dean Herbert
a4a57eec54 Fix game-wide performance drop when triangles intro is used 2019-10-29 01:09:49 +09:00
Bartłomiej Dach
c181edaedf Replace manual comparer implementation 
Replace manually-implemented CriteriaComparer with a call to
Comparer<T>.Create() to decrease verbosity.
 2019-10-28 15:07:36 +01:00
nwabear
21f59ac73a
Merge branch 'master' into master 2019-10-28 08:57:35 -05:00
Dean Herbert
1a4817879e Fix precision changes in legacy control point types 2019-10-28 19:10:39 +09:00
Dean Herbert
46b44f4f99 Fix PlayerSettingsOverlay being shown by default 2019-10-28 18:37:58 +09:00
Dean Herbert
16e33e8bc7 Fix song progress not displaying correctly 2019-10-28 18:34:58 +09:00
Dean Herbert
cf3ed42bfc Fix download tracking components getting stuck on import failures 2019-10-28 17:41:42 +09:00
Dean Herbert
f4668b0d59 Merge branch 'bindable-control-point-properties' into editor-timing-screen-2 2019-10-28 16:25:15 +09:00
Dean Herbert
08040adfad Expose Current bindable in LabelledComponents 
Adds a `LabelledDrawable` class for usages where bindables are not present.
 2019-10-28 16:24:28 +09:00
Dean Herbert
6980f488dc Make OsuButton correctly block hover events 2019-10-28 16:24:07 +09:00
Dean Herbert
090881cf6f Add default bindable values 2019-10-28 16:23:43 +09:00
Dean Herbert
8f87957c70 Make all control point attributes bindable 
Properties are left intact for compatibility reasons.
 2019-10-28 16:23:43 +09:00
Dean Herbert
522572eace Add ability to adjust all control point attributes 2019-10-28 16:21:31 +09:00
Dean Herbert
f761eddec7 Add default bindable values 2019-10-28 16:21:14 +09:00
Dean Herbert
9c3e54909c Ensure tooltips of RowAttributes are up-to-date 2019-10-28 16:20:54 +09:00
Dean Herbert
0a11cbf656 Make OsuButton correctly block hover events 2019-10-28 16:20:33 +09:00
Dean Herbert
d33b31f0c5 Expose Current bindable in LabelledComponents 
Adds a `LabelledDrawable` class for usages where bindables are not present.
 2019-10-28 15:33:08 +09:00
Dean Herbert
490f87cad3 Merge branch 'bindable-control-point-properties' into editor-timing-screen-2 2019-10-28 14:46:38 +09:00
Dean Herbert
9acdcc9129 Make all control point attributes bindable 
Properties are left intact for compatibility reasons.
 2019-10-28 14:44:45 +09:00
Dean Herbert
ee5591d7d5 Add missing license headers 2019-10-28 12:42:17 +09:00
Dean Herbert
43ad4a3a3c Tidy up string output 2019-10-28 12:31:38 +09:00
Dean Herbert
66b0004448 Remove unused logger provider class 2019-10-28 12:02:58 +09:00
Dean Herbert
1953aa64b6 Merge branch 'bindable-control-points' into editor-timing-screen 2019-10-28 12:00:51 +09:00
Dean Herbert
8069674824 Merge remote-tracking branch 'upstream/master' into bindable-control-points 2019-10-28 11:52:04 +09:00
Dean Herbert
45da22afe9 Add xmldoc and combine GroupAt / CreateGroup 2019-10-28 11:40:33 +09:00
Dean Herbert
2a6b3fd67c Disallow inserting a group if one already exists with the current time value 2019-10-28 11:40:10 +09:00
Dean Herbert
59d983b66e Allow binding to ControlPointInfo's Groups 2019-10-28 11:39:53 +09:00
Dean Herbert
10033239c7 Allow binding to ControlPointGroup's ControlPoints 2019-10-28 11:39:17 +09:00
Dean Herbert
29e20bc8d2 Add xmldoc and combine GroupAt / CreateGroup 2019-10-28 10:45:11 +09:00
Bartłomiej Dach
c8d3dd0e5a Make carousel item sorting stable 
Migrate beatmap carousel item sorting from List<T>.Sort()
to IEnumerable<T>.OrderBy(), as the second variant is documented to be
a stable sorting algorithm. This allows for eliminating unnecessary
movement of carousel items occurring whenever any set of items is tied
when changing sorting criteria.
 2019-10-27 23:14:14 +01:00
Dean Herbert
0179586f78 Disallow inserting a group if one already exists with the current time value 2019-10-27 16:31:23 +09:00
Dean Herbert
81b5d7b79f Select another group after deleting selected 2019-10-27 16:30:05 +09:00
Dean Herbert
73369ae613 Add the ability to add/remove groups 2019-10-27 16:13:24 +09:00
Dean Herbert
0fba272e78 Add the ability to add new ControlPoint types to existing groups 2019-10-27 15:19:36 +09:00
Dean Herbert
de69665a46 Reduce horizontal spacing of attributes 2019-10-27 14:17:59 +09:00
Dean Herbert
93b003eb5a Add selected row state 2019-10-27 13:31:23 +09:00
Dean Herbert
acc0251124 Merge branch 'no-auto-gen' into editor-timing-screen 2019-10-27 12:36:21 +09:00
nwabear
dc672b2b4c
Merge branch 'master' into master 2019-10-26 22:19:47 -05:00
Dan Balasescu
676460019d
Merge branch 'master' into equivalent-to 2019-10-27 11:51:05 +09:00
Dean Herbert
814b520e5e Avoid potential mis-cast in comparison 2019-10-27 11:35:45 +09:00
nwabear
e35931fdfc removed blank line 2019-10-26 14:33:59 -05:00
nwabear
349a2745c5 Merge remote-tracking branch 'origin/master' 2019-10-26 14:30:17 -05:00
nwabear
9e2e87c8d1 added visual tests 
added small commenting
added xmldoc for CancelResume();
 2019-10-26 14:29:52 -05:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor 2019-10-26 14:20:08 +09:00
Dean Herbert
4290a71f44 Add special case for timing points 
Timing points can't fallback to defaults and must be added at least once.
 2019-10-26 11:38:05 +09:00
Dean Herbert
51008cd215 Merge branch 'no-auto-gen' into editor-timing-screen 2019-10-26 11:20:17 +09:00
Dean Herbert
8ccff0e9cf temp 2019-10-26 11:20:07 +09:00
Dean Herbert
7502b64541 Merge branch 'control-point-grouping' into no-auto-gen 2019-10-26 10:35:34 +09:00
Dean Herbert
d6a49b9e93 Add back autogeneration rules 
Will be removed in https://github.com/ppy/osu/pull/6604
 2019-10-26 10:25:37 +09:00
Dean Herbert
7100319858 Fix incorrect control point retrieval in non-lookup cases 2019-10-26 08:31:41 +09:00
nwabear
f8354eefc4 Added null check in the CancelResume method 2019-10-25 16:49:18 -05:00
nwabear
b0e21c2749 Fixed Issue #6442 2019-10-25 14:57:49 -05:00
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
5e553cb96d Merge branch 'no-auto-gen' into editor-timing-screen 2019-10-25 23:15:43 +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
b8efc59cdc Update UI components to use new grouping 2019-10-25 20:13:22 +09:00
Dean Herbert
e39016bf01 Fix known non-nulls 2019-10-25 20:04:27 +09:00
Dean Herbert
32242f22de Merge branch 'no-auto-gen' into editor-timing-screen 2019-10-25 20:02:40 +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
Dean Herbert
da6769f0fc Remove necessity of AutoGenerated flag 2019-10-25 19:43:38 +09:00
Dean Herbert
94ffe03e6e Group timing points 2019-10-25 19:36:12 +09:00
Dean Herbert
e38b7cb169 Replace local Equatable implementations with abstract EquivalentTo 2019-10-25 19:34:38 +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
351f8d3dd1 Merge branch 'master' into editor-timing-screen 2019-10-25 13:21:56 +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
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
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
5e22eed131 Add add/remove buttons 2019-10-22 21:50:21 +09:00
Dean Herbert
4883844c4c Add basic information display for all types of control points 2019-10-22 20:57:56 +09:00
Dean Herbert
81e8b678d3 Update editor time when a new timing point is selected 2019-10-22 20:17:19 +09:00
Dean Herbert
25601ac17c Merge branch 'master' into editor-timing-screen 2019-10-22 18:01:53 +09:00
Dean Herbert
7084aa7b81
Merge branch 'master' into chat-day-separator 2019-10-22 15:48:42 +09:00