Commit Graph

15377 Commits

Author SHA1 Message Date
9ebad16436 Fix logic regression 2019-12-11 14:37:10 +09:00
77b9989e11 Fix some weird private field names 2019-12-11 14:10:35 +09:00
f6c0b5c44a Merge branch 'master' into settings-source 2019-12-10 18:49:41 +09:00
efc3b7fc9f Merge branch 'master' into fix-settings-bindable-logic 2019-12-10 18:30:27 +09:00
55c938e5da Fix bindable usage 2019-12-10 18:08:24 +09:00
65f2d1f875 Update framework 2019-12-10 17:49:42 +09:00
f7f4a57c5f Update bindable types in line with framework 2019-12-10 16:48:24 +09:00
609c511309 Update framework 2019-12-10 16:43:58 +09:00
bd6a08a21b Merge branch 'master' into apply-to-track 2019-12-10 16:15:24 +09:00
5f3d163772 Merge branch 'master' into segmented-slider-paths-3 2019-12-10 14:28:20 +09:00
ab0f2e7c6a Apply suggested refactorings 2019-12-10 13:12:54 +09:00
cdde5d1d69 Fix song select filters not reapplied if in a child screen
Closes https://github.com/ppy/osu/issues/6980.
2019-12-10 02:30:23 +09:00
dc9775742c Fix incorrect code migration
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-12-10 02:23:17 +09:00
47f3c4a596 Don't serialise path version 2019-12-09 20:18:18 +09:00
ad1fb3bda2 Remove IComparable in constraint. 2019-12-09 17:48:41 +08:00
c3518a2b94 Enum constraint for enum dropdown. 2019-12-09 17:45:26 +08:00
40a5c1fd96 Constrain transformable with class. 2019-12-09 17:45:26 +08:00
04b3297a05 Constrain configuration lookup as enum. 2019-12-09 17:45:26 +08:00
cd61893814 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 18:25:27 +09:00
6d9cd0fafe Split out complex method 2019-12-09 18:25:13 +09:00
b6e2738236 Remove unused using 2019-12-09 18:15:00 +09:00
d650bfb6d6 Remove unnecessary cast 2019-12-09 18:05:14 +09:00
a1798fd38d Fix bad ctor implementation 2019-12-09 18:01:13 +09:00
bfbb9aa18e Remove outdated assert 2019-12-09 18:01:02 +09:00
c39d2f006c Merge branch 'master' into fix-settings-bindable-logic 2019-12-09 17:55:17 +09:00
883d5bc11d Remove automatic slider path offsetting 2019-12-09 17:54:22 +09:00
9cb649436c Default to linear control point type 2019-12-09 17:47:05 +09:00
5a093c039c Simplify path/point construction 2019-12-09 17:46:40 +09:00
eb074b7058 Allow mods to apply to track, not clock 2019-12-09 17:44:45 +09:00
12cfb7dedb Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:28:11 +00:00
c18f2e6436 Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3 2019-12-09 15:34:49 +09:00
0c9f7a64f1 Merge branch 'master' into improve-dialog-button-visuals 2019-12-09 15:31:48 +09:00
07efd66287 Merge pull request #7075 from peppy/editor-timeline-hitobject-display
Editor timeline hitobject display
2019-12-09 14:53:25 +09:00
5738ef5fab Merge branch 'master' into editor-timeline-hitobject-display 2019-12-09 14:34:55 +09:00
58db745121 Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals 2019-12-09 14:11:52 +09:00
03d18186c2 Fix broken merge 2019-12-09 14:11:44 +09:00
69deb0ca96 Fix unavailable replays can be accessed via leaderboard 2019-12-09 07:19:55 +03:00
4905709ea4 Remove unused usings 2019-12-09 13:19:21 +09:00
003eef8595 Fix mod buttons being selected when drag scrolling overlay (#7099)
Fix mod buttons being selected when drag scrolling overlay
2019-12-09 12:24:48 +09:00
ad2ecf4dff Fix key config search not clearing after pressing escape (#7105)
Fix key config search not clearing after pressing escape
2019-12-09 12:22:30 +09:00
9974fff5cc Make sub panel back button inherit osu button 2019-12-08 10:51:25 -08:00
5cf35869e9 Fix key config search not clearing after pressing escape 2019-12-08 10:40:39 -08:00
fd38e56435 Merge branch 'master' into fix-settings-bindable-logic 2019-12-09 02:18:51 +09:00
c2a40c574d Split out if statement for readability 2019-12-09 02:13:47 +09:00
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
929be3e9e7 Highlight own score in BeatmapSetOverlay 2019-12-08 12:34:07 +03:00
52a0d98012 Merge pull request #7077 from peppy/fix-player-loader-speed
Fix mod speed adjustments unapplying if exiting the player loading screen early
2019-12-08 03:53:55 +09:00
54798b134e Add accessibility modifiers 2019-12-08 03:16:41 +09:00