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

14818 Commits

Author SHA1 Message Date
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
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
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
Andrei Zavatski
96e31b9cca Add support for deleted comments with message 2019-10-15 12:07:01 +03:00
Andrei Zavatski
213f00556d Remove onShowDeletedChanged function 2019-10-15 11:30:50 +03:00
Andrei Zavatski
b2885e7b13 Move load() under the ctor 2019-10-15 11:26:58 +03:00
Andrei Zavatski
eb5dad08aa Remove initial filed 2019-10-15 11:25:58 +03:00
Andrei Zavatski
3c714dc013 APICommentsController -> CommentBundle 2019-10-15 11:20:06 +03:00
Andrei Zavatski
75a2e383f2 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-15 11:19:45 +03:00
smoogipoo
96c6aeefe9 Remove out-of-date todo 2019-10-15 16:16:33 +09:00
smoogipoo
12cd57744b Make RulestStore initialise at construction time 2019-10-15 16:14:06 +09:00
Joehu
efc201ec85 Make PlaylistOverlay a VisibilityContainer 2019-10-14 16:40:53 -07:00
Joehu
ccc753a315 Make OverlayContainers with no blocking input VisibilityContainers 2019-10-14 16:27:59 -07:00
Andrei Zavatski
ad32d66365 CI fix 2019-10-15 01:10:23 +03:00
Andrei Zavatski
0fd6b0c852 Use linq expression to count deleted comments 2019-10-15 00:55:33 +03:00
Andrei Zavatski
b84c9dfd84 Use Humanizer.ToQuantity instead of manual parsing 2019-10-15 00:35:44 +03:00
Andrei Zavatski
09621f066e Childs -> Children 2019-10-15 00:32:21 +03:00
Andrei Zavatski
0676c880b5 Simplify IsTopLevel and IsDeleted properties 2019-10-15 00:26:31 +03:00
Andrei Zavatski
b1f7a673e7 Simplify chevron icon coloring 2019-10-15 00:10:02 +03:00
Andrei Zavatski
d4843285db CI fixes 2019-10-14 17:33:14 +03:00
Andrei Zavatski
139170cdc8 Fix incorrect padding for nested comments 2019-10-14 17:26:12 +03:00
Andrei Zavatski
b53fb0d228 Remove empty line 2019-10-14 17:07:50 +03:00
Andrei Zavatski
a4ffd4798d Fix escaped html strings not being unescaped 2019-10-14 17:02:48 +03:00
Andrei Zavatski
a81d5cd819 Handle links in message 2019-10-14 16:56:07 +03:00
Andrei Zavatski
7cd3f5656d Cleanups 2019-10-14 16:43:43 +03:00
Andrei Zavatski
7ac87494e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-14 16:21:34 +03:00
Dean Herbert
f0e9700349 Inline delegate event 2019-10-14 21:49:02 +09:00
Dean Herbert
b7ddf160b4 OnClick should actually handle the event 2019-10-14 21:48:12 +09:00
Dean Herbert
4e6ab1dad3 Tidy up state management via bindable usage 2019-10-14 21:42:07 +09:00
Dean Herbert
7794457550 Remove more constants 2019-10-14 21:36:10 +09:00
Dean Herbert
4822496c13 Fix more naming 2019-10-14 21:34:16 +09:00
Dean Herbert
89f270a19a SortSelector -> SortTabControl 2019-10-14 21:32:41 +09:00
Dean Herbert
e191c2c50e Tidy up constants and method naming 2019-10-14 21:32:16 +09:00
Dean Herbert
ae1a361f9f
Merge branch 'master' into commenst_header 2019-10-14 21:20:05 +09:00
Andrei Zavatski
328b4d6863 Cancel request on dispose 2019-10-13 16:22:10 +03:00
Andrei Zavatski
2f209d1dfa Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 14:53:41 +03:00
Andrei Zavatski
a44cc2e70b Implement CommentsShowMoreButton 2019-10-13 14:43:30 +03:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid 2019-10-13 18:38:57 +09:00
Andrei Zavatski
60954f969d DeletedChildsPlaceholder refactor 2019-10-13 12:38:50 +03:00
Andrei Zavatski
795ce81468 Use async loading for comment pages 2019-10-13 12:10:01 +03:00
Andrei Zavatski
4d971e49ff Colours update 2019-10-13 11:50:27 +03:00
Andrei Zavatski
27e3ffd293 Update dependencies 2019-10-13 11:23:49 +03:00
Andrei Zavatski
7f867562ca Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-13 11:15:43 +03:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2 2019-10-12 23:28:51 +09:00
Andrei Zavatski
f6b138fe6e Remove useless ItemGroup 2019-10-12 15:03:24 +03:00
Andrei Zavatski
7ffe5ac539 Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header 2019-10-12 15:02:12 +03:00
Dan Balasescu
bb7de50697
Merge pull request #6451 from peppy/fix-resume-from-player-audio 
Fix audio playback position being reset after resuming to song select
 2019-10-11 19:44:00 +09:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions (#6431) 
Move editor selections relative to hitobject start positions
 2019-10-11 19:35:11 +09:00
Dan Balasescu
26a33bfa4e
Merge branch 'master' into fix-resume-from-player-audio 2019-10-11 19:21:14 +09:00
Dan Balasescu
171105e3ea
Merge branch 'master' into fix-ranking-display 2019-10-11 19:15:10 +09:00
Dean Herbert
de13320a2d Add initial table display 2019-10-11 18:46:05 +09:00
smoogipoo
45835f97a1 Split out grids into separate files 2019-10-11 18:41:17 +09:00
smoogipoo
050d86a741 Always use the local coordinate space 2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2 Rename grid creation method + parameter 2019-10-11 18:24:33 +09:00
smoogipoo
5f0cd356d7 Rename startPosition to centrePosition 2019-10-11 18:24:33 +09:00
smoogipoo
8fb2628f9e Improve xmldocs 2019-10-11 18:24:33 +09:00
smoogipoo
66e0fef85b Expose StartPosition for derived grids to use 2019-10-11 18:24:33 +09:00
smoogipoo
97d4a8e59e Remove unnecessary dependency 2019-10-11 18:24:33 +09:00
smoogipoo
2df519ddfa Simplify colour retrieval function 2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39 Implement base class for beat snapping grids 2019-10-11 18:24:33 +09:00
Dan Balasescu
0634f17503
Merge branch 'master' into ignore-macosx-folder-in-archives 2019-10-11 17:39:41 +09:00
Dan Balasescu
d4282473c6
Merge branch 'master' into fix-background-disposal 2019-10-11 17:15:30 +09:00
Bartłomiej Dach
4b84564f47
Switch casing comparison mode to ordinal 
Switch from InvariantCultureIgnoreCase to OrdinalIgnoreCase when
checking file paths in archives for substrings indicating the file can
be ignored for performance gains.

Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
 2019-10-11 09:24:41 +02:00
Dean Herbert
937dbb7bf6 Initial layout for timing screen 2019-10-11 16:22:24 +09:00
Dean Herbert
c7eb0b401b
Merge branch 'master' into ignore-macosx-folder-in-archives 2019-10-11 14:36:52 +09:00
dependabot-preview[bot]
9fb5c85a18
Bump ppy.osu.Game.Resources from 2019.913.0 to 2019.1010.0 
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.913.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.913.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-11 05:15:14 +00:00
Dean Herbert
6776f31933
Merge branch 'master' into fix-ranking-display 2019-10-11 14:13:12 +09:00
Dean Herbert
44853c262c Update framework 2019-10-11 13:55:58 +09:00
Dean Herbert
475815df04 Update ranking display to handle new osu-web request format 2019-10-11 13:09:21 +09:00
Bartłomiej Dach
57bfa18359 Filter out OS-generated files from archives 
Add a filename ignore list to ZipArchiveReader to filter out superfluous
OS-generated files from archives during the import process. In addition
to decreasing the size of files imported this allows imports of some
incorrectly-constructed archives. An example is the case of having
a __MACOSX directory next to a single directory with the actual files -
filtering out the former at ZipArchiveReader allows the fallback added
in #6170 to work.
 2019-10-10 23:54:23 +02:00
Dan Balasescu
d2f1f54078
Merge branch 'master' into netcore-30 2019-10-10 23:38:24 +09:00
Dean Herbert
8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio 2019-10-10 22:08:20 +09:00
Dan Balasescu
356c0fdca0
Merge branch 'master' into cleanup-intros 2019-10-10 21:58:54 +09:00
Andrei Zavatski
b45e7246b8 Rename SortCommentsBy to CommentsSortCriteria 2019-10-10 15:56:08 +03:00
Dean Herbert
5eba33e876 Simplify logic and add test coverage for remaining case 2019-10-10 20:12:47 +09:00
Andrei Zavatski
fe7b4037f7 CI fix 2019-10-10 13:24:22 +03:00
Dean Herbert
a819a64036 Update resources 2019-10-10 19:16:14 +09:00
Andrei Zavatski
64f62bd2bf Implement CommentsHeader component 2019-10-10 12:06:25 +03:00
Andrei Zavatski
f6b78ad661 Overall cleanups 2019-10-10 11:43:45 +03:00
Andrei Zavatski
371b7841d0 Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-10 11:27:44 +03:00
dependabot-preview[bot]
bc4c1a2371
Bump ppy.osu.Framework from 2019.930.0 to 2019.1010.0 
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-10-10 08:16:28 +00:00
Dean Herbert
e66f9adb86 Fix user pause not being cancelled when playing audio 2019-10-10 16:53:03 +09:00
smoogipoo
2e2768870f Merge remote-tracking branch 'origin/master' into editor-selection-movement-params 2019-10-10 16:38:41 +09:00
Dan Balasescu
5497d210b6
Merge branch 'master' into fix-editor-slider-display 2019-10-10 16:22:30 +09:00
Dean Herbert
f74c79c2b8 Fix audio playback position being reset after resuming to song select 2019-10-10 11:58:43 +09:00
Andrei Zavatski
107d39c3e9 Add DeletedChildsPlaceholder to the bottom of the comments container 2019-10-09 14:10:05 +03:00
Dean Herbert
4e273fc628
Return correct allowed value for Perfect 
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
 2019-10-09 19:50:05 +09:00
Andrei Zavatski
c9d5bea0f1 Remove animations 2019-10-09 13:45:14 +03:00
Andrei Zavatski
7e3c97f496 Implement DeletedChildsPlaceholder component 2019-10-09 13:37:07 +03:00
Dean Herbert
9f2a648432 Add full asserts 2019-10-09 19:23:37 +09:00
Dean Herbert
ad6b8d3e04 Add result offset bounding to result itself, rather than just transforms 2019-10-09 19:08:55 +09:00
Dean Herbert
51bf600ea7 Use empty hitwindows instead of null 2019-10-09 19:08:31 +09:00
Andrei Zavatski
b2bd78308d Handle deleted comments 2019-10-09 12:18:49 +03:00
Andrei Zavatski
ad99a3236f Handle edited comments 2019-10-09 11:32:17 +03:00
Andrei Zavatski
a0dfbfe148 Handle parent usernames for legacy comments 2019-10-09 11:18:26 +03:00
Andrei Zavatski
0a56b041fd Implement ShowChildsButton 2019-10-09 11:07:56 +03:00
Dean Herbert
0681bb9a2b Fix potential nullref 2019-10-09 16:49:10 +09:00
Andrei Zavatski
4462d454e8 Message padding improvements 2019-10-09 10:34:17 +03:00
Andrei Zavatski
faef4d932d Improve message parsing 2019-10-09 10:17:14 +03:00
Dean Herbert
2d8e5615e4 Extract timeline and layout logic from ComposeScreen 2019-10-09 16:05:55 +09:00
Dean Herbert
3dd2b18ff0 Make EditorScreen abstract 2019-10-09 16:04:58 +09:00
Andrei Zavatski
6deafc04bf Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-09 10:00:20 +03:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback 2019-10-09 12:26:07 +09:00
Dan Balasescu
ed41429fc1
Merge branch 'master' into editor-wip-screens 2019-10-09 12:04:12 +09:00
Andrei Zavatski
29b0eacc82 Implement SortSelector component 2019-10-08 22:46:42 +03:00
Andrei Zavatski
574170124c Implement HeaderButton component 2019-10-08 21:38:19 +03:00
Andrei Zavatski
b9ad079bf8 Move CommentsHeader to it's own file 2019-10-08 20:57:55 +03:00
Andrei Zavatski
9ab309fc0e Use bold font for replies button 2019-10-08 20:44:01 +03:00
Andrei Zavatski
35cfb16c8d Implement VotePill component 2019-10-08 19:56:43 +03:00
Andrei Zavatski
4230b00110 Rename APIComments to APICommentsController 2019-10-08 19:22:23 +03:00
Andrei Zavatski
341702b91d Use Bindable for expansion logic 2019-10-08 19:18:46 +03:00
Andrei Zavatski
000e4a563c Parse parent comments 2019-10-08 19:09:02 +03:00
Andrei Zavatski
3f8fecbc50 Adjust spacing 2019-10-08 16:04:52 +03:00
Andrei Zavatski
9c7e403cf8 Implement replies button 2019-10-08 16:00:34 +03:00
Andrei Zavatski
451a7342ce Parse child comments 2019-10-08 15:39:03 +03:00
Andrei Zavatski
2564214a72 Fix some padding issues with the big comments 2019-10-08 15:01:18 +03:00
Andrei Zavatski
1c89841949 Move all the logic to it's own namespace 2019-10-08 14:51:12 +03:00
Andrei Zavatski
801b5b474e Add a User property to the comment for easy access 2019-10-08 13:45:13 +03:00
Andrei Zavatski
4b1a40daba Implement temp fix to get the actual message 2019-10-08 13:31:49 +03:00
smoogipoo
179656788d Remove unnecessary method 2019-10-08 19:27:59 +09:00
smoogipoo
c1db11fa06 More removal of "drag" 2019-10-08 19:24:58 +09:00
smoogipoo
8b661e624d Remove drag from class/method namings + refactor 2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447 Move selection relative to the hitobject start positions 2019-10-08 18:57:03 +09:00
Andrei Zavatski
70e1d731ad Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api 2019-10-08 12:42:59 +03:00
Dean Herbert
47768b7063
Rework osu! selection blueprint updates (#6291) 
Rework osu! selection blueprint updates

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-08 17:43:13 +09:00
Dean Herbert
4e026b163c Don't resume playback when user has paused and track hasn't changed 2019-10-08 15:04:38 +09:00
Dean Herbert
3e904b4838 Fix naming of file 2019-10-08 14:37:56 +09:00
Dean Herbert
63bf8ff832 Better signify under construction screens in editor 2019-10-08 14:32:48 +09:00
Dean Herbert
7e4f0c01b8
Avoid excess background updates in playlist overlay (#6424) 
Avoid excess background updates in playlist overlay
 2019-10-08 14:11:02 +09:00
Dan Balasescu
73e3dac64b
Merge branch 'master' into fix-editor-skinning 2019-10-08 13:28:10 +09:00
Dean Herbert
24269c0384 Fix skins not being displayed correctly in the editor 2019-10-08 12:52:34 +09:00
Dean Herbert
5472029ffe Fix editor defaulting to 0.5x playback speed 2019-10-08 12:27:51 +09:00
Dean Herbert
52770f803d Fix incorrect beatmap usage 2019-10-08 12:15:32 +09:00
Dean Herbert
cbb120cd38 Switch beatmap to private 2019-10-08 12:09:42 +09:00
Dean Herbert
c280bee894 Protect configuration bindables 2019-10-08 12:08:47 +09:00
Dean Herbert
b8b2ff2674 Move welcome to local usages 2019-10-08 12:07:59 +09:00
Dean Herbert
4ba2dccde3 Reorder file contents 2019-10-08 12:05:52 +09:00
Dean Herbert
a0bb193342 Remove unnecessary beatmap storage 2019-10-08 12:04:13 +09:00
Dean Herbert
449e53ee6d Centralise track handling 2019-10-08 12:03:42 +09:00
Dean Herbert
c3d56088d8 Make constant private 2019-10-08 11:54:39 +09:00
Dean Herbert
3c0b1be7f4 Add xmldoc where applicable 2019-10-08 11:52:16 +09:00
Dean Herbert
393683f8f1
Merge branch 'master' into cleanup-intros 2019-10-08 11:29:13 +09:00
Dean Herbert
438408161c
Fix tab controls overflowing right content at max ui scale (#6411) 
Fix tab controls overflowing right content at max ui scale
 2019-10-08 11:16:41 +09:00
Dean Herbert
0d0321674e
Merge pull request #6407 from UselessToucan/playlist_follow_playback 
Autoscroll playlist on song change
 2019-10-08 11:07:45 +09:00
Dean Herbert
e7fc5e556c Fix song select not correctly playing tracks in some cases 2019-10-08 11:06:07 +09:00
Dean Herbert
3ec78388e8 Avoid excess background updates in playlist overlay 2019-10-08 11:03:23 +09:00
Dean Herbert
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing 2019-10-08 10:12:03 +09:00
Joehu
9fdbe58326 Fix dropdown header padding when selected mod filter is hidden 2019-10-07 16:17:58 -07:00
Joehu
8e6e90eaec Use fixed numbers for padding instead 2019-10-07 16:11:40 -07:00
Roman Kapustin
e00992dfd8 Remove FollowPlayback setting 2019-10-07 19:44:22 +03:00
Andrei Zavatski
cc6bf2f173 Add IsDeleted property 2019-10-07 18:45:22 +03:00
Andrei Zavatski
aa8df0fa20 Hook up api and implement some visual comments representation 2019-10-07 18:26:07 +03:00
Andrei Zavatski
e772822bd5 Basic implementation 2019-10-07 17:49:20 +03:00
Andrei Zavatski
738580ec61 Add IsTopLevel property 2019-10-07 16:58:24 +03:00
Andrei Zavatski
76db200bd3 Implement GetCommentsRequest 2019-10-07 16:48:05 +03:00
Dean Herbert
f15953d65c Fix carousel including filtered difficulties in sort comparisons 2019-10-07 15:17:03 +09:00
Joehu
11d937beab Fix beatmap detail area tab dropdown being blocked by content 2019-10-06 10:24:33 -07:00
Joehu
38c1cee5fd Fix tab controls overflowing 2019-10-06 10:22:55 -07:00
Roman Kapustin
eda4a27b45 Move FollowPlayback setting to User Interface subsection 2019-10-06 15:06:25 +03:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates 2019-10-06 15:00:56 +08:00
Dean Herbert
2e20380d07
Merge branch 'master' into placement-blueprint-movement 2019-10-06 13:52:22 +08:00
Roman Kapustin
bdea75b995 Autoscroll playlist on song change 2019-10-05 23:53:05 +03:00
Joehu
e257f4ca04 Resume music to same position when exiting gameplay 2019-10-05 10:31:44 -07:00
iiSaLMaN
ba1a854701 Use IEnumerable.Where<>() rather than List.FindAll() 
Saves a whole list allocation
 2019-10-05 10:30:32 +03:00
Dean Herbert
93c0cf14c1
Merge branch 'master' into allow-fallback-decoder-overwrite 2019-10-05 10:56:57 +08:00
Joehu
a71db11ea5 Remove depth parameter description 2019-10-04 18:38:44 -07:00
Joehu
5d460eaf6b Remove depth specification and button order regression 2019-10-04 17:14:19 -07:00
Joehu
e7ba6ef5c4 Fix keybinding order of beatmap options 2019-10-04 14:32:43 -07:00
iiSaLMaN
6985249d90 Simplify properties 2019-10-04 21:18:03 +03:00
Bartłomiej Dach
7c2c537bc9 Allow fallback decoder overwrite 
To fix the runtime crashes in difficulty calculation components, remove
the check for pre-existing fallback registration along with
the exception. The xmldoc for the registration function has been
extended to make users aware of possible consequences of calling it.
 2019-10-04 18:20:20 +02:00
iiSaLMaN
0c4f248259 Fix CI issues 2019-10-04 18:02:13 +03:00
iiSaLMaN
555c82e9c9 Filter beatmap difficulties by current ruleset 2019-10-04 17:56:42 +03:00
iiSaLMaN
7d5f5d2fd9 Add ruleset selector to the beatmap overlay header 2019-10-04 17:55:33 +03:00
iiSaLMaN
7b414092af Implement beatmap ruleset selector 2019-10-04 17:35:41 +03:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement 2019-10-04 19:05:56 +08:00
Dean Herbert
9eab56e2fc
Merge branch 'master' into editor-beatmap-changed-event 2019-10-04 17:58:58 +08:00
Dan Balasescu
456def70c8
Merge branch 'master' into fix-negative-key-counter 2019-10-04 15:26:18 +09:00
Dan Balasescu
457e0c4d7b
Merge pull request #6117 from bdach/beatmap-parsing-fallback-v2 
Add fallback decoder option for badly-headered files
 2019-10-04 15:03:10 +09:00
Dean Herbert
aeb62825cd Move out requireMoreUpdateLoops for better consistency 2019-10-04 13:42:06 +08:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay (#6369) 
Fix Alt-F4 being blocked during gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-04 13:33:00 +08:00
Dean Herbert
ddef7fa3ba Repair behavioural change 2019-10-04 13:32:47 +08:00
Dean Herbert
bcdc22087a Merge remote-tracking branch 'upstream/master' into fix-negative-key-counter 2019-10-04 13:24:59 +08:00
Dan Balasescu
2b61bb709e
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-04 14:08:27 +09:00
Dean Herbert
f1772d01d2
Add the new switch button + labelled switch button (#6257) 
Add the new switch button + labelled switch button

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-04 13:01:57 +08:00
Dan Balasescu
dc984d0d81
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-04 13:51:56 +09:00
smoogipoo
ffde389641 Add difficulty calculator beatmap decoder fallback 2019-10-04 13:28:32 +09:00
Dean Herbert
47c1f36f9d Add ValidForResume check 2019-10-04 11:41:53 +08:00
Dean Herbert
71985c7ef1 Update fail logic to match 2019-10-04 11:23:42 +08:00
Dean Herbert
a7b58cad99
Merge branch 'master' into labelled-switch-button 2019-10-04 11:15:54 +08:00
Dan Balasescu
e9cb06a5e2
Merge branch 'master' into truncate-metadata-on-wedge 2019-10-04 12:08:06 +09:00
Dean Herbert
a7d7a28d34
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-04 11:05:28 +08:00
Dean Herbert
925615320e Update lazer default combo colours to match stable 2019-10-04 10:46:48 +08:00
Dean Herbert
d2c9a29c0d Remove unnecessary local assign 2019-10-04 10:45:18 +08:00
smoogipoo
a5e1cb8feb Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge 2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-03 08:43:31 -07:00
Dean Herbert
0dd12990c4
Fix possible nullref in MusicController (#6379) 
Fix possible nullref in MusicController
 2019-10-03 20:11:52 +08:00
Craftplacer
dbcb9e51c2
Merge branch 'master' into muted-notification 2019-10-03 12:51:22 +02:00
smoogipoo
636913a4a6 Refactor PlayerLoader changes 2019-10-03 19:22:41 +09:00
smoogipoo
6c878cb167 Prevent nullrefs 2019-10-03 19:15:37 +09:00
smoogipoo
662a1a9c2c Use current 2019-10-03 18:55:53 +09:00
smoogipoo
bcf0b2752e Fix possible MusicController nullref 2019-10-03 18:48:44 +09:00
smoogipoo
2d0c522398 Remove unused method 2019-10-03 18:43:46 +09:00
smoogipoo
f2ba87a1d2 Fix placement blueprint test scenes not working 2019-10-03 16:28:56 +09:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
Dean Herbert
6268bbcfc8
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-03 15:12:21 +08:00
Dean Herbert
b28689c774 Fix key counters appearing negative on intense beatmaps 
When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction.

I have changed this to use `Rate` as exposed by the frame stable clock.

- Closes #6198.
 2019-10-03 15:01:54 +08:00
smoogipoo
2c13043c42 Hook up the event to HitObjectComposer 2019-10-03 14:40:00 +09:00
smoogipoo
3fb0b0b668 Rename to StartTimeChanged and add xmldocs 2019-10-03 14:37:16 +09:00
smoogipoo
897b3233af Add start time tracking to EditorBeatmap 2019-10-03 14:23:48 +09:00
smoogipoo
f8eb07b211 Only lock database for the duration of a model restoration 2019-10-03 11:24:17 +09:00
Dean Herbert
c85d7c8b3f
Merge branch 'master' into reduce-database-deletion-locks 2019-10-03 10:17:27 +08:00
Joehu
8017788521 Revert "Fix alt-f4 being blocked in interface" 
This reverts commit 752dd26a4f.
 2019-10-02 16:08:24 -07:00
Joehu
148089f160 Revert "Remove unnecessary exitConfirmed condition check" 
This reverts commit 38fe519c91.
 2019-10-02 16:08:19 -07:00
Joehu
38fe519c91 Remove unnecessary exitConfirmed condition check 2019-10-02 12:28:48 -07:00
Joehu
752dd26a4f Fix alt-f4 being blocked in interface 2019-10-02 11:17:43 -07:00
Joehu
a69b9f1148 Fix alt-f4 being blocked during gameplay 2019-10-02 11:16:31 -07:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification 2019-10-02 17:31:34 +02:00
Craftplacer
6929847b08 Remove redundant override 2019-10-02 17:22:34 +02:00
Dean Herbert
3e07e508f2
Merge branch 'master' into fix-track-leak 2019-10-02 22:20:05 +08:00
smoogipoo
dfaa9531f8 Only lock the database for the duration of a deletion 2019-10-02 18:48:50 +09:00
Dan Balasescu
2519fd26a9
Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens 
Simplify exit logic of screens with textboxes using back button receptor
 2019-10-02 18:38:06 +09:00
Dan Balasescu
b161aa22c3
Merge branch 'master' into simplify-exit-logic-of-screens 2019-10-02 18:13:57 +09:00
HDragonHR
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
Ganendra Afrasya
b6dd610af8 Apply reviews 2019-10-01 23:18:03 +07:00
Craftplacer
5f399add82 Resolve @iiSaLMaN 's suggested changes 2019-10-01 18:15:40 +02:00
Craftplacer
2ac5e0bfa0 Make use of SessionStatics 2019-10-01 17:39:01 +02:00
Joehu
e3502f5200 Fix typo on Key.Escape comment 2019-10-01 08:37:08 -07:00
Joehu
ff6367fa4b Make back button glow when pressing escape 2019-10-01 08:26:45 -07:00
Joehu
5f700f2ae9 Simplify exit logic of screens with textboxes using back button receptor 2019-10-01 08:26:34 -07:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification 2019-10-01 17:26:11 +02:00
Ganendra Afrasya
208b9a4eba Add new virtual float for username to timestamp padding 2019-10-01 20:47:53 +07:00
smoogipoo
a310c4b65f Make selection blueprints a bit more testable 2019-10-01 19:32:47 +09:00
smoogipoo
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09:00
Dan Balasescu
b4da92e5a6
Merge branch 'master' into bot-profile 2019-10-01 16:26:48 +09:00
smoogipoo
81a227796e Merge remote-tracking branch 'origin/master' into rulesets_fail_load_exception_log 2019-10-01 15:41:16 +09:00
smoogipoo
ce609302ed Fix CI error 2019-10-01 15:41:09 +09:00
smoogipoo
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49:09 +09:00
Dean Herbert
351e89bf18 Update framework 2019-09-30 22:03:56 +09:00
Dan Balasescu
2d4e557134
Merge branch 'master' into fix-potential-null-test 2019-09-30 12:19:11 +09:00
miterosan
9f498d2990 Log the exception that caused to loading of rulesets to fail. 2019-09-29 19:25:44 +02:00
Andrei Zavatski
907f73ef8f Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-29 14:45:36 +03:00
Dean Herbert
193a9b0dd7
Merge branch 'master' into labelled-switch-button 2019-09-29 14:56:26 +08:00
Dean Herbert
ce62f3c75b Simplify and future-proof random retrieval method 
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
 2019-09-29 14:35:35 +08:00
Dean Herbert
740efa5747 Handle potential null case 2019-09-29 12:19:42 +08:00
V1ntagezTV
9f1c378733 moved into the switch case 2019-09-29 00:35:47 +05:00
V1ntagezTV
2681e2064a remove comment 2019-09-29 00:34:09 +05:00
V1ntagezTV
1babd139bc remove needless blank 2019-09-29 00:22:23 +05:00
V1ntagezTV
52b044b7f6 Add random intro! 2019-09-29 00:10:17 +05:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification 2019-09-28 20:33:32 +08:00
Dean Herbert
a45f8c968b Rename and add simple xmldoc 2019-09-28 20:21:51 +08:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics 2019-09-28 20:16:52 +08:00
Dean Herbert
1d1df2433f
Merge branch 'master' into fix-track-adjustments-not-applied-after-resume 2019-09-28 19:42:31 +08:00
Andrei Zavatski
a8eef0d0c4 Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-28 12:34:16 +03:00
iiSaLMaN
fb9f21237e Reset track adjustments on resuming from another screen 2019-09-28 04:18:16 +03:00
dependabot-preview[bot]
3af7c910fb
Bump Humanizer from 2.7.2 to 2.7.9 
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 19:09:07 +00:00
Dan Balasescu
8b7f558728
Merge branch 'master' into improve-hold-button-text 2019-09-27 17:35:03 +09:00
Andrei Zavatski
4908cb826b Fix line breaks 2019-09-27 09:46:11 +03:00
Andrei Zavatski
475455d7cd Add missing line breaks 2019-09-27 09:32:46 +03:00
Andrei Zavatski
94eacbca5d Fix Bot users have all the profile sections in ProfileOverlay 2019-09-27 09:22:25 +03:00
Dean Herbert
f4f5a7e9c8 Fix test regressions 2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4 Allow null NotificationManager 2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f Assign to field and move to load complete 2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5 Bind event to activation delay change 2019-09-27 02:59:42 +03:00
smoogipoo
45f2bcc440 Fix combo bindings not being bound to nested hitobjects 2019-09-26 17:39:19 +09:00
smoogipoo
706e884cc0 Update accent colour on combo index change 2019-09-26 17:13:13 +09:00
smoogipoo
bbf0544a8d Add bindables for IHasComboInformation properties 2019-09-26 16:55:08 +09:00
iiSaLMaN
911094e790 Replace menu button text with "press for menu" on 0ms activation delay 2019-09-26 01:42:56 +03:00
Dean Herbert
e2744054c7
Merge branch 'master' into back-button-part-2 2019-09-25 22:46:08 +09:00
Dean Herbert
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… (#6236) 
Fix mania scrolling speed not including beatmap slider multiplier

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-25 22:34:46 +09:00
Dean Herbert
45f833ceea Add invocation null checks for safety 2019-09-25 22:14:42 +09:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics 2019-09-25 16:14:39 +03:00
Dean Herbert
42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
Dean Herbert
8c01677e0b Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 22:12:00 +09:00
iiSaLMaN
8844d567cb Use bindable setting instead 2019-09-25 15:56:47 +03:00
smoogipoo
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
Dean Herbert
f11156c2dc Fix tests not working correctly 2019-09-25 19:30:25 +09:00
smoogipoo
9f77a1ef35 Adjust namespaces 2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10 Merge remote-tracking branch 'origin/master' into labelled-switch-button 2019-09-25 17:51:12 +09:00
smoogipoo
c9e39c124e Add a labelled switch button 2019-09-25 17:42:35 +09:00
smoogipoo
261ba5c80a Fix button not transforming correctly in some cases 2019-09-25 17:42:27 +09:00
Dean Herbert
ff9033f9ac Merge remote-tracking branch 'upstream/master' into muted-notification 2019-09-25 16:47:56 +09:00
Dean Herbert
3bd0fc2947 Merge remote-tracking branch 'upstream/master' into android-build-automation 2019-09-25 16:33:36 +09:00
Dan Balasescu
0eff9aa5e9
Merge branch 'master' into improve-carousel-tests 2019-09-25 15:55:11 +09:00
Dan Balasescu
213488a25e
Merge branch 'master' into abstract-update-manager 2019-09-25 15:41:45 +09:00
Dean Herbert
c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
Dean Herbert
654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
Dean Herbert
bb1289e83c
Merge branch 'master' into improve-carousel-tests 2019-09-25 14:24:28 +09:00
Joehu
102dbd85bd Fix CI errors 2019-09-24 16:48:22 -07:00
Joehu
9861b21440 Remove unnecessary padding/margin 2019-09-24 16:28:40 -07:00
Joehu
7fab1a4337 Truncate long metadata on beatmap info wedge 2019-09-24 16:06:33 -07:00
Bartłomiej Dach
9323df26a1 Decouple bar line hitobjects from generator 
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.

This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
 2019-09-25 00:36:27 +02:00
iiSaLMaN
cde7f49db1 Use direct get and set instead 2019-09-25 01:26:02 +03:00
iiSaLMaN
d013b73d33 Move in-memory logic to a base class 2019-09-25 01:25:05 +03:00
Dean Herbert
4a59e3351e Update beatmap carousel tests code style 
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
 2019-09-25 02:42:12 +09:00
Dean Herbert
03ec0fb27d
Merge branch 'master' into fix-mania-scrolling-speed 2019-09-24 22:20:19 +09:00
Dean Herbert
d2b76ec688
Make LabelledTextBox use the new LabelledComponent class (#6188) 
Make LabelledTextBox use the new LabelledComponent class

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-24 19:37:12 +09:00
LeNitrous
afa043aa7d always use default samples 2019-09-24 18:17:27 +08:00
Dean Herbert
f493f1c71d Move new components to v2 namespace 2019-09-24 19:00:26 +09:00
Dean Herbert
551b66ccec
Update framework (#6234) 
Update framework

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-24 18:54:47 +09:00
smoogipoo
028c958431 Initial implementation of a switch button 2019-09-24 18:39:11 +09:00
Dean Herbert
42b6041763 Move post-update notification logic to UpdateManager base class 2019-09-24 18:37:05 +09:00
Dean Herbert
c226d52b53 Don't automatic download for now 2019-09-24 18:34:54 +09:00
Dan Balasescu
1e70b83fd3
Merge branch 'master' into update-framework 2019-09-24 18:27:38 +09:00
smoogipoo
6b702eb6de Update with generic labelledcomponent 2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654 Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements 2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c Make LabelledComponent generic 2019-09-24 18:22:02 +09:00
Dean Herbert
84d9f98ff1 fixup! Move post-update notification logic to UpdateManager base class 2019-09-24 18:15:57 +09:00
Dean Herbert
1c474de0ed Move post-update notification logic to UpdateManager base class 2019-09-24 18:03:05 +09:00
Dan Balasescu
45015fc4ba
Merge branch 'master' into tournament-setup 2019-09-24 17:27:17 +09:00
smoogipoo
4abe0473b9 Fix relative beat length not considering slider multiplier 2019-09-24 16:49:42 +09:00
smoogipoo
af0c15a93c Fix initial hitobject states not being recomputed correctly 2019-09-24 16:48:39 +09:00
smoogipoo
75cceb9e30 Fix LifetimeChanged being invoked before lifetime is set 2019-09-24 16:47:34 +09:00
Dean Herbert
1860c2f9ce Update framework 2019-09-24 16:22:30 +09:00
Dan Balasescu
b67b594036
Merge branch 'master' into menu-key-support 2019-09-24 15:09:38 +09:00
smoogipoo
4555ecc5e0 Check for exact key 2019-09-24 15:09:08 +09:00
Dan Balasescu
615e300bc9
Merge branch 'master' into fix-changelog-margin 2019-09-24 13:39:17 +09:00
iiSaLMaN
267e12ce3c Add sample usage to the session statics 2019-09-24 05:45:47 +03:00
LeNitrous
ec78889e94 remove unused dependencies 2019-09-24 08:14:20 +08:00
dependabot-preview[bot]
53603b5591
Bump System.ComponentModel.Annotations from 4.5.0 to 4.6.0 
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 20:15:51 +00:00
Andrei Zavatski
5c4dfe0809 Apply suggested change 2019-09-23 17:05:19 +03:00