h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 14:37:25 +08:00
Code Issues Releases Wiki Activity
23,864 Commits 3 Branches 653 Tags 357 MiB
575b4db186
Commit Graph

15178 Commits

Author SHA1 Message Date
Dean Herbert
3bc4685a46
Merge pull request #6692 from peppy/fix-network-stalls 
Use LongRunningLoad on network load components
 2019-11-06 19:54:30 +09:00
Dean Herbert
70cf91fb40
Seek editor when hit objects are double clicked (#6745) 
Seek editor when hit objects are double clicked
 2019-11-06 19:22:41 +09:00
Dean Herbert
91bcb5d4a7 Merge remote-tracking branch 'upstream/master' into fix-network-stalls 2019-11-06 19:06:28 +09:00
Andrei Zavatski
b35b3484ca Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 12:46:28 +03:00
Andrei Zavatski
4330507da8 Use api.IsLoggedIn 2019-11-06 12:46:25 +03:00
Dean Herbert
46a0fbe561
Share framework file-exclusion function (#6668) 
Share framework file-exclusion function

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-11-06 18:40:22 +09:00
Dean Herbert
a6d000baa2
Fix audio preview muting game audio indefinitely when beatmap p… (#6738) 
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-11-06 18:34:17 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield (#6742) 
Disallow selections to be moved outside of the playfield
 2019-11-06 18:29:06 +09:00
Andrei Zavatski
1f3b209a6c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 12:26:41 +03:00
smoogipoo
3680e7c704 Seek editor when hit objects are double clicked 2019-11-06 18:15:57 +09:00
Dean Herbert
aaa06396f0 Reduce editor parallax 2019-11-06 18:11:56 +09:00
Dean Herbert
ee4839b7e7 Reduce delay on parallax 2019-11-06 18:09:36 +09:00
Dean Herbert
813d3a0bfa
Fix adjustments not being removed correctly on retry from pause (#6728) 
Fix adjustments not being removed correctly on retry from pause
 2019-11-06 17:54:20 +09:00
Dean Herbert
143f316cbe
Merge branch 'master' into fix-network-stalls 2019-11-06 17:54:08 +09:00
Dan Balasescu
402eedce03
Merge branch 'master' into reuse-framework-exclusuion-function 2019-11-06 17:48:26 +09:00
Dan Balasescu
1e52c83804
Merge branch 'master' into fix-preview-not-stopping 2019-11-06 17:47:54 +09:00
Dean Herbert
09e9ef0e4b
Add background colour to music player ProgressBar (#6741) 
Add background colour to music player ProgressBar
 2019-11-06 17:44:08 +09:00
smoogipoo
2c1bfd62ef Disallow selections to be moved outside of the playfield 2019-11-06 17:28:04 +09:00
Dean Herbert
c631a05a44
Add ability to edit individual ControlPoint attributes from tim… (#6638) 
Add ability to edit individual ControlPoint attributes from timing screen
 2019-11-06 17:24:51 +09:00
Dean Herbert
a2963b66f6
Limit distance snap between two adjacent hit objects (#6740) 
Limit distance snap between two adjacent hit objects
 2019-11-06 17:18:00 +09:00
Dan Balasescu
ff6bfc453b
Merge pull request #6718 from peppy/update-framework 
Update framework
 2019-11-06 16:38:15 +09:00
Dean Herbert
23eab68c72 Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2 2019-11-06 16:22:55 +09:00
Ganendra Afrasya
02c21a1379 Make progress bar hoverable 2019-11-06 14:11:47 +07:00
Ganendra Afrasya
d985d04857 Add background colour to music player ProgressBar 2019-11-06 14:07:34 +07:00
Dean Herbert
c1a6cb1def Fix audio preview muting game audio indefinitely when beatmap panel is off-screen 2019-11-06 15:58:47 +09:00
smoogipoo
020b08b450 Initial implementation of limited distance snap 2019-11-06 15:27:48 +09:00
smoogipoo
0b09fb293e Fix background being coloured 2019-11-06 15:16:00 +09:00
Dean Herbert
a3d8738cab
Merge branch 'master' into vote-pill-fix 2019-11-06 14:52:06 +09:00
Dean Herbert
ebfb5d050d Move section update code to abstract method to avoid incorrect BindValue usage 2019-11-06 14:36:43 +09:00
Dean Herbert
4ce3450cfc Move button implementation to OsuButton 2019-11-06 14:08:52 +09:00
smoogipoo
322a1f0a86 Fix potential nullref 2019-11-06 12:45:35 +09:00
smoogipoo
7cd4cb8a93 Rename selectedPoints to selectedGroup 2019-11-06 12:32:12 +09:00
smoogipoo
9dd7f997d2 Reoder SampleSection to match others 2019-11-06 12:17:18 +09:00
smoogipoo
f20bfe7a55 Fix extra semicolon 2019-11-06 12:16:48 +09:00
Dean Herbert
8cf349c1ee Update once more 2019-11-06 12:10:53 +09:00
Dean Herbert
b4ae02cc69 Merge remote-tracking branch 'upstream/master' into update-framework 2019-11-06 12:09:51 +09:00
Dan Balasescu
b5a8bbaa60
Merge branch 'master' into editor-timing-screen 2019-11-06 12:02:00 +09:00
Dean Herbert
cd1dd0f898 Fix adjustments not being removed correctly on retry from pause 2019-11-06 10:38:04 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion (#6679) 
Implement slider control point deletion

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-05 19:15:15 +09:00
Dean Herbert
f0a6fbdeb0
Fix selecting underneath selected blueprints (#6719) 
Fix selecting underneath selected blueprints

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-05 18:48:46 +09:00
Dean Herbert
3b8dc57ad3
Disable input for non-selected blueprints (#6717) 
Disable input for non-selected blueprints
 2019-11-05 18:34:43 +09:00
Dean Herbert
f4b93ec943 Add exception when holding control 2019-11-05 18:29:08 +09:00
Dean Herbert
f77de7d880 Simplify implementation 2019-11-05 18:25:38 +09:00
smoogipoo
0db34a47f8 Fix selecting underneath selected blueprints 2019-11-05 17:28:42 +09:00
Dean Herbert
44d0791676 Update button usage 2019-11-05 16:26:31 +09:00
Dan Balasescu
0758025b6b
Merge branch 'master' into reuse-framework-exclusuion-function 2019-11-05 16:18:16 +09:00
Dean Herbert
fe374eabe0 Update framework 2019-11-05 15:47:01 +09:00
smoogipoo
7c20a589f2 Remove unused usings 2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f Use PlatformAction.Delete instead of Delete key 2019-11-05 13:26:44 +09:00
Dan Balasescu
23ad516348
Merge branch 'master' into game-handles-links 2019-11-05 12:33:32 +09:00
smoogipoo
64d900b387 Disable input for non-selected blueprints 2019-11-05 11:33:37 +09:00
Dean Herbert
eb1ec78b33
Disable retry hotkey overlay when viewing results from leaderbo… (#6702) 
Disable retry hotkey overlay when viewing results from leaderboard
 2019-11-04 12:34:18 +09:00
Bartłomiej Dach
539f8ad6dd Remove overlay when viewing leaderboard scores 
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
 2019-11-04 01:57:31 +01:00
Dean Herbert
1a7b803d4d Change colour to green to match web implementation 2019-11-04 08:39:51 +09:00
Dean Herbert
c71a082ffe
Merge branch 'master' into user-score-highlight 2019-11-04 08:18:18 +09:00
Joehu
fe23b9a262 Fix mod section overflowing mod select overlay at higher ui scale 2019-11-03 07:32:47 -08:00
Dean Herbert
1155aacd90
Update sliders when control points change (#6680) 
Update sliders when control points change
 2019-11-03 19:05:48 +09:00
Dean Herbert
6bc62385b6
Merge branch 'master' into slider-controlpoint-selection 2019-11-03 15:28:50 +09:00
Dean Herbert
fe3583b6ee Move schedule call 2019-11-03 13:16:54 +09:00
Dean Herbert
5127b52c25 Merge remote-tracking branch 'upstream/master' into game-handles-links 2019-11-03 13:04:18 +09:00
Dean Herbert
6dde755ef2
Merge branch 'master' into add-retry-button 2019-11-02 21:23:16 +09:00
Dean Herbert
fd13f0bc55
Move ReplayDownloadButton to correct namespace (#6689) 
Move ReplayDownloadButton to correct namespace
 2019-11-02 21:22:23 +09:00
Dean Herbert
551032803d
Fix GameplayClockContainer operating on beatmap's track after s… (#6688) 
Fix GameplayClockContainer operating on beatmap's track after screen exited
 2019-11-02 21:22:13 +09:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button 2019-11-02 10:51:14 +09:00
Dan Balasescu
5be7d439ae
Add null check for nullable dependency 2019-11-02 10:32:23 +09:00
Ganendra Afrasya
8da15f6897 Fix all score are highlighted on local scope 2019-11-01 23:19:15 +07:00
Ganendra Afrasya
ce3b34a768 Fix UserTopScoreContainer is also tinted 2019-11-01 23:00:55 +07:00
Ganendra Afrasya
d9a91100fb Add tint to user's score container background 2019-11-01 22:47:23 +07:00
Dean Herbert
ddd58ea3da Use LongRunningLoad on network load components 2019-11-01 19:40:45 +09:00
Dan Balasescu
036e67bbc2
Merge pull request #6676 from peppy/fix-multi-logout-crash 
Fix multi logout crash
 2019-11-01 17:13:16 +09:00
Dean Herbert
156d0ae9b9
Remove braces 
Co-Authored-By: Salman Ahmed <email@iisalman.me>
 2019-11-01 16:08:44 +09:00
Dean Herbert
daa0ebe2b5 Add xmldoc 2019-11-01 15:51:45 +09:00
Dean Herbert
14453da1d2 Centralise MakeCurrent call 2019-11-01 15:51:10 +09:00
Dean Herbert
c532f77657 Add hold-to-retry support to results 2019-11-01 15:49:42 +09:00
Dean Herbert
84d17f3702 Add retry button 2019-11-01 15:41:51 +09:00
Dean Herbert
14fec6f1f3 Move ReplayDownloadButton to correct namespace 2019-11-01 15:06:36 +09:00
Dean Herbert
dcc8f6e827 Better group cancel conditional 2019-11-01 14:43:52 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master 2019-11-01 14:15:57 +09:00
Dean Herbert
ac02bb005d Fix GameplayClockContainer operating on beatmap's track after scren exited 2019-11-01 14:11:18 +09:00
Dan Balasescu
9b9366e2d7
Merge branch 'master' into fix-multi-logout-crash 2019-11-01 13:55:28 +09:00
Dean Herbert
7c3dd36add
Fix scrolling hitobjects expiring too soon (#6687) 
Fix scrolling hitobjects expiring too soon
 2019-11-01 13:03:51 +09:00
Dan Balasescu
770726cc95
Merge branch 'master' into fix-multi-logout-crash 2019-11-01 12:46:26 +09:00
smoogipoo
0171b2ae7c Fix scrolling hitobjects expiring too soon 2019-11-01 12:10:03 +09:00
Dean Herbert
f038c579f0 Protect against requests to show overlays before the target overlay is ready 2019-11-01 11:41:00 +09:00
Dean Herbert
898520935e Move link handling code to OsuGame 
This allows for future calls from arguments / associations
 2019-11-01 11:40:51 +09:00
Dan Balasescu
54681a6206
Merge branch 'master' into catch-api-request-exceptions 2019-11-01 11:33:23 +09:00
smoogipoo
41ae66d517 Update slider when control points change 2019-10-31 18:24:38 +09:00
smoogipoo
9f28b1905b Expose composer method to update hitobject 2019-10-31 18:15:19 +09:00
Dean Herbert
ce19b2ed36 Avoid using CreateChildDependencies with a *child* bindable 
Don't do this.
 2019-10-31 17:16:26 +09:00
Dean Herbert
3e3ff81229 Reorder methods 2019-10-31 17:13:00 +09:00
Dean Herbert
4f04abf282 Fix tabs to match design (should not show pinhair line) 2019-10-31 16:54:28 +09:00
smoogipoo
cfdf710676 Add test 2019-10-31 16:51:58 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector 2019-10-31 16:42:32 +09:00
Dean Herbert
bf45fa6309 Use lambda function expression 2019-10-31 16:24:03 +09:00
Dean Herbert
f8187fa301 Don't rely on masking for bar display 2019-10-31 16:23:10 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
Dean Herbert
0cd912fcd3 Cover all non-APIAccess APIRequest calls with exception handling 2019-10-31 15:04:13 +09:00
Dean Herbert
5b405abc52 Schedule forcefullyExit call for safety 
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
 2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6 Ensure forceful exit completely exits from mutliplayer 
Previously it may have gotten blocked by being in a sub screen.
 2019-10-31 13:42:28 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room (#6666) 
Fix crash when quickly exiting multiplayer after joining a room
 2019-10-31 13:15:46 +09:00
Andrei Zavatski
4730453083 Apply suggestions 2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-10-30 23:49:56 +03:00
Huo Yaoyuan
9d4f80c2a2 Add icon and use licence expression for NuGet. 
Unlike framework, if other components are packed, they are likely to use different icons.
 2019-10-30 23:37:58 +08:00
Huo Yaoyuan
3ad0369d7b Resolve new diagnostics in C# 7.3 2019-10-30 23:13:11 +08:00
Huo Yaoyuan
bcf8e3a9d4 Remove redundant properties from desktop projects. 
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
 2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be Normalize .props 2019-10-30 21:54:14 +08:00
Huo Yaoyuan
93fae7ad4d Remove meanless properties. 2019-10-30 21:46:30 +08:00
Dean Herbert
35be8f9dfb Share framework file-exclusion function 2019-10-30 19:34:17 +09:00
Dean Herbert
7b67701e57
Merge branch 'master' into editor-timing-screen 2019-10-30 19:27:24 +09:00
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
Andrei Zavatski
8ad5ccda68 Test steps rearrangement and condition fix 2019-10-30 04:16:14 +03:00
Andrei Zavatski
2c31492bbe Fix comment can be voted if user is null 2019-10-30 03:27:06 +03:00
Andrei Zavatski
1502a6c631 Cleanups 2019-10-30 03:09:14 +03:00
Andrei Zavatski
092d16bb64 Dont use binding to set disabled value 2019-10-29 23:43:16 +03:00
Andrei Zavatski
30d9b21b86 Condition simplification 2019-10-29 21:57:20 +03:00
Andrei Zavatski
e287dae64b Fix VotePill can be activated by the comment sender 2019-10-29 21:25:48 +03: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
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
Dean Herbert
80bf68c108 Add control sections and hook up bindable control groups 2019-10-21 00:06:38 +09:00
Dean Herbert
0fbba9a5e5 Split out more classes 2019-10-20 23:42:13 +09:00
Salman Ahmed
eed6f708a2
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-19 04:06:43 +03: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
Dean Herbert
ffec960b77 Split out classes 2019-10-18 17:59:54 +09:00
Dean Herbert
71d45d41d1 Add basic visualisation of different control point types 2019-10-18 17:57:37 +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
f22ec6f5bd Merge branch 'master' into editor-timing-screen 2019-10-18 16:57:46 +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
smoogipoo
4ae465d782 Merge remote-tracking branch 'smoogipoo/osu-beatsnapping-grid' into beatsnap-grid-integration 2019-10-18 12:38:24 +09:00
Andrei Zavatski
9daafb4636 Simplify hover/unhover logic 2019-10-18 03:06:01 +03:00
Joehu
e5b50b5e1f Fix slider bar regression when using arrows 2019-10-17 13:54:36 -07:00
Andrei Zavatski
22511e41e2 Use received data to set isVoted bindable 2019-10-17 23:20:01 +03:00
Andrei Zavatski
9ee63a8c1a Apply suggested changes 2019-10-17 16:28:32 +03:00
Andrei Zavatski
a858e713f8 Fix multiple spaces 2019-10-17 15:40:09 +03:00
Andrei Zavatski
6b196a6ce7 CI fixes 2019-10-17 15:24:51 +03:00
Andrei Zavatski
42cd4107a0 Implement CommentVoteRequest and adjust UI 2019-10-17 15:04:30 +03:00
Andrei Zavatski
a437ff74cc Move VotePill to it's own file 2019-10-17 14:18:31 +03:00
Andrei Zavatski
d3a8dfd5ff Implement LoadingButton component 2019-10-17 13:57:17 +03:00
Dan Balasescu
bd57c0b58e
Merge branch 'master' into fix-incorrect-beatmap-set-info-equality 2019-10-17 19:51:03 +09:00
Andrei Zavatski
1f28c00594 UI implementation 2019-10-17 13:10:28 +03:00
Andrei Zavatski
38dcd42d08 Parse voted comments 2019-10-17 12:35:12 +03:00
smoogipoo
510ce9345f Fix potential blueprint nullrefs with the new structure 2019-10-17 16:14:28 +09:00
Dean Herbert
f92331531c Rename grid to DistanceSnap to be more in line with its purpose 2019-10-17 15:32:02 +09:00
Dean Herbert
3a6a25ffe8
Merge branch 'master' into non-static-rulesetstore 2019-10-17 14:25:06 +09:00
smoogipoo
f429a8f7c2 Add back/obsolete old AddNested() method 2019-10-17 14:02:08 +09:00
smoogipoo
d8f3678c3c Rename parameter 2019-10-17 12:53:54 +09:00
smoogipoo
9b9138253c Remove finalizer 2019-10-17 11:27:23 +09:00
iiSaLMaN
405ab07800 Check equality by ID -> OnlineBeatmapSetID -> Hash -> ReferenceEquals 2019-10-17 01:18:29 +03:00
smoogipoo
8d7453c251 Rework construction of nested hitobjects 2019-10-16 22:10:50 +09:00
Dan Balasescu
05c6d1a66d
Merge branch 'master' into osu-beatsnapping-grid 2019-10-16 20:12:31 +09:00
smoogipoo
79b2c7b480 Make BeginPlacement() set the hitobject start time 2019-10-16 20:04:15 +09:00
Andrei Zavatski
2dac3a6efe Handle hitting the maximum allowed number of favourited beatmaps 2019-10-16 13:58:29 +03:00
smoogipoo
b6b8098b98 Add an arbitrary offset to prevent div-by-0 2019-10-16 19:44:53 +09:00
smoogipoo
2d4b7dc361 Remove redundant code 2019-10-16 19:33:18 +09:00
smoogipoo
5ac5e34f85 Use a cleaner distance function 2019-10-16 19:32:45 +09:00
Dean Herbert
4f356f3aeb
Merge branch 'master' into favourite-beatmap 2019-10-16 18:22:09 +09:00
smoogipoo
350d139cbf Make chevron icon colour protected 2019-10-16 15:54:00 +09:00
Joehu
649951198e Make most textbox carets movable 2019-10-15 14:47:48 -07:00
iiSaLMaN
14c72f85fa Fix incorrect beatmap set info equality check on non-online set info 2019-10-15 23:40:48 +03:00
iiSaLMaN
60133ba0c3 Propagate BeatmapSetInfo to tab items with bindable 2019-10-15 23:33:50 +03:00
Andrei Zavatski
2543de22bd Simplify DeletedChildrenPlaceholder behavior 2019-10-15 12:47:35 +03:00
Andrei Zavatski
7ba15df0c0 Convert to method group 2019-10-15 12:27:32 +03:00
Andrei Zavatski
d321794ef5 Make loadedTopLevelComments a local filed 2019-10-15 12:26:16 +03:00