1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 07:47:27 +08:00
Commit Graph

18549 Commits

Author SHA1 Message Date
Dean Herbert
db4e3047dd Add test for final sample output 2020-05-19 23:28:13 +09:00
Dean Herbert
eee8af28f6
Merge pull request #9018 from Game4all/allowgameplayoverlays-hide-skip
Allow disabling SkipOverlay through AllowGameplayOverlays.
2020-05-19 19:22:51 +09:00
Dean Herbert
052ad79fc6 Convert dangerous events to IBindables 2020-05-19 16:44:22 +09:00
smoogipoo
3ee698cfa0 Fix being able to press enter to create matches 2020-05-19 12:39:09 +09:00
Bartłomiej Dach
9415e45aea Add overlay layer to enumeration type 2020-05-18 22:45:31 +02:00
smoogipoo
6d70f4b410 Merge branch 'master' into allowgameplayoverlays-hide-skip 2020-05-18 19:54:38 +09:00
smoogipoo
49ee05c3c4 Make into CompositeDrawable 2020-05-18 19:37:49 +09:00
Dan Balasescu
e975e53e39
Merge branch 'master' into sections-container-fix 2020-05-18 19:16:44 +09:00
Dean Herbert
59ef6002bd Update framework 2020-05-18 13:12:30 +09:00
Bartłomiej Dach
17ae392a75 Apply rounding to bar line start times 2020-05-17 22:11:13 +02:00
Dean Herbert
11537dd688 Merge branch 'master' into tourney-subscreen-back-button 2020-05-17 17:38:36 +09:00
Dean Herbert
13d4997c91 Remove custom back action logic (use receptor as intended) 2020-05-17 17:35:10 +09:00
Dan Balasescu
533010f168
Merge branch 'master' into avoid-host-disable 2020-05-17 15:59:39 +09:00
smoogipoo
e3c1112b5a Initial integration into results screen 2020-05-16 19:00:20 +09:00
smoogipoo
8c5ccf574b Add better fix for 1px bleed 2020-05-16 18:33:21 +09:00
Dean Herbert
be3a0a3c1d Merge branch 'master' into remove-requiredtypes 2020-05-16 18:28:14 +09:00
smoogipoo
16cde20db4 Merge branch 'remove-requiredtypes' into results-screen-condensed-panel 2020-05-16 18:23:39 +09:00
smoogipoo
2bde4fc3ee Initial implementation of contracted score panel 2020-05-16 18:20:19 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
Dean Herbert
9d3df14179 Remove unused variable 2020-05-16 11:03:27 +09:00
Dean Herbert
c47f02c3b7 Update second instance of disabling bindable 2020-05-16 08:24:02 +09:00
Lucas A
4096463d02 Move SkipOverlay internal alpha manipulation to a nested container and adjust visual tests. 2020-05-15 19:43:01 +02:00
Fukashi13
6416ace70d fixed indent 2020-05-15 14:31:05 +02:00
Fukashi13
c55eb83351 last section gets selected when scrolling to bottom of list 2020-05-15 14:03:45 +02:00
smoogipoo
6cd1753459 Add overload to prevent crashes (bosu) 2020-05-15 18:51:44 +09:00
Dean Herbert
9b6525bb03 Fix applied platform/user offsets being incorrect when rate adjust mods are active 2020-05-15 18:44:47 +09:00
smoogipoo
4719fcc291 Actually use the cancellation token 2020-05-15 18:17:39 +09:00
smoogipoo
4079642d58 Actually pass in the cancellation token 2020-05-15 18:13:47 +09:00
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
Dean Herbert
8bbb0c98e0
Merge branch 'master' into migration-ui 2020-05-15 17:39:18 +09:00
Dean Herbert
aec2520ef4 Avoid disabling a host-level bindable from osu! code 2020-05-15 17:31:06 +09:00
Dan Balasescu
e3025ede6b
Merge branch 'master' into fix-nested-folder-migration-endless-copy 2020-05-15 13:43:47 +09:00
Dean Herbert
6ca102bc3f Attempt delete operations more than once 2020-05-15 13:19:03 +09:00
Dean Herbert
9ed0e8891b Merge branch 'fix-nested-folder-migration-endless-copy' into migration-ui 2020-05-15 13:04:16 +09:00
Dean Herbert
94cf99bf97 Fix mute button falling off the screen when UI scaling is used 2020-05-15 12:22:59 +09:00
Dean Herbert
0690d81bbb Add protection against migrating to a nested folder 2020-05-15 10:40:26 +09:00
Dean Herbert
25bbb02999 Throw better exceptions from OsuStorage 2020-05-15 10:28:03 +09:00
Fukashi13
097fcfd9ad
Update osu.Game/Graphics/Containers/SectionsContainer.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-15 00:06:58 +02:00
Dean Herbert
364aa5aa12 Add protection against migrating to a nested folder 2020-05-14 22:45:03 +09:00
Dean Herbert
155e918ca3 Remove unused parameter 2020-05-14 21:40:28 +09:00
Fukashi13
e390d70b70 bestMatch changes on entering section with screen top border 2020-05-14 14:33:12 +02:00
Dean Herbert
42f446faa9 Fix remaining test failure 2020-05-14 21:10:04 +09:00
Dan Balasescu
fe7c5bbc8b
Merge branch 'master' into fix-failure-logic 2020-05-14 20:16:37 +09:00
Dean Herbert
29b3b4d25b
Merge branch 'master' into migration-ui 2020-05-14 19:48:44 +09:00
Dean Herbert
a582611647 Add test coverage 2020-05-14 19:05:35 +09:00
Dan Balasescu
0faafac5a2
Merge pull request #9003 from peppy/fix-taiko-scroller-time-control
Fix taiko scroller not correctly adhering to gameplay time movement
2020-05-14 17:56:07 +09:00
Dean Herbert
4e4a779d68 Improve overall UI 2020-05-14 17:41:55 +09:00
Dean Herbert
d04079f6ab Fix directory selector not masking properly 2020-05-14 17:41:55 +09:00
Dean Herbert
06f507496a Delete migration source if no files exist after completion 2020-05-14 17:41:55 +09:00
Dean Herbert
0b73063a89 Add basic (working) migration UI 2020-05-14 17:41:55 +09:00
Dean Herbert
cb0b25ac55 Throw better exceptions from OsuStorage 2020-05-14 17:41:55 +09:00
Dean Herbert
6bb06e9d61 Expose CurrentDirectory bindable for consumption 2020-05-14 17:41:55 +09:00
smoogipoo
4bf5477252 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-14 17:04:09 +09:00
Dan Balasescu
0e15bb5ca5
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-14 16:36:07 +09:00
Dean Herbert
facde2c8e1 Remove unnecessary generic specification on cursor 2020-05-14 16:01:07 +09:00
Dean Herbert
c836c9319b Combine pagination logic into BeatmapListingFilterControl 2020-05-14 15:35:11 +09:00
Dan Balasescu
39f8f7ed78
Merge branch 'master' into directory-chooser 2020-05-14 15:23:52 +09:00
Dean Herbert
04c9973526 Clean up cancellation logic 2020-05-14 14:33:31 +09:00
Dean Herbert
fa3373e5f3 Reorder file and change naming slightly 2020-05-14 14:24:43 +09:00
Dean Herbert
5e09a1b334 Use Action rather than custom handler 2020-05-14 14:23:12 +09:00
Dean Herbert
149cb93e8c Add very basic error handling when a directory cannot be enumerated 2020-05-14 13:18:37 +09:00
namaenonaimumei
9e71b3c4df
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-14 02:23:46 +09:00
「空白」
43450b5485 Resolve remaining InspectCode issues
> CI should now pass build test
2020-05-14 01:57:03 +09:00
「空白」
1ac9c7c15a Add license header to WebRequestExtensions 2020-05-14 00:04:31 +09:00
Dean Herbert
ad1d050fb4 Throw exception on copy timeout 2020-05-13 20:29:15 +09:00
Dean Herbert
49e616b7e5 Also check for directory presence before migrating 2020-05-13 20:19:14 +09:00
Dean Herbert
9de216f1b4 Merge branch 'master' into migration-backend 2020-05-13 20:15:22 +09:00
Dean Herbert
46608615b0 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-13 19:20:02 +09:00
Dean Herbert
c048d9b6ae Fix incorrect assignment 2020-05-13 18:55:06 +09:00
Dean Herbert
e9e03d038d Tidy up naming and structure 2020-05-13 18:54:46 +09:00
Dean Herbert
246812e0b1 Change breadcrumb display icons to match design 2020-05-13 18:54:45 +09:00
Dean Herbert
49e4fc6cba Move to better namespace 2020-05-13 18:54:45 +09:00
Dean Herbert
45387a7131
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-13 15:41:27 +09:00
Dean Herbert
18d71c6894
Merge pull request #9002 from Craftplacer/cacheas-game-components
Use CacheAs for caching game-wide components
2020-05-13 11:42:48 +09:00
Dean Herbert
bbf4c687a8 Improve xmldoc 2020-05-13 11:09:17 +09:00
Lucas A
7874045b1f Allow disabling SkipOverlay through AllowGameplayOverlays. 2020-05-12 23:05:56 +02:00
「空白」
5962dedd35 Reimplement cursor as part of WebRequest extensions
> Added WebRequestExtensions
> Moved Cursor request logic from SearchBeatmapSetsRequest
2020-05-13 05:04:39 +09:00
「空白」
cabf3a89b1 More robust cursor parsing solution
> Change cursor request to return last response's entire cursor structure
2020-05-13 03:44:57 +09:00
namaenonaimumei
6a867caaaa
Merge branch 'master' into pr-beatmap_listing_pagination 2020-05-13 02:20:10 +09:00
「空白」
e321494f15 Fix sort-by handling
> Add other cursor fields for paging different sortings
> Sorted as they show in GUI code-wise for more readability for now
2020-05-13 02:15:24 +09:00
「空白」
82190a07b8 Remove temporary comments
> Removes unnecessary xmldoc comments
2020-05-13 02:01:38 +09:00
「空白」
0c60b10757 Fix code factor issues
> ran "dotnet format --check", shouldn't return whitespace errors anymore
2020-05-13 01:14:11 +09:00
Huo Yaoyuan
f07d95ac59 Use IReadOnlyList<T> for TypedListConverter. 2020-05-12 21:49:55 +08:00
Huo Yaoyuan
f7d26688f4 Merge branch 'master' into json-converter 2020-05-12 21:43:02 +08:00
Dean Herbert
44319c1b71 Commit missed change 2020-05-12 20:26:34 +09:00
Dean Herbert
de50b725d5 Fix mod failure checks executing actual game logic 2020-05-12 20:08:35 +09:00
Craftplacer
a86c7f478c Initial commit 2020-05-12 05:49:35 +02:00
Dean Herbert
75a40578e8 Revert ContextFactory to private 2020-05-12 12:39:52 +09:00
Dean Herbert
e4a23b3e7d Fix ignored excluding more than top level 2020-05-12 12:39:04 +09:00
Dan Balasescu
ab9149844a
Merge pull request #9001 from peppy/fix-diff-recommender-nullref
Fix null reference in difficulty recommender
2020-05-12 11:55:54 +09:00
Dean Herbert
e9804bf11b Update resources 2020-05-12 11:55:34 +09:00
Dean Herbert
a5c1b461f6 Fix null reference in difficulty recommender 2020-05-12 11:14:51 +09:00
Dean Herbert
bf719f98d5 Fix beatmap skins providing fallback version lookup, preceding user skins 2020-05-12 11:08:30 +09:00
「空白」
35e7cee458 Squash commits from private fork
Temporary comments left to-remove later
2020-05-12 03:18:47 +09:00
Bartłomiej Dach
848a3fb6d7 Take hitobject start/end times into account in drain 2020-05-11 19:06:36 +02:00
Dean Herbert
984f27c107 Add simple retry logic on file copy failure (may be in use) 2020-05-11 21:39:44 +09:00
Dean Herbert
a11be07bb1 Move log storage location after migration complete 2020-05-11 21:39:44 +09:00
Dean Herbert
6c350db097 Add connection flushing support 2020-05-11 21:39:44 +09:00
Dean Herbert
36640f5dda Merge branch 'master' into migration-backend 2020-05-11 18:52:36 +09:00
Dean Herbert
b9e5009dd5 Update framework 2020-05-11 17:09:34 +09:00
Dean Herbert
d608714cea Merge branch 'master' into midi-keybinds 2020-05-11 17:09:15 +09:00
Dean Herbert
916d8245e6 Don't timeout on long beatmap load when debugging 2020-05-11 12:50:47 +09:00
Dan Balasescu
0b05a6d895
Merge branch 'master' into custom-data-directory 2020-05-11 12:12:03 +09:00
Dan Balasescu
6841bd5609
Merge branch 'master' into taiko-scroller 2020-05-11 11:10:55 +09:00
Bartłomiej Dach
1d999bb634 Integrate PeriodTracker changes 2020-05-10 18:32:38 +02:00
Bartłomiej Dach
ee2ff77b89 Merge branch 'master' into fix-draining-in-between-break-sections 2020-05-10 17:57:44 +02:00
Dean Herbert
44fdf1e6b0
Reword xmldoc 2020-05-10 20:09:41 +09:00
Dean Herbert
c712e98f2b
Merge branch 'master' into publicly-expose-hud 2020-05-10 20:06:28 +09:00
Dean Herbert
729585e151
Merge branch 'master' into mania-holdnote-selection-fix 2020-05-10 15:07:30 +09:00
Dan Balasescu
2f12c4126a
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-10 13:49:08 +09:00
smoogipoo
738c6da594 Implement midi keybindings 2020-05-10 13:39:20 +09:00
Dean Herbert
384862d48b Fix incorrect relative paths when using GetStorageForDirectory 2020-05-10 13:20:13 +09:00
Dean Herbert
7ce78d8ce4
Merge branch 'master' into taiko-scroller 2020-05-09 23:25:54 +09:00
Dean Herbert
bbebd26efb Use DirectoryInfo in more places 2020-05-09 20:13:31 +09:00
Dean Herbert
0bbf02d916 Merge branch 'master' into migration-backend 2020-05-09 19:32:35 +09:00
Dean Herbert
1348bdaa15 Merge branch 'custom-data-directory' into migration-backend 2020-05-09 19:32:29 +09:00
Dean Herbert
3f78ddf482 Add CanBeNull hinting 2020-05-09 19:13:18 +09:00
Dean Herbert
e2979cbe9a Merge branch 'master' into fix-nullref-on-early-exit 2020-05-09 19:13:11 +09:00
Dean Herbert
fa711a6456 Fix null reference causing hard freeze if game is forcefully closed during disclaimer 2020-05-09 19:11:51 +09:00
Huo Yaoyuan
80a193a616 Use IEnumerable<T> for TypedListConverter. 2020-05-09 17:41:59 +08:00
Dean Herbert
55e0d91f37 Fix download button being disabled after importing a download disabled beatmap 2020-05-09 18:09:17 +09:00
Huo Yaoyuan
74cbe9306c Use strongly-typed JsonConerter. 2020-05-09 16:39:46 +08:00
Dean Herbert
56f17fa64f
Merge branch 'master' into custom-data-directory 2020-05-09 17:27:16 +09:00
Endrik Tombak
d1976b194d Check local availability before disabling buttons 2020-05-09 10:42:56 +03:00
Dean Herbert
5c2778d5f0 Change comparison direction 2020-05-08 20:33:02 +09:00
smoogipoo
be3b77cf25 Fix potentially skipping hitobject updates 2020-05-08 20:09:59 +09:00
Dean Herbert
9b8589583c Merge branch 'master' into taiko-scroller 2020-05-08 19:10:39 +09:00
Dean Herbert
abd1115c6d Fix test failures 2020-05-08 19:08:43 +09:00
Dean Herbert
d9658bc34e Merge branch 'master' into custom-data-directory 2020-05-08 19:08:07 +09:00
smoogipoo
22dda3fe02 Make ScrollingHitObjectContainer respond to defaults applied events 2020-05-08 18:49:58 +09:00
smoogipoo
efff2bf15d Add HitObject to DefaultsApplied event 2020-05-08 18:49:19 +09:00
smoogipoo
dcfef6b443 Add clear method to EditorBeatmap 2020-05-08 18:46:37 +09:00
Dean Herbert
a59db976d6 Fix loading a ruleset with a new version specification causing a crash 2020-05-08 18:05:06 +09:00
Lucas A
30dd158c33 Rename property to AllowGameplayOverlays and update XMLDoc accordingly. 2020-05-08 09:37:50 +02:00
Dean Herbert
9f64882f37 Update framework 2020-05-08 14:48:38 +09:00
Dean Herbert
b6f232e394 Update framework 2020-05-08 10:27:48 +09:00
Dean Herbert
abb32b3256
Merge branch 'master' into custom-data-directory 2020-05-08 10:05:11 +09:00
Dean Herbert
a019b5e6e8
Merge pull request #8958 from smoogipoo/fix-ss-nullref
Fix potential nullref in song select filtering
2020-05-08 09:08:03 +09:00
Dean Herbert
e8aebada3c
Merge pull request #8959 from smoogipoo/fix-catch-crash
Fix catch crashing when finishing maps
2020-05-07 23:46:36 +09:00
Dean Herbert
c5bd352f63
Merge branch 'master' into fix-ss-nullref 2020-05-07 22:29:18 +09:00
Dean Herbert
7a2020fd45 User copy operation instead of move 2020-05-07 22:12:24 +09:00
Dean Herbert
49a03f1c06 Add basic blocking migration, move not copy 2020-05-07 22:11:57 +09:00
Dean Herbert
754afb9c0b Expose ContextFactory to allow for connection flushing 2020-05-07 22:11:57 +09:00
Dean Herbert
d21c42a222 Update framework 2020-05-07 20:59:29 +09:00
Lucas A
83998d5ba5 Trim whitespace. 2020-05-07 09:39:14 +02:00
Lucas A
83be5455d3 Disable the display of HUD through DisplayHud property. 2020-05-07 08:52:36 +02:00
Joehu
259ef68811 Fix date tooltip not showing in 24-hour format 2020-05-06 22:29:37 -07:00
smoogipoo
401c516503 Expose searchable terms from beatmap info instead 2020-05-07 13:04:08 +09:00
smoogipoo
e91e4a73af Fix catch crashing when finishing maps 2020-05-07 12:22:07 +09:00
smoogipoo
5186da8412 Fix potential song select nullref 2020-05-07 11:37:04 +09:00
Dean Herbert
7781408643 Update in line with framework storage changes 2020-05-06 18:28:24 +09:00
Dean Herbert
c8134162b5
Merge pull request #8934 from smoogipoo/sorcerer-catch-changes
Implement Sorcerer's osu!catch difficulty calculation adjustments
2020-05-06 18:10:33 +09:00
Lucas A
aff74db80d Publicly expose HUDOverlay in Player. 2020-05-05 10:40:10 +02:00
Dan Balasescu
0eae8d078b
Merge branch 'master' into master 2020-05-05 13:33:29 +09:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
alex
c987af988c Fix typo 2020-05-04 18:26:12 -07:00
Dan Balasescu
c14842d18b
Merge pull request #8937 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.0.0
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 2.9.8 to 3.0.0
2020-05-04 21:42:29 +09:00
Dan Balasescu
a7a156b4f1
Merge pull request #8939 from ppy/dependabot/nuget/Humanizer-2.8.11
Bump Humanizer from 2.8.2 to 2.8.11
2020-05-04 19:27:29 +09:00
smoogipoo
fe31bac505 Fix build error 2020-05-04 18:20:20 +09:00
dependabot-preview[bot]
4ee2e6cd47
Bump Humanizer from 2.8.2 to 2.8.11
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.2 to 2.8.11.
- [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.8.2...v2.8.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-04 08:57:09 +00:00
Dean Herbert
5edabbdee2 Redirect log output to custom data directory 2020-05-04 17:35:35 +09:00
Dean Herbert
6621d363da Add basic custom data directory support 2020-05-04 17:01:05 +09:00
smoogipoo
6d3a24ff01 Reorder tick hit results 2020-05-04 15:55:42 +09:00
smoogipoo
f42be7a6d7 Merge branch 'master' into sorcerer-catch-changes 2020-05-04 15:25:09 +09:00
Dean Herbert
06f58dd3e3 Ensure correct beatmap and ruleset when presenting a score from song select 2020-05-04 15:20:43 +09:00
Dean Herbert
a1cd007cad Fix song select tests potentially failing due to difficulty panels not yet displayed 2020-05-04 14:44:53 +09:00
Dan Balasescu
5767bcb8d7
Merge branch 'master' into add-interval-list 2020-05-04 02:00:14 +09:00
Dan Balasescu
425457db81
Merge pull request #8924 from peppy/cached-online-lookups
Add local beatmap lookup cache to improve performance of imports
2020-05-04 01:12:02 +09:00
Dean Herbert
cea6be5e52 Expose as JudgementResult instead of "passing" state 2020-05-03 23:55:44 +09:00
Dean Herbert
68d40cf790 Fix test failures due to online cache download 2020-05-03 13:25:57 +09:00
Dean Herbert
6fef4eeb8f Rename class and extract out lookup method 2020-05-03 09:35:48 +09:00
Dean Herbert
035b513b68 Use QuerySingle instead of QueryFirst 2020-05-03 09:32:33 +09:00
Dean Herbert
b9b5779251 Move deletion to catch instead of finally 2020-05-03 09:31:56 +09:00
Dean Herbert
917393697c Update framework 2020-05-02 14:38:46 +09:00
Dean Herbert
deb87517d0 Add local beatmap lookup cache 2020-05-02 14:35:12 +09:00
Bartłomiej Dach
8118747732 Make PeriodTracker actually immutable 2020-05-02 01:33:33 +02:00
Dean Herbert
ff1d63060d Add and consume passing state in GameplayBeatmap 2020-05-01 20:08:18 +09:00
Joehu
700214d249 Truncate beatmap title and artist on score panel 2020-04-30 22:13:38 -07:00
smoogipoo
e0ae9f791c Update framework 2020-05-01 11:56:40 +09:00
smoogipoo
15d3648533 Merge branch 'master' into display-modes 2020-05-01 11:55:13 +09:00
Dean Herbert
d470e092a3
Merge branch 'master' into fix-overlapping-object-undoredo 2020-05-01 10:45:29 +09:00
Dan Balasescu
5740563391
Merge pull request #8903 from peppy/carousel-loading-spinner
Show loading spinner when carousel is not ready to be displayed
2020-04-30 21:29:53 +09:00
Dean Herbert
53474c74ee
Merge pull request #8913 from smoogipoo/fix-mania-undo-redo-crash
Fix mania crashing on undo/redo
2020-04-30 21:03:38 +09:00
Dean Herbert
000c34dc26 Move recommender to field construction 2020-04-30 21:01:53 +09:00
Dan Balasescu
273266abc1
Merge pull request #8910 from peppy/taiko-kiai-playfield
Add kiai support to osu!taiko skinned playfields
2020-04-30 21:00:08 +09:00
smoogipoo
c96bc5c51c Fix undo/redo behaving poorly with simultaneous objects 2020-04-30 20:39:41 +09:00
smoogipoo
9bec42bc7e Fix mania crashing on undo/redo 2020-04-30 20:03:46 +09:00
Dean Herbert
d0a8c0fa71 Add kiai support to osu!taiko skinned playfields 2020-04-30 16:43:00 +09:00
Dean Herbert
21c6ac8c43 Allow closing the game during intro 2020-04-30 12:12:28 +09:00
Dean Herbert
cf4e79cf38 Show loading spinner when carousel is not ready to be displayed 2020-04-30 11:51:06 +09:00
Dean Herbert
c3ef1d3170
Merge pull request #8893 from peppy/reduce-initial-channel-load-overhead
Reduce initial channel load overhead by only loading history on active channel
2020-04-29 19:56:23 +09:00
Dan Balasescu
a8c3cdbd2e
Merge pull request #8895 from peppy/improve-beatmap-lookup-performance
Further improve beatmap carousel load performance by avoiding incorrect query construction
2020-04-29 19:35:26 +09:00
Dan Balasescu
f282d57aa7
Merge branch 'master' into reduce-initial-channel-load-overhead 2020-04-29 19:30:56 +09:00
Dean Herbert
064e5004ed
Merge branch 'master' into fix-mania-selection 2020-04-29 17:15:48 +09:00
Dean Herbert
d1ec99ffd9 Further improve beatmap carousel load performance by avoiding incorrect query construction 2020-04-29 16:51:22 +09:00
Dean Herbert
c73d45bc01 Reduce initial channel load overhead by only loading history on active channel 2020-04-29 15:23:28 +09:00
Dean Herbert
68fe3e12bc
Merge pull request #8887 from smoogipoo/mania-dt-speed
Fix speed adjustment mods affecting mania scroll speed
2020-04-29 14:52:51 +09:00
Salman Ahmed
6fa9feb15c
Merge remote-tracking branch 'upstream/master' into add-interval-list 2020-04-29 05:14:40 +03:00
Salman Ahmed
6e76e5900a
Rename is-in-any check method to a more legible name 2020-04-29 05:11:44 +03:00
Salman Ahmed
8d899f4e77
Apply changes to the BreakTracker and more adjustment 2020-04-29 05:11:43 +03:00
Salman Ahmed
00918ecb6d
Replace interval collection with a more-specific immutable component
Covers all small changes into one commit:
 - Remove generics and use `double` type instead.
 - Make the component immutable and not enumerable for simplicity of it's worth.
 - Make the component more-specific (to time period tracking)
 - Apply small adjustments to the component
2020-04-29 05:11:43 +03:00
Dean Herbert
cd22e5883d
Merge pull request #8883 from peppy/dont-use-internal-ef-linq
Avoid using internal EF methods in tests
2020-04-29 09:54:06 +09:00
Dean Herbert
119000f1ab Reduce database includes where possible 2020-04-28 21:43:35 +09:00
smoogipoo
1aaab40228 Fix mods affecting mania scroll speed 2020-04-28 19:34:02 +09:00
smoogipoo
7d54d4b800 Improve test scene 2020-04-28 18:36:10 +09:00
Dean Herbert
c3a41c8476 Also avoid using internal TypeExtensions 2020-04-28 17:02:10 +09:00
smoogipoo
da30eafa30 Prevent potential exception 2020-04-28 14:47:45 +09:00
Dan Balasescu
e915f22516
Merge branch 'master' into schedule-music-controller-operations 2020-04-28 14:09:56 +09:00
Dean Herbert
19fe15887a
Merge pull request #8860 from Joehuu/fix-mod-sel-score-multi-being-off-screen
Fix score multiplier being cut off in mod select at higher ui scales
2020-04-28 13:52:56 +09:00
Dean Herbert
832fa74a5e Reword comment slightly 2020-04-28 13:26:42 +09:00
smoogipoo
799b5179ed Merge branch 'master' into fix-mania-selection 2020-04-28 13:00:33 +09:00
Dean Herbert
62be138aa9 Avoid calls on MusicController executing before it may have finished loading 2020-04-28 11:46:08 +09:00
Shane Woolcock
9477a5373c
Merge branch 'master' into display-modes 2020-04-28 12:04:20 +09:30
Joseph Madamba
a34ec03efc
Reword width comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 12:44:20 -07:00
smoogipoo
cebc0fc046 Attempt to fix multiple selection movements 2020-04-27 20:35:24 +09:00
dependabot-preview[bot]
c0b225ffc8
Bump ppy.osu.Game.Resources from 2020.412.0 to 2020.427.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.412.0 to 2020.427.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.412.0...2020.427.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:59:34 +00:00
smoogipoo
7f5a1d7f44 Merge branch 'master' into fix-mania-selection 2020-04-27 17:09:40 +09:00
smoogipoo
bc6b02664f Merge branch 'master' into taiko-drumroll-party 2020-04-27 11:52:13 +09:00
Joehu
1b9362041a Revert multiplier number changes and set width
Safe arbitrary width taken from "0.00x" (highest width of 67), rounded to the nearest tenth.
2020-04-26 19:50:11 -07:00
Joehu
8a47a615db Remove unranked label from footer 2020-04-26 19:29:22 -07:00
smoogipoo
104c61d622 Remove unnecessary scale 2020-04-27 11:06:23 +09:00
Dean Herbert
48168dddce Adjust editor timeline current marker to promote tick visibility 2020-04-27 10:54:32 +09:00
Dean Herbert
2737726f93
Merge pull request #8864 from Game4all/keybinds-ruleset-icon
Fix custom rulesets not showing correct icons in key binding settings
2020-04-27 08:48:00 +09:00
Bartłomiej Dach
a436f8e6d4 Trim other leftover RelativeSizeAxes 2020-04-26 22:54:01 +02:00
Lucas A
801968ed51 Remove un-needed RelativeSizeAxes specifications. 2020-04-26 21:17:40 +02:00
Lucas A
a756486a4d Make settings section icons actual drawables. 2020-04-25 20:35:46 +02:00
Dean Herbert
b50e8471d2 Reword comment 2020-04-25 18:23:09 +09:00
Salman Ahmed
1953c8fc10
Fix ruleset selector not receiving key input on toolbar absence 2020-04-25 09:53:09 +03:00
Salman Ahmed
37cc1ed5a2
Fix potential null reference while hiding toolbar 2020-04-25 09:51:39 +03:00
Tim Oliver
c1c930c472 Fixed linting warnings 2020-04-25 13:47:20 +08:00
Joehu
4b60be87b5 Move unranked label under multiplier number to avoid width changes 2020-04-24 16:34:41 -07:00
Dean Herbert
cbcd915ec8 Fix crash on switching comments page at an inopportune time 2020-04-24 18:18:10 +09:00
Dean Herbert
59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders
Implement legacy beatmap encoding for all rulesets
2020-04-24 17:49:34 +09:00
Dean Herbert
fe0038ed14
Merge branch 'master' into fix-mania-placement 2020-04-24 17:00:12 +09:00
Joehu
0f6ec274f9 Add transitions to footer when flowing to another row 2020-04-23 22:44:17 -07:00
Joehu
118db03b56 Fix vertical spacing and score multiplier splitting apart
Also cleans up margin and its hacks (alignment done with anchor/origin now).
2020-04-23 22:41:38 -07:00
Joehu
abb687286b Fix score multiplier being cut off in mod select at higher ui scales 2020-04-23 22:34:00 -07:00
Dan Balasescu
e67ac515fc
Merge branch 'master' into fix-editor-hard-crash 2020-04-24 12:29:48 +09:00
Dean Herbert
131f011239
Merge branch 'master' into all-ruleset-encoders 2020-04-24 11:32:48 +09:00
Dean Herbert
1c13fa6c61 Fix editor crashing when entering with no beatmap selected 2020-04-24 10:27:32 +09:00
smoogipoo
4ebb28d3e7 wip 2020-04-23 17:52:54 +09:00
smoogipoo
6df45164fa Expose direction from scrolling test container 2020-04-23 11:17:16 +09:00
smoogipoo
86ef73aa27 Implement HitObjectContainer.Clear() 2020-04-23 11:16:59 +09:00
smoogipoo
40f11ed15c Resolve broken test scene 2020-04-23 10:37:05 +09:00
smoogipoo
7796593b2c Merge branch 'master' into fix-testbeatmap-rulesetid 2020-04-23 10:35:08 +09:00
Dean Herbert
dd9ceed802
Merge branch 'master' into all-ruleset-encoders 2020-04-22 22:51:42 +09:00
Dean Herbert
97dcd546f1
Merge pull request #8833 from smoogipoo/remove-obsoletes
Remove obsolete nested hitobject methods
2020-04-22 22:40:06 +09:00
smoogipoo
08982e0e00 Ensure editor tests wait for load to complete 2020-04-22 19:49:21 +09:00
smoogipoo
0a34fddcc3 Fix TestBeatmap not setting appropriate ruleset ID 2020-04-22 19:38:27 +09:00
smoogipoo
93151f7612 Add back necessary events + addition to list 2020-04-22 18:32:59 +09:00
smoogipoo
e1142b424d Fix test failures 2020-04-22 18:14:21 +09:00
smoogipoo
8b0274fedd Remove obsolete methods 2020-04-22 17:55:50 +09:00
smoogipoo
9c22d2f1dd Use platform bindings for editor actions 2020-04-22 17:41:24 +09:00
smoogipoo
3b805daa0b Fix hold note end time being written incorrectly 2020-04-22 16:40:07 +09:00
smoogipoo
7cdc9a599c Fix mania holds written as spinners 2020-04-22 16:27:07 +09:00
Dean Herbert
223c822e57
Merge branch 'master' into all-ruleset-encoders 2020-04-22 13:04:16 +09:00
Dean Herbert
aaa0f908d5
Merge pull request #8818 from smoogipoo/fix-beatmap-encoder
Fix beatmap encoder by enabling untested test cases
2020-04-22 13:03:56 +09:00
smoogipoo
07a73ba83c Merge branch 'master' into rulesetstore-ruleset-dir 2020-04-22 10:23:04 +09:00
Dean Herbert
360c9f8e38 Add test coverage and handle null creator 2020-04-22 09:19:34 +09:00
Dean Herbert
0c74f1aaa9 Fix now playing output showing empty brackets when no difficulty specified 2020-04-22 09:08:33 +09:00
smoogipoo
d8fdd73e17 Implement IHasCurve on DrumRoll 2020-04-22 09:06:04 +09:00
smoogipoo
ea0ebc8527 Implement beatmap encoding for all legacy rulesets 2020-04-22 09:06:04 +09:00
smoogipoo
d27ca725f9 Use IEnumerable<T> instead 2020-04-22 09:04:44 +09:00
smoogipoo
516e6a4bb1 Fix overlapping control points not written correctly 2020-04-22 09:04:44 +09:00
smoogipoo
1421e876b1 Remove implicit new combo from spinners 2020-04-22 09:04:44 +09:00
smoogipoo
d8d85e5b08 Don't output certain properties if they don't exist 2020-04-22 09:04:44 +09:00
smoogipoo
3093c3e185 Fix custom sample set not being written correctly 2020-04-22 09:04:44 +09:00
smoogipoo
a702a521f8 Fix not being able to serialise converted beatmaps 2020-04-22 09:04:44 +09:00
Dean Herbert
6193b80589 Update framework 2020-04-21 21:20:57 +09:00
Dean Herbert
231a2b9f81
Merge pull request #8821 from peppy/replace-direct-overlay
Replace direct overlay with new beatmaplisting overlay
2020-04-21 21:19:33 +09:00
Dean Herbert
ed9663985b Rename panels 2020-04-21 20:55:33 +09:00
Dan Balasescu
6e68728ade
Merge branch 'master' into fix-beatmap-listing-focus 2020-04-21 20:05:13 +09:00
smoogipoo
a41ac50e2f Line widths should not receive scale factor 2020-04-21 17:15:06 +09:00
smoogipoo
b8a1831d98 Read line widths from skin 2020-04-21 17:14:04 +09:00
Dean Herbert
9b9b710ded Move and rename remaining direct classes 2020-04-21 16:41:07 +09:00
Dean Herbert
1cec0575b7 Remove unused classes and replace overlay in game 2020-04-21 16:38:47 +09:00
Dean Herbert
594cef1473 Fix BeatmapListingOverlay not taking focus 2020-04-21 16:35:24 +09:00
Dean Herbert
c3b36d8f20
Merge pull request #7924 from EVAST9919/beatmap-listing-expanded
Implement sorting by genre and language in BeatmapListingOverlay
2020-04-21 16:34:59 +09:00
Dean Herbert
aa153290a9
Merge pull request #8815 from smoogipoo/fix-controlpoint-decode
Fix control point overriding working incorrectly
2020-04-21 16:18:50 +09:00
Dean Herbert
eeb7612010 Update DirectOverlay implementation 2020-04-21 15:40:10 +09:00
Dean Herbert
c2ed6491a9 Move and shorten enum names 2020-04-21 15:39:15 +09:00
Dean Herbert
89320b510c Apply class renaming 2020-04-21 15:13:19 +09:00
smoogipoo
fcfb2b9026 Merge branch 'master' into fix-select-new-from-sub-screen 2020-04-21 14:36:53 +09:00
Dean Herbert
1e683fe553
Merge pull request #8814 from smoogipoo/allcontrolpoint-serialisation
Don't serialise AllControlPoints
2020-04-21 14:31:19 +09:00
smoogipoo
72fb34f82c Fix overriding control points incorrectly 2020-04-21 14:19:05 +09:00
smoogipoo
9252b7876b Don't serialise AllControlPoints 2020-04-21 13:58:23 +09:00
Dean Herbert
af32f51116
Merge pull request #8800 from iiSaLMaN/allow-cancelling-completion
Fix results screen pushed after rewinding in-between push delay
2020-04-21 12:49:49 +09:00
Dean Herbert
a91c63819b Refactor updateCompletionState implementation for legibility and code share 2020-04-21 11:55:28 +09:00
Dean Herbert
5a2129da7c
Merge branch 'master' into allow-cancelling-completion 2020-04-21 11:22:37 +09:00
Dan Balasescu
f16ae522b7
Merge branch 'master' into taiko-drumroll-skinning 2020-04-21 11:16:34 +09:00
Dan Balasescu
3b3a7bdd85
Merge branch 'master' into scroll-to-center 2020-04-21 10:21:08 +09:00
Bartłomiej Dach
e3cd3cf1da Convert to auto-properties 2020-04-20 21:43:07 +02:00
Bartłomiej Dach
9b6e26583b Add xmldocs 2020-04-20 21:42:43 +02:00
Lucas A
a541f92682 Resolve ruleset dependencies on game core / framework assemblies by checking already loaded assemblies in AppDomain. 2020-04-20 13:56:15 +02:00
Dean Herbert
a842f17630 Merge branch 'master' into taiko-drumroll-skinning 2020-04-20 20:48:41 +09:00
Dean Herbert
8ebc2ae03d Never run subtree masking 2020-04-20 20:48:35 +09:00
Dan Balasescu
ea77fc222d
Merge pull request #8810 from peppy/fix-web-request-result
Fix inline executions of APIRequest.Perform not getting result populated early enough
2020-04-20 20:23:08 +09:00
Dan Balasescu
6ba1bef683
Merge pull request #8771 from EVAST9919/dashboard-overlay-new
Replace SocialOverlay with DashboardOverlay
2020-04-20 20:22:37 +09:00
Dan Balasescu
4cb57f8205
Merge pull request #8769 from peppy/fix-osu-hidden-mod-alt
Fix spinners being considered the "first object" for increased visibility in hidden
2020-04-20 19:51:15 +09:00
Dean Herbert
cf41b90193 Merge branch 'master' into dashboard-overlay-new 2020-04-20 18:25:47 +09:00