1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Commit Graph

34672 Commits

Author SHA1 Message Date
Dean Herbert
0cd404b6d3
Merge pull request #11051 from smoogipoo/update-dependencies
Update dependencies
2020-12-02 12:56:29 +09:00
Dan Balasescu
be3fed3072
Merge pull request #11024 from peppy/fix-slider-point-drag-offset
Fix slider control point dragging not correctly accounting for drag deadzone
2020-12-02 11:10:06 +09:00
Dan Balasescu
8dfe3a21cc
Merge pull request #11025 from peppy/editor-slider-control-point-scaling
Scale slider control point display in line with circle size
2020-12-02 11:06:00 +09:00
Dan Balasescu
fdda928979
Merge pull request #11030 from peppy/osu-fix-slider-playing-animations-on-miss
Fix sliders playing hit animations when completely missed
2020-12-02 11:02:51 +09:00
Dan Balasescu
878ded4dd6
Merge pull request #11032 from peppy/editor-fix-ticks-updating-after-timing-change
Fix timeline not updating ticks correctly after arbitrary timing control point changes
2020-12-02 10:58:44 +09:00
smoogipoo
8ac2f7d8cb Merge remote-tracking branch 'upstream/dependabot/nuget/System.IO.Packaging-5.0.0' into update-dependencies 2020-12-02 10:38:46 +09:00
smoogipoo
cca8dedfc5 Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.Build.Traversal-3.0.2' into update-dependencies 2020-12-02 10:37:46 +09:00
smoogipoo
9ac310c1c4 Merge remote-tracking branch 'upstream/dependabot/nuget/Dapper-2.0.78' into update-dependencies 2020-12-02 10:37:40 +09:00
smoogipoo
84a6908139 Merge remote-tracking branch 'upstream/dependabot/nuget/DiscordRichPresence-1.0.166' into update-dependencies 2020-12-02 10:37:26 +09:00
smoogipoo
4a5b707104 Merge remote-tracking branch 'upstream/dependabot/nuget/Sentry-2.1.8' into update-dependencies 2020-12-02 10:37:21 +09:00
smoogipoo
3422e046da Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.NET.Test.Sdk-16.8.0' into update-dependencies 2020-12-02 10:37:21 +09:00
smoogipoo
728574f0c7 Merge remote-tracking branch 'upstream/dependabot/nuget/System.ComponentModel.Annotations-5.0.0' into update-dependencies 2020-12-02 10:37:19 +09:00
Dan Balasescu
746a6200d3
Merge pull request #11048 from bdach/mark-test-scene-as-abstract
Mark OsuModTestScene as abstract
2020-12-02 10:34:46 +09:00
Dan Balasescu
9d71095a2b
Merge pull request #11004 from Yoyolick/master
Add ability to customise key binding for in-game overlay toggle
2020-12-02 10:34:24 +09:00
Dan Balasescu
1857401159
Merge pull request #11050 from Pennek/object-size
Modify object size to include 0-10 range
2020-12-02 10:28:57 +09:00
dependabot-preview[bot]
989ddd40b4
Bump System.ComponentModel.Annotations from 4.7.0 to 5.0.0
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:13 +00:00
dependabot-preview[bot]
249793d10a
Bump Sentry from 2.1.6 to 2.1.8
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 2.1.6 to 2.1.8.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/2.1.6...2.1.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:09 +00:00
dependabot-preview[bot]
5772a0811c
Bump Microsoft.NET.Test.Sdk from 16.7.1 to 16.8.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.7.1 to 16.8.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.7.1...v16.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:09 +00:00
dependabot-preview[bot]
8a65328a6d
Bump DiscordRichPresence from 1.0.150 to 1.0.166
Bumps [DiscordRichPresence](https://github.com/Lachee/discord-rpc-csharp) from 1.0.150 to 1.0.166.
- [Release notes](https://github.com/Lachee/discord-rpc-csharp/releases)
- [Commits](https://github.com/Lachee/discord-rpc-csharp/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:08 +00:00
dependabot-preview[bot]
64dfa9f928
Bump Dapper from 2.0.35 to 2.0.78
Bumps [Dapper](https://github.com/StackExchange/Dapper) from 2.0.35 to 2.0.78.
- [Release notes](https://github.com/StackExchange/Dapper/releases)
- [Commits](https://github.com/StackExchange/Dapper/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:06 +00:00
dependabot-preview[bot]
aac20eef44
Bump System.IO.Packaging from 4.7.0 to 5.0.0
Bumps [System.IO.Packaging](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:05 +00:00
dependabot-preview[bot]
a9003466e3
Bump Microsoft.Build.Traversal from 2.2.3 to 3.0.2
Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.2.3 to 3.0.2.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.2.3...Microsoft.Build.Traversal.3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-02 00:56:05 +00:00
Dean Herbert
f5ae8fac9a
Merge pull request #11036 from ppy/dependabot/nuget/Microsoft.Win32.Registry-5.0.0
Bump Microsoft.Win32.Registry from 4.7.0 to 5.0.0
2020-12-02 09:54:44 +09:00
Pennek
477de1bab0 change min/max values 2020-12-02 01:11:24 +01:00
Bartłomiej Dach
c9429632f4 Resolve new NRE inspections 2020-12-01 22:39:10 +01:00
Bartłomiej Dach
03f5460dd2 Mark OsuModTestScene as abstract 2020-12-01 21:57:16 +01:00
Bartłomiej Dach
94a8784e04 Allow editor change handler to be null 2020-12-01 20:08:31 +01:00
dependabot-preview[bot]
b236c75ac8
Bump Microsoft.Win32.Registry from 4.7.0 to 5.0.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-01 17:32:24 +00:00
Dean Herbert
76035718bb
Merge pull request #11034 from peppy/update-framework
Update framework (with SDL2 default)
2020-12-01 18:32:10 +09:00
Dan Balasescu
1cea39ed55
Merge pull request #11017 from peppy/fix-song-select-temporary-selection-loss
Fix current beatmap temporarily becoming empty during ruleset change
2020-12-01 17:55:08 +09:00
Dean Herbert
285e62be9a Bring code in line with SDL2 defaults 2020-12-01 17:47:07 +09:00
Dean Herbert
d5a60ed335 Update framework 2020-12-01 17:30:42 +09:00
Dean Herbert
190c6ef45e Fix timeline not updating ticks correctly after arbitrary timing control point changes 2020-12-01 16:44:08 +09:00
Dean Herbert
dd05c56a08 Fix sliders playing hit animations when completely missed 2020-12-01 15:34:29 +09:00
Dean Herbert
6b79d96517
Merge pull request #11023 from ekrctb/pool-catch-hit-explosion
Pool osu!catch hit explosion
2020-12-01 15:19:44 +09:00
ekrctb
a16b265090 Apply suggested styling changes 2020-12-01 14:46:04 +09:00
Dean Herbert
b256c54619 Scale slider control point display in line with circle size 2020-12-01 14:17:36 +09:00
Dean Herbert
a147b7186d Remove unnecessary call to updateVisibility 2020-12-01 14:01:34 +09:00
Dean Herbert
63ff722963 Fix code formatting 2020-12-01 14:00:54 +09:00
Dean Herbert
c8c1848bb8 Fix slider control point dragging not correctly accounting for drag deadzone 2020-12-01 13:46:30 +09:00
smoogipoo
5945c088cb A few code standard cleanups 2020-12-01 12:57:37 +09:00
Ryan Zmuda
8f6607ffec
Merge branch 'master' into master 2020-11-30 21:42:15 -05:00
Ryan Zmuda
e102f2e8fa Moved enum to bottom, change defualt bind to Shift-Tab, Fixed Notification 2020-11-30 21:38:16 -05:00
ekrctb
08cb84b325 Pool osu!catch hit explosion 2020-12-01 11:32:20 +09:00
Bartłomiej Dach
76919a5772
Merge pull request #10974 from peppy/editor-beat-snap-always
Fix editor not beat snapping when positional snap is unavailable
2020-11-30 19:13:06 +01:00
Bartłomiej Dach
5fbe1823a0
Merge branch 'master' into editor-beat-snap-always 2020-11-30 18:39:22 +01:00
Dean Herbert
07e14b1267 Disable unnecessary inspection 2020-12-01 01:37:53 +09:00
Bartłomiej Dach
ff8f030cf1
Merge pull request #11009 from peppy/settings-reduce-visual-clutter
Attempt to reduce settings visual clutter with better paddings
2020-11-30 17:25:43 +01:00
Dean Herbert
b401259f84 Add test coverage 2020-12-01 01:19:39 +09:00
Dean Herbert
a852a27dfb Fix current beatmap temporarily becoming empty during ruleset change
When changing the ruleset at song select, there was a scenario where it
would be set to default (empty) for one debounce length where this was
not actually required. This occurs when the currently selected beatmap
set has other difficulties which match the target ruleset, specifically.
2020-11-30 19:36:30 +09:00