RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,127 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

36127 Commits

Author SHA1 Message Date
Andrei Zavatski 70420b56d3 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-refactor 2021-01-18 20:09:51 +03:00
Dean Herbert e74ecebfd6
nuget restore other rulesets 2021-01-18 23:45:57 +09:00
Dean Herbert fda271d9d9
Merge pull request #11520 from frenzibyte/fix-item-download-button 
Fix playlist item download button never shown back after hiding
 2021-01-18 23:37:33 +09:00
Dean Herbert 000c7dd07b
Merge pull request #11502 from peppy/fix-spinner-spinning-weirdness 
Fix some issues with spinner spin sound
 2021-01-18 22:50:32 +09:00
Dean Herbert dcb92e5b38
Merge pull request #11529 from peppy/fix-android-release 
Restore nuget packages per project to avoid toolchain incompatibilities
 2021-01-18 22:04:19 +09:00
Dean Herbert ced7a36788 Update namespaces 2021-01-18 21:24:10 +09:00
Dean Herbert 12443e39ae Update framework 2021-01-18 19:16:32 +09:00
Dan Balasescu 95963f2fa2
Merge pull request #11526 from peppy/fix-editor-repeat-slider-adjustment 
Fix sliders with an even number of repeats not allowing rotation/scale transforms
 2021-01-18 18:56:25 +09:00
Dean Herbert 707d5346c9 Merge branch 'master' into fix-spinner-spinning-weirdness 2021-01-18 18:26:44 +09:00
Dean Herbert 46681322d0 Restore nuget packages per project to avoid toolchain incompatibilities with net50 2021-01-18 17:56:00 +09:00
Dean Herbert 1359153382 Revert "Test removing nuget restore from iOS/Android build scripts" 
This reverts commit 39746cb3de.
 2021-01-18 17:54:22 +09:00
Dan Balasescu 7e30489167
Merge pull request #11525 from peppy/fix-editor-selection-box-non-visible-hitobjects 
Fix selection box not updating with hitcircles/sliders far in the future or past
 2021-01-18 17:34:25 +09:00
Dean Herbert 2f1d4bf51b Add missing braces 2021-01-18 17:13:47 +09:00
Andrei Zavatski 6e34ab5d15 Rename WebOverlay to OnlineOverlay 2021-01-18 11:13:38 +03:00
Andrei Zavatski b27b18f70f Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-refactor 2021-01-18 11:10:55 +03:00
Dean Herbert c79ab63743 Fix sliders with an even number of repeats not allowing rotation/scale transforms 2021-01-18 16:59:16 +09:00
Dean Herbert 02d2b2742b Fix selection box not updating with hitcircles/sliders far in the future or past 2021-01-18 16:57:36 +09:00
Andrei Zavatski 27ffc98445 Implement WebOverlay component 2021-01-18 10:48:12 +03:00
Dean Herbert 30f3e72c42
Merge pull request #11469 from Mysfit/beatmap-colour-setting 
Add ability to toggle beatmap colours separate from skins
 2021-01-18 16:46:53 +09:00
Dean Herbert 94fee8c31d Avoid doing a config lookup if initial conditional fails 2021-01-18 16:13:58 +09:00
Dean Herbert 1364de1166
Merge branch 'master' into beatmap-colour-setting 2021-01-18 16:07:46 +09:00
Dean Herbert 7b4f73eb8c
Merge pull request #11523 from smoogipoo/nupkg-rulesets 
Add nuget deploys for all rulesets
 2021-01-18 11:47:30 +09:00
smoogipoo 1b166d809e Adjust package titles 2021-01-18 11:08:03 +09:00
smoogipoo ec00aaef90 Add nuget deploys for all rulesets 2021-01-18 10:53:31 +09:00
Bartłomiej Dach 2b23c8eabd Use alpha directly for checking visibility in test 
`IsPresent` is no longer synonymous with being visible, after applying
the fix to the issue in question.
 2021-01-17 18:08:58 +01:00
Salman Ahmed 585aa87c53 Fix playlist item download button never shown back after hiding 2021-01-17 19:17:14 +03:00
Dean Herbert 39746cb3de
Test removing nuget restore from iOS/Android build scripts 2021-01-18 00:11:35 +09:00
Dean Herbert 5e0fcc4a6c
Merge pull request #11473 from frenzibyte/explicit-search-control 
Add "explicit maps" search filter control to beatmap listing
 2021-01-17 23:27:15 +09:00
Dean Herbert a9568e713a
Merge pull request #11519 from bdach/fix-android-multi-broken 
Fix android users not being able to join multiplayer rooms
 2021-01-17 23:24:05 +09:00
Dean Herbert 5278cad393 Reword setting to make more sense 2021-01-17 22:42:48 +09:00
Dean Herbert 5fd644fc57 Unify variable names 2021-01-17 22:42:48 +09:00
Bartłomiej Dach eb53e32792 Use task completion source for room join flow 
On Android, users were unable to join or create multiplayer rooms. The
root cause of that was that the both the wait and set of the
`ManualResetEvent` in `getRoomUsers` occurred on the same thread, which
created a chicken-and-egg situation - the set could not proceed until
the wait had actually completed.

Resolve by substituting the `ManualResetEvent` for a
`TaskCompletionSource` to achieve a promise-style task, which the
previous code was a crude approximation of anyway.

Closes #11385.
 2021-01-17 14:40:22 +01:00
Dean Herbert addd463d26
Merge branch 'master' into explicit-search-control 2021-01-17 21:44:25 +09:00
Dean Herbert edb6d3907b
Merge pull request #11472 from frenzibyte/explicit-beatmap-markers 
Add explicit content markers to beatmap panels and overlay
 2021-01-17 21:44:10 +09:00
Bartłomiej Dach 1dc2af57a6
Merge pull request #11212 from Game4all/android-multiple-import-support-suppot 
Add ability to import multiple files at once on android
 2021-01-17 00:44:50 +01:00
Bartłomiej Dach 816cc7a59b Adjust explicit label spacing on beatmap set overlay 2021-01-17 00:35:23 +01:00
Bartłomiej Dach dee46d7ba2 Use GroupBy() instead 2021-01-16 23:42:28 +01:00
Bartłomiej Dach bb0d289993 Split variable for readability 2021-01-16 23:24:28 +01:00
Bartłomiej Dach 1d7be6a604 Merge branch 'master' into android-multiple-import-support-suppot 2021-01-16 23:13:11 +01:00
Bartłomiej Dach ffe2a710d9
Merge pull request #10926 from UselessToucan/net5.0 
Target .NET 5
 2021-01-16 16:38:19 +01:00
Bartłomiej Dach c80e9c08fd
Merge branch 'master' into net5.0 2021-01-16 16:07:44 +01:00
Mysfit a3535f4b79 Further simplified beatmap colouring tests. 2021-01-16 02:09:35 -05:00
Mysfit 112967c1e8 Created base class for testing beatmap colours. 2021-01-15 23:46:46 -05:00
Bartłomiej Dach daaf9f701f
Merge pull request #11496 from peppy/fix-judgement-animation-conditional 2021-01-15 22:59:55 +01:00
Bartłomiej Dach d9b671667b Merge branch 'master' into fix-judgement-animation-conditional 2021-01-15 22:10:17 +01:00
Bartłomiej Dach 3c1a86d11d Trim braces for consistency 2021-01-15 22:04:45 +01:00
Bartłomiej Dach eb40d3a5ba
Merge pull request #11501 from peppy/fix-spinner-test-not-playing-samples 2021-01-15 20:25:57 +01:00
Bartłomiej Dach 27db01b533
Merge branch 'master' into fix-spinner-test-not-playing-samples 2021-01-15 19:52:54 +01:00
Dan Balasescu 778efc5108
Merge pull request #11498 from peppy/fix-editor-timeline-scroll-snapping 
Fix editor timeline not snapping on non-precise wheel scroll
 2021-01-15 18:16:04 +09:00
Dean Herbert 14b3323682 Use OnComplete instead of Finally to avoid potentially stopping on aborted transforms 2021-01-15 17:18:15 +09:00