Commit Graph

21762 Commits

Author SHA1 Message Date
51840121b9 Merge branch 'master' into update-framework 2020-12-12 13:02:34 +01:00
f20c5a2bda Update framework (again) 2020-12-12 15:29:26 +09:00
d457926523 Merge branch 'master' into fix-player-load-stuck-at-empty-screen 2020-12-11 20:49:27 +01:00
01833e8c9b Merge branch 'master' into fix-single-threaded-seeking 2020-12-11 20:14:28 +01:00
31ae79a140 Merge pull request #11149 from peppy/add-cache-suffix-online-db
Add a simple cache-busting query string to online.db retrieval
2020-12-11 20:20:52 +09:00
b5f6baf341 Update framework 2020-12-11 18:03:48 +09:00
a35060ea7a Add a simple cache-busting query string to online.db retrieval
As we are finally pushing updates for this database, this adds a minimum
level of guarantee that a client will request a new version (without
having to worry about multiple levels of server-side caching).
2020-12-11 17:56:02 +09:00
2dd5911256 Rename method to better match purpose 2020-12-11 14:44:01 +09:00
01bd765384 Simplify pause handling by moving transform logic to bindable change event 2020-12-10 17:42:47 +09:00
679a550d83 Fix single threaded seeking not working due to unnecessary seek call 2020-12-10 17:42:28 +09:00
437c0506ce Refactor to allow for special disposal handling to still work 2020-12-10 16:56:56 +09:00
67dd7be71a Move cancelLoad call to OnResuming
This has no real effect; it just feels more readable to me.
2020-12-10 16:34:59 +09:00
491ab74059 Schedule pushWhenLoaded once ever
Previously it was being scheduled another time each OnResume, resulting
in more and more calls as a user retries the same beatmap multiple
times.

To simplify things I've decided to just schedule once ever. This means
that on resuming there's no 400ms delay any more, but in testing this
isn't really an issue (load time is still high enough that it will never
really be below that anyway). Even if gameplay was to load faster, the
animation should gracefully proceed.
2020-12-10 16:33:30 +09:00
cc996ec7fc Ensure player is consumed at the point of scheduled push running the first time 2020-12-10 16:32:14 +09:00
f9afb7f335 Merge branch 'master' into archive-model-manager-stream-import-support 2020-12-08 16:11:11 +09:00
58d7e41978 Enable nullable on ImportTask 2020-12-08 12:52:34 +09:00
77279a7e56 Update stale xmldoc on import method
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-12-08 12:48:59 +09:00
10c1823534 Remove now unused files 2020-12-07 22:07:11 +09:00
34f3672750 Make ctor protected 2020-12-07 22:04:41 +09:00
f599427080 Implement TimeshiftFilterControl 2020-12-07 22:04:35 +09:00
1b3836aeef Re-implement multiplayer FilterControl 2020-12-07 21:59:26 +09:00
5be0672fe9 Split out enums 2020-12-07 21:54:42 +09:00
fa65874763 Limit room name to 100 characters 2020-12-07 21:09:38 +09:00
87da6b3270 Merge pull request #11113 from ekrctb/fix-scrolling-wrong-layout-one-frame
Fix scrolling hit object displayed in wrong position for one frame
2020-12-07 18:48:24 +09:00
cdc7ef8c15 Merge pull request #10925 from peppy/fix-multiple-playback-on-skin-change
Fix skinnable sounds playing more than once on skin change
2020-12-07 18:45:19 +09:00
eb38bc4b4c Add the ability to import into ArchiveModelManagers from a stream 2020-12-07 18:09:18 +09:00
a548269c34 Fix scrolling hit object displayed in wrong position for one frame 2020-12-07 17:26:12 +09:00
a5e2509d52 Merge pull request #11105 from Joehuu/mod-settings-fade-in/out
Add fade in/out animations to mod settings container
2020-12-07 17:12:29 +09:00
454e94574c Add corner rounding and positional transform 2020-12-07 16:43:07 +09:00
7253866e17 Move customisation panel to be in same area as main content 2020-12-07 16:42:55 +09:00
f4eb17d398 Update osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
Set mouse confine mode at initialization

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-12-07 16:09:14 +09:00
2469608c10 Fix possible null reference due to bindable change before variable is initialized 2020-12-07 15:19:18 +09:00
0f9b38da08 Add fade in/out animations to mod settings container 2020-12-06 11:35:14 -08:00
f6d15b9757 Invert back-to-front logic 2020-12-06 18:59:38 +01:00
fcd9483ffa Merge branch 'master' into fix-multiple-playback-on-skin-change 2020-12-06 18:21:24 +01:00
71edada623 Hide confine setting entirely in fullscreen 2020-12-05 22:15:41 +01:00
08f23cc424 Revert leasing logic 2020-12-05 22:15:41 +01:00
0a745144e3 Disable confine mode dropdown when full-screen
After hard-locking the mouse confine mode to `Always` in full-screen to
prevent confine issues from popping up, the confine mode dropdown in
settings had confusing UX due to seemingly having no effect when
full-screen.
2020-12-05 13:49:09 +01:00
9064ca9064 Merge pull request #11066 from ekrctb/fix-sample-expire
Fix DrawableHitObjects potentially expiring before their hit samples finish playback
2020-12-04 21:52:36 +09:00
7c0edb796e Always confine mouse to screen when running fullscreen 2020-12-04 20:49:18 +09:00
b8c284b34f Fix one more key binding string not being sentence cased 2020-12-04 00:51:46 -08:00
a0f92628ac Merge branch 'master' into fix-sample-expire 2020-12-04 13:49:08 +09:00
48c42e4247 Merge pull request #11083 from LittleEndu/recommend-if-filtered
Select recommended beatmap if last selection is filtered
2020-12-04 13:22:34 +09:00
5ded4b9faa Merge branch 'master' into dho-remove-onparentreceived 2020-12-04 11:04:56 +09:00
15d9147edd Ensure equality member consistency for SampleInfo
The previous implementation of `SampleInfo`'s equality members was not
completely correct in its treatment of the `sampleNames` array. While
`Equals()` compared the values of `sampleNames` using `SequenceEqual()`,
therefore performing a structural check that inspects the contents of
both arrays, `GetHashCode()` used `HashCode.Combine()` directly on the
arrays, therefore operating on reference equality. This could cause the
pooling mechanism of samples to fail, as pointed out in #11079.

To resolve, change the `GetHashCode()` implementation such that it also
considers the contents of the array rather than just the reference to
the array itself. This is achieved by leveraging
`StructuralEqualityComparer`.

Additionally, as a bonus, an array sort was added to the constructor of
`SampleInfo`. This is intended to be a "canonicalisation" processing
step for the array of sample names. Thanks to that sort, two instances
of `SampleInfo` that have the same sample names but permutated will also
turn out to be equal and have the same hash codes, given the
implementation of both equality members. This gives `SampleInfo`
set-like semantics.
2020-12-03 23:25:53 +01:00
c25e2c3dd5 Select recommended beatmap if last selection is filtered 2020-12-03 23:13:14 +02:00
1d92800761 Merge pull request #11068 from peppy/fix-carousel-edge-masking
Fix beatmap carousel panels getting masked away when out of scroll bounds
2020-12-03 20:40:44 +09:00
0bdf99b97a Remove OnParentReceived() 2020-12-03 20:08:42 +09:00
73e99718bc Change order of OnParentReceived() 2020-12-03 20:06:26 +09:00
37d550f42a Merge pull request #11035 from smoogipoo/add-playlist-length 2020-12-03 18:39:54 +09:00