1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 05:22:57 +08:00
Commit Graph

1005 Commits

Author SHA1 Message Date
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Dean Herbert
3886e75959 Fix potentially missing group headers in beatmap carousel 2018-04-24 01:52:25 +09:00
Dean Herbert
2d1cef79d6 Fix instability in carousel item sorting 2018-04-23 19:01:01 +09:00
Dean Herbert
c77f339444 Merge remote-tracking branch 'upstream/master' into show-beatmap-id 2018-04-20 12:41:38 +09:00
Dean Herbert
f7ca6267b1 Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 20:53:06 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
Dean Herbert
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
Dean Herbert
1728dd6502 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 16:41:01 +09:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
Dean Herbert
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
Dean Herbert
188c8ce1e7 Remove unnecessary score nulling (already happens in PlaceholderState_Set) 2018-04-18 11:58:55 +09:00
Dean Herbert
a27f39a555 Add documentation explaining intertwining logic 2018-04-18 11:57:06 +09:00
smoogipoo
9af6ef1864 Remove extra unneded safety 2018-04-16 17:48:49 +09:00
smoogipoo
b9220a1e29 Fix leaderboard placeholder sometimes disappearing indefinitely 2018-04-16 17:39:55 +09:00
smoogipoo
1b9d54a6ad Fix various data races causing crashes or incorrect leaderboard states 2018-04-16 17:39:03 +09:00
Dean Herbert
81f0649e44 Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling 2018-04-13 19:50:44 +09:00
tgi74000
1a2b1d4c98 Use the already existent RightMouseScrollbar field 2018-04-13 11:32:33 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200 Add right click scrolling in song select (and its option) 2018-04-13 11:09:49 +02:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect 2018-04-06 12:37:16 +03:00
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay.
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
2018-04-04 21:46:31 +05:30
smoogipoo
69e2d4fd22 Make CarouselRoot a nested class 2018-04-02 15:24:08 +09:00
smoogipoo
82a847b820 Extract random selection logic into CarouselRoot 2018-04-02 15:16:10 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
Endrik Tombak
7e30375443 Use selectNextRandom instead 2018-03-30 10:46:46 +03:00
Endrik Tombak
3f65e3a7e3 Make selection at random when last was null 2018-03-30 00:15:32 +03:00
smoogipoo
097ab66182 Fix resharper error 2018-03-25 01:54:25 +09:00
Dean Herbert
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Dean Herbert
d4aeb3d00b Fix BeatmapCarousel's flush not correctly applying selection changes
They may have been delayed until the next Update, which is too late in this case.
2018-03-23 12:10:13 +09:00
Dean Herbert
62229300c4 Fix DummyRuleset getting selected
Resolves #2261.
2018-03-22 00:26:48 +09:00
FreezyLemon
95c84ea7fe remove (now) unnecessary line 2018-03-12 23:00:06 +01:00
FreezyLemon
ddc1f03a96 deselect autoplay button after ctrl-enter play
before, the mod was removed, but the button was still active
2018-03-12 22:35:45 +01:00
Dean Herbert
db2a663234 Use private instead of protected 2018-03-11 01:26:03 +09:00
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change. 2018-03-09 19:39:28 +05:30
naoey
d04f47718f
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
naoey
25fb527cc7
Remove previous fix and move filtered logic to carousel.
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
2018-03-09 15:51:00 +05:30
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps 2018-03-08 13:02:57 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
naoey
a57dc154f9
More specific tests. 2018-03-03 20:34:29 +05:30
naoey
307147a8a3
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps 2018-03-03 16:10:22 +05:30
naoey
fb724ca8a7
Make song select ensure current beatmap is always playable in the active ruleset.
- Add a to TestCasePlaySongSelect testing this scenario
2018-03-03 16:09:24 +05:30
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 22:53:02 +09:00
Dan Balasescu
b898226a91
Merge branch 'master' into fix-mod-select 2018-02-28 21:52:07 +09:00
Dan Balasescu
a3d26d7d55
Merge branch 'master' into fix-song-select-iteration 2018-02-28 21:40:25 +09:00
Dean Herbert
08497427fd
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 15:32:16 +09:00
Dean Herbert
4a52db14d1 Fix depth of already-visible panels not being updates after a sorting change 2018-02-28 14:18:25 +09:00