Commit Graph

15477 Commits

Author SHA1 Message Date
e37526888c Merge remote-tracking branch 'upstream/master' into adjustable-double-time 2019-12-09 16:43:17 +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
4fbe5b7002 Merge branch 'master' into rankings-overlay-refactor 2019-12-09 11:34:32 +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
299daa26da Merge branch 'master' into dont-confine-skins 2019-12-08 03:14:24 +09:00
5347e7c4a2 Apply code quality improvements 2019-12-06 20:14:06 +09:00
347373a3ba Fix test failures 2019-12-06 19:04:55 +09:00
46d055604a Customize -> Customise 2019-12-06 18:59:45 +09:00
680b2653ae Improve animation of popup dialog buttons 2019-12-06 18:51:30 +09:00
16f8341a02 Handle control point positional updates within SliderPath 2019-12-06 18:49:01 +09:00
cf0413663d Merge branch 'settings-source' into customized-mods 2019-12-06 18:05:39 +09:00
2fa0b30fa2 Add textbox and dropdown support 2019-12-06 18:04:46 +09:00
ed6d1ccd95 Add a method for getting settings UI components automatically from a target class 2019-12-06 18:04:46 +09:00
901eb5d996 Fix incorrect trigger logic 2019-12-06 18:03:50 +09:00
9de032e35f Fix SettingsItem bindable logic 2019-12-06 17:10:06 +09:00
a5d5099868 Use SettingsSource for mod cusomisation 2019-12-06 17:09:48 +09:00
23e47530c5 Add a method for getting settings UI components automatically from a target class 2019-12-06 17:09:24 +09:00
b4e1b5fa98 Explose + use the full calculated length of the path 2019-12-06 15:53:19 +09:00
af35df4077 Add multiple mod testing and update test code style 2019-12-06 15:42:11 +09:00
2654710d91 Add tests and fix negative expected distances 2019-12-06 15:37:06 +09:00
170954bc6e Merge remote-tracking branch 'upstream/master' into customized-mods 2019-12-06 15:31:20 +09:00
f4bc9f087e Merge remote-tracking branch 'upstream/master' into fix-player-loader-speed 2019-12-06 15:29:06 +09:00
27dd12a66d Rewrite slider length calculation for readability 2019-12-06 15:06:31 +09:00
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
04b89c8242 Merge branch 'master' into expertplus-tooltip-colour 2019-12-06 13:54:13 +09:00
48c6279e8b Only undo adjustments in GameplayClockContainer if applied at least once 2019-12-06 13:49:22 +09:00
de23364608 Add failing test 2019-12-06 13:47:34 +09:00
b1426d1b22 Full impossible nullref 2019-12-06 12:51:43 +09:00
9248fbe881 Remove extra checkboxes for now 2019-12-06 12:22:44 +09:00
9f4c8db395 Add xmldoc 2019-12-06 12:17:41 +09:00
8be6abf607 Add param to let function return lighter colour for some diff 2019-12-06 10:07:16 +07:00