1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 02:59:48 +08:00
Commit Graph

15326 Commits

Author SHA1 Message Date
dependabot-preview[bot]
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
Dan Balasescu
0c9f7a64f1
Merge branch 'master' into improve-dialog-button-visuals 2019-12-09 15:31:48 +09:00
Dan Balasescu
07efd66287
Merge pull request #7075 from peppy/editor-timeline-hitobject-display
Editor timeline hitobject display
2019-12-09 14:53:25 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display 2019-12-09 14:34:55 +09:00
Dean Herbert
58db745121 Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals 2019-12-09 14:11:52 +09:00
Dean Herbert
03d18186c2 Fix broken merge 2019-12-09 14:11:44 +09:00
Andrei Zavatski
69deb0ca96 Fix unavailable replays can be accessed via leaderboard 2019-12-09 07:19:55 +03:00
Dean Herbert
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
Dean Herbert
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
Joehu
9974fff5cc Make sub panel back button inherit osu button 2019-12-08 10:51:25 -08:00
Joehu
5cf35869e9 Fix key config search not clearing after pressing escape 2019-12-08 10:40:39 -08:00
Dean Herbert
c2a40c574d Split out if statement for readability 2019-12-09 02:13:47 +09:00
Joehu
e394b28799 Remove redundant transform 2019-12-08 09:12:32 -08:00
Joehu
463b6c0030 Remove whitespace 2019-12-08 09:04:34 -08:00
Joehu
8956768fe0 Fix mod buttons being selected when drag scrolling overlay 2019-12-08 08:55:45 -08:00
Andrei Zavatski
929be3e9e7 Highlight own score in BeatmapSetOverlay 2019-12-08 12:34:07 +03:00
Dan Balasescu
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
Dan Balasescu
54798b134e
Add accessibility modifiers 2019-12-08 03:16:41 +09:00
Dan Balasescu
299daa26da
Merge branch 'master' into dont-confine-skins 2019-12-08 03:14:24 +09:00
Dean Herbert
680b2653ae Improve animation of popup dialog buttons 2019-12-06 18:51:30 +09:00
Dean Herbert
f4bc9f087e Merge remote-tracking branch 'upstream/master' into fix-player-loader-speed 2019-12-06 15:29:06 +09:00
Dean Herbert
21ceb7f85d Always display skins at native sizes for now 2019-12-06 14:40:45 +09:00
Dean Herbert
04b89c8242
Merge branch 'master' into expertplus-tooltip-colour 2019-12-06 13:54:13 +09:00
Dean Herbert
48c6279e8b Only undo adjustments in GameplayClockContainer if applied at least once 2019-12-06 13:49:22 +09:00
Dean Herbert
de23364608 Add failing test 2019-12-06 13:47:34 +09:00
Dean Herbert
b1426d1b22 Full impossible nullref 2019-12-06 12:51:43 +09:00
Dean Herbert
9248fbe881 Remove extra checkboxes for now 2019-12-06 12:22:44 +09:00
Dean Herbert
9f4c8db395 Add xmldoc 2019-12-06 12:17:41 +09:00
Ganendra Afrasya
8be6abf607 Add param to let function return lighter colour for some diff 2019-12-06 10:07:16 +07:00
Dean Herbert
28400aa865 Update test scene 2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835 Move thickness to a constant 2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64 Fix warnings 2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb Make work in editor 2019-12-05 20:12:25 +09:00
Dean Herbert
e225b0032a Add basic hitobject display to timeline 2019-12-05 19:31:40 +09:00
Dean Herbert
2419077c07 Update framework 2019-12-05 18:31:13 +09:00
Ganendra Afrasya
0e97871461 Change colour if difficulty is ExpertPlus 2019-12-05 14:53:01 +07:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo 2019-12-05 12:43:43 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters 2019-12-05 12:27:42 +09:00
Dean Herbert
48287459a0 Optimise filters to avoid property retrieval
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase 2019-12-05 01:00:27 +09:00
Dean Herbert
0734b52483 Update framework 2019-12-04 23:33:26 +09:00
Dean Herbert
ca1f3417a3
Merge pull request #7046 from smoogipoo/fix-replay-button
Fix replay download button not working
2019-12-04 23:00:40 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Huo Yaoyuan
46c9bdcf62 Replace Convert.ChangeType with IConvertible. 2019-12-03 20:49:41 +08:00
Huo Yaoyuan
5375af7820 Remove other Equals(object) calls. 2019-12-03 20:23:27 +08:00
Huo Yaoyuan
05cfef92f9 Don't compare spans with null. 2019-12-03 20:09:58 +08:00
Huo Yaoyuan
a42f9447e6 Don't use Equals(object) on T?. 2019-12-03 20:07:22 +08:00
Dean Herbert
e2591f154b Only parse statistics when not null 2019-12-03 16:16:46 +09:00