Roman Kapustin
0ea4e221b2
Merge branch 'master' into net5.0
2021-01-14 14:02:51 +03:00
Dean Herbert
862cb1412c
Merge pull request #11410 from frenzibyte/user-beatmap-downloading-states
...
Add change state methods for multiplayer user beatmap availability
2021-01-14 18:42:26 +09:00
Dean Herbert
6eca8eac65
Merge pull request #11479 from smoogipoo/fix-judgement-1-frame-issue
...
Fix default judgement text mispositioned for one frame
2021-01-14 13:14:50 +09:00
smoogipoo
d5878db615
Fix default judgement text mispositioned for one frame
2021-01-14 12:33:33 +09:00
Dan Balasescu
98858d2a9a
Merge pull request #11476 from bdach/revert-low-ar-buff
...
Revert overlooked AR<8 speed buff
2021-01-14 11:13:37 +09:00
Salman Ahmed
95acc457aa
Fix stupid mistake
...
fuck.
2021-01-13 22:35:21 +03:00
Salman Ahmed
560b1e970c
Merge branch 'master' into user-beatmap-downloading-states
2021-01-13 22:31:31 +03:00
Bartłomiej Dach
398f8762b1
Merge pull request #11474 from frenzibyte/rename-downloaded-state
...
Rename download state `Downloaded` to `Importing`
2021-01-13 20:31:03 +01:00
Bartłomiej Dach
1ba586a683
Revert overlooked AR<8 speed buff
...
Pull request #11107 introduced changes in osu! performance calculation,
related to a scaling coefficient applied to the speed and aim skills.
The coefficient in question was dependent on the approach rate of
a map. During a post-merge review of that PR, it was spotted that
the scaling coefficient for speed also had a 10x buff applied for AR<8,
which could reach magnitudes as large as 80% on AR0, which seems quite
exorbitant. This change was not discussed or mentioned anywhere in the
review process.
Revert back to the old multiplier of 0.01 rather than 0.1 for AR<8. The
negative slope through AR0 to 8 is retained in its previous form.
2021-01-13 17:59:29 +01:00
Salman Ahmed
1f12b2bd09
Rename download state Downloaded to Importing
2021-01-13 18:04:53 +03:00
Dean Herbert
10fd4cf7c9
Merge pull request #11467 from bdach/fix-multiplayer-non-host-crash
...
Fix non-hosts crashing on load requested
2021-01-13 11:38:59 +09:00
Bartłomiej Dach
2d3cacca11
Fix non-hosts crashing on load requested
...
`onLoadRequested()` always released the `readyClickOperation` ongoing
operation, without checking whether it actually needs to/should (it
should only do so if the action initiating the operation was starting
the game by the host). This would crash all other consumers, who already
released the operation when their ready-up operation completed server
side.
To resolve, relax the constraint such that the operation can be ended
multiple times in any order. At the end of the day the thing that
matters is that the operation is done and the ready button is unblocked.
2021-01-13 00:58:53 +01:00
Bartłomiej Dach
becd52b5d2
Merge pull request #11465 from smoogipoo/fix-taiko-conversion-2
2021-01-12 20:43:37 +01:00
smoogipoo
9a22df2b88
Fix BPM multiplier not working in all cases
2021-01-12 17:50:22 +09:00
smoogipoo
22a0f99f35
Add failing test
2021-01-12 17:49:21 +09:00
Bartłomiej Dach
0d5fbb15ac
Fix up code comments
...
Default value restated in xmldoc was snipped because it's made redundant
by the initialiser and possibly bound to be outdated at some point.
2021-01-11 20:31:52 +01:00
Salman Ahmed
90fb67b377
Update code in-line with decided direction
2021-01-11 20:52:24 +03:00
Dean Herbert
dd809df076
Merge pull request #11118 from MiraiSubject/tourney-switching-ui
...
Add the ability to switch tournaments to the SetupScreen
2021-01-11 16:36:45 +09:00
Dean Herbert
f65042cf44
Add missing licence headers
2021-01-11 15:47:27 +09:00
Dean Herbert
c9466426b7
Change field to local variable
2021-01-11 14:45:01 +09:00
Dean Herbert
7a7c583ded
Move setup screen classes out of single file and into their own namespace
2021-01-11 14:44:07 +09:00
Dean Herbert
bd627534b7
Use disabled state instead of hiding button
2021-01-11 14:38:51 +09:00
Dean Herbert
ba3a7a0501
Clean up code
2021-01-11 14:38:42 +09:00
Dean Herbert
49057e8cbc
Cache TournamentStorage explicitly for better safety
2021-01-11 14:38:42 +09:00
Salman Ahmed
2286e3679f
Downloaded -> Importing
2021-01-11 08:21:07 +03:00
Salman Ahmed
a8dfa5e2a9
Rename typo'd method
2021-01-11 08:04:00 +03:00
Salman Ahmed
e99310b59c
Add JsonConstructor attribute
2021-01-11 08:02:57 +03:00
Dean Herbert
2abeda5e0f
Merge pull request #11447 from bdach/fix-play-button-crashes
...
Fix track previews crashing on completion
2021-01-11 03:10:18 +09:00
Dean Herbert
d2ca6da0fd
Remove unused constant
2021-01-11 01:56:09 +09:00
Dean Herbert
bd37723788
Expose as IBindable for added safety
2021-01-11 01:55:54 +09:00
Dean Herbert
e4eb44df6e
Merge branch 'master' into fix-play-button-crashes
2021-01-11 01:46:41 +09:00
Shivam
f466791b69
Move assignments to the TournamentSwitcher component
...
This also adds conditional checks for displaying the "Close osu!" button
2021-01-10 17:34:20 +01:00
Shivam
959696c296
Merge branch 'master' into tourney-switching-ui
2021-01-10 17:34:03 +01:00
Shivam
e5c670f843
Merge branch 'master' into tourney-switching-ui
2021-01-10 17:33:52 +01:00
Bartłomiej Dach
b79e8d0192
Merge pull request #11386 from frenzibyte/fix-mod-buttons-not-copying-settings
2021-01-10 16:37:25 +01:00
Bartłomiej Dach
d110ed9e95
Merge branch 'master' into fix-mod-buttons-not-copying-settings
2021-01-10 15:42:33 +01:00
Bartłomiej Dach
e006891db0
Merge pull request #11452 from bdach/ongoing-operation-tracker-safety
2021-01-10 15:41:13 +01:00
Bartłomiej Dach
4b4adc927c
Rename param to match method body
2021-01-10 15:35:53 +01:00
Dean Herbert
4e32b0d6de
Merge branch 'master' into ongoing-operation-tracker-safety
2021-01-10 23:05:03 +09:00
Dean Herbert
95ad324a39
Merge branch 'master' into fix-mod-buttons-not-copying-settings
2021-01-10 23:01:54 +09:00
Dean Herbert
556dc11da7
Merge pull request #11392 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.2
...
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 3.3.1 to 3.3.2
2021-01-10 16:18:02 +09:00
Dean Herbert
e81f9e358e
Merge pull request #11448 from bdach/fix-editor-enter-crash
...
Fix editor crashing on enter if login overlay was previously opened
2021-01-10 12:59:47 +09:00
Bartłomiej Dach
8c3955d341
Improve safety of ongoing operation tracker
...
Finishing an operation started via
`OngoingOperationTracker.BeginOperation()` was risky in cases where the
operation ended at a callback on another thread (which, in the case of
multiplayer, is *most* cases). In particular, if any consumer registered
a callback that mutates transforms when the operation ends, it would
result in crashes after the framework-side safety checks.
Rework `OngoingOperationTracker` into an always-present component
residing in the drawable hierarchy, and ensure that the
`operationInProgress` bindable is always updated on the update thread.
This way consumers don't have to add local schedules in multiple places.
2021-01-09 22:45:24 +01:00
Dean Herbert
c8d83a9fb3
Merge pull request #11353 from bdach/disable-repeat-multi-actions
...
Disable multiplayer action buttons after clicks to prevent double operations
2021-01-09 17:42:38 +09:00
Dean Herbert
b69fe8a274
Merge branch 'master' into disable-repeat-multi-actions
2021-01-09 10:15:20 +09:00
Bartłomiej Dach
c1ef05af82
Merge branch 'master' into dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.3.2
2021-01-08 22:36:03 +01:00
Salman Ahmed
0aad0c7c6c
Target logic at this and adjust variables
2021-01-09 00:31:18 +03:00
Bartłomiej Dach
ff60d652ed
Move out test ongoing operation tracker to higher level
2021-01-08 22:28:21 +01:00
Salman Ahmed
375ecf92ed
Merge remote-tracking branch 'upstream/master' into fix-mod-buttons-not-copying-settings
2021-01-09 00:26:18 +03:00
Bartłomiej Dach
c2eeb822b8
Rename {joiningRoom -> operationInProgress}
2021-01-08 22:23:38 +01:00
