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

34652 Commits

Author SHA1 Message Date
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]
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
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
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
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
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
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
Dan Balasescu
c0a9d88a14
Merge branch 'master' into settings-reduce-visual-clutter 2020-11-30 19:30:39 +09:00
Dan Balasescu
6c6540addf
Merge pull request #11008 from peppy/settings-remove-transparency
Remove semi-transparent backgrounds from settings and notifications overlays
2020-11-30 19:29:53 +09:00
Dean Herbert
7f34e11467
Merge pull request #10962 from smoogipoo/improve-dho-time-offsets
Fix judgement offsets in non-framestable contexts
2020-11-30 19:13:25 +09:00
Dean Herbert
3ad2eeaff5 Fix outdated xmldoc 2020-11-30 18:35:30 +09:00
Dean Herbert
c17d67bc7d Merge branch 'master' into editor-beat-snap-always 2020-11-30 18:34:38 +09:00
Dan Balasescu
b56e832e83
Merge pull request #10950 from ekrctb/pool-scrolling
Support hit object pooling in ScrollingPlayfield
2020-11-30 18:29:34 +09:00
smoogipoo
fdef6e479c Remove 1000ms offset and adjust comment 2020-11-30 18:28:04 +09:00
smoogipoo
8f48389f89 Merge branch 'master' into improve-dho-time-offsets 2020-11-30 18:01:48 +09:00
Dan Balasescu
3ddba8e5b3
Merge pull request #10973 from peppy/song-select-track-selected-better-2
Improve scroll tracking of selected item
2020-11-30 17:59:42 +09:00
Dean Herbert
965cc1f511 Remove unnecessary usings #2 2020-11-30 17:57:25 +09:00
Dean Herbert
46cab04929 Merge branch 'settings-remove-transparency' into settings-reduce-visual-clutter 2020-11-30 17:57:10 +09:00
Dan Balasescu
a3ef858f3a
Remove unnecessary multiplication 2020-11-30 17:56:04 +09:00
Dean Herbert
fe48b2279c Adjust various paddings and spacings in settings to make them easier to visually parse 2020-11-30 17:50:35 +09:00
Dean Herbert
a3dd22f5c2 Merge branch 'master' into settings-remove-transparency 2020-11-30 17:50:26 +09:00
Dean Herbert
bf2c6dc241 Remove unused usings rider couldn't see 2020-11-30 17:49:55 +09:00
smoogipoo
7ac2fba127 More reordering of public vs private methods 2020-11-30 17:44:58 +09:00
Dan Balasescu
b0637cebd1
Merge branch 'master' into song-select-track-selected-better-2 2020-11-30 17:26:15 +09:00
Dan Balasescu
52cb30dff2
Merge pull request #10999 from bdach/user-interface-settings-section
Create "User Interface" settings section
2020-11-30 17:25:04 +09:00
Dan Balasescu
8b5733c9aa
Merge pull request #10979 from ekrctb/fruit-bindables
Add bindables for osu!catch hit object states
2020-11-30 17:24:56 +09:00
Dean Herbert
a4e061cb11 Remove semi-transparent backgrounds from settings and notifications overlays
I tried also updating the colours to the "new" versions from designs but
they don't match due to colour profile differences (so I'm not yet sure
if they are correct or not) and also don't look great without all the UI
elements also being updated.
2020-11-30 17:19:55 +09:00