1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 14:52:55 +08:00
Commit Graph

2095 Commits

Author SHA1 Message Date
Dean Herbert
e77dc368ba
Merge branch 'master' into fix-pause-overlay-selection 2017-12-28 14:01:36 +09:00
Dean Herbert
e4a8402d3c Use better logic
We need to still perform selection if selectedBeatmap itself is null
2017-12-28 12:38:40 +09:00
FreezyLemon
33480b85c8 fix for Drawables being empty crashing 2017-12-28 03:35:53 +01:00
FreezyLemon
998f9c090d select pause buttons after mouse move only 2017-12-28 01:56:10 +01:00
Dan Balasescu
dcd994e65b
Merge branch 'master' into better-notification-delays 2017-12-27 23:58:04 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dan Balasescu
3a2dadc9d3
Fix spelling error 2017-12-27 23:14:48 +09:00
Dean Herbert
07e0c423f5
Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 22:58:50 +09:00
Dean Herbert
324a7d6377 Merge remote-tracking branch 'upstream/master' into better-testcase-player 2017-12-27 20:26:38 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity 2017-12-27 15:01:28 +09:00
Dean Herbert
18d2be75d5 Fix random selection happening more than once on quick imports 2017-12-27 13:04:50 +09:00
Dean Herbert
cf9a9762f7 Fix beatmap wedge appearing with incorrect info on entering song select
Closes #1762
2017-12-27 13:02:21 +09:00
Dean Herbert
ae9f08f387 Fix crash in editor when trying to seek on a virtual track 2017-12-27 11:47:04 +09:00
Dean Herbert
d17f6cb564 Fix crash when starting play mode with no beatmap
Closes #1767
2017-12-27 11:46:44 +09:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert
35ae5173cd
Merge branch 'master' into better-notification-delays 2017-12-26 20:48:41 +09:00
Dean Herbert
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
Dean Herbert
ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
Aergwyn
44fbe7859a move anchor and origin so metadata doesn't move if it's partially empty 2017-12-26 11:34:26 +01:00
Dan Balasescu
11542b697c
Merge branch 'master' into improve-screen-offset 2017-12-26 17:53:13 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2 Merge remote-tracking branch 'upstream/master' into better-notification-delays 2017-12-26 16:10:57 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
Dan Balasescu
d089e27cad
Merge branch 'master' into osu-prefixed-text 2017-12-26 15:40:29 +09:00
Dean Herbert
9ccc49c9b5 Make selection triggering more liberal 2017-12-26 15:32:39 +09:00
Dean Herbert
ed7ae4e956
Merge branch 'master' into fix-info-wedge 2017-12-26 15:08:52 +09:00
Dean Herbert
9fb958eadc Make TestCasePlayer more usable
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
Dean Herbert
09ce24a7db Switch to a better way of deciding on null selection
This avoids `SelectionChanged` potentially being invoked multiple times after `selectedBeatmapSet` is already `null`.
2017-12-26 13:41:02 +09:00
FreezyLemon
c737e5245e Removed unnecessary SelectNext() call and change to dummy map when no items present 2017-12-26 01:50:05 +01:00
Dean Herbert
798c2c6666 Add special logic to song select to avoid obvious clipping when notifications are displayed
Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.
2017-12-26 02:52:43 +09:00
Dean Herbert
3c8d30f8e6 Add a dialog offering to import beatmaps from stable 2017-12-26 00:52:11 +09:00
Dean Herbert
3c1654e5e4 Fix many instances of non-osu-prefixed text classes being used
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
6f5f4f76e5 Use Logger.Error when exceptions are involved 2017-12-25 18:21:15 +09:00
Dean Herbert
482e10966c Ensure a selection is made on entering song select if no selection is current 2017-12-24 17:02:56 +09:00
Dean Herbert
cf316b3c51 Add tests for initial load states of PlaySongSelect 2017-12-24 15:39:25 +09:00
Dean Herbert
8e644e878a Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-23 21:40:27 +09:00
Aergwyn
1d67746d32 fix crash in SongSelect when traversing while zero beatmaps are loaded 2017-12-23 12:53:11 +01:00
Dean Herbert
117b744e37 Merge branch 'master' into fix-info-wedge 2017-12-23 20:36:24 +09:00
Dan Balasescu
7ec4d230b9
Merge branch 'master' into fix-leaderboard-placeholder 2017-12-23 20:04:05 +09:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
Dean Herbert
77f1b59853
Merge branch 'master' into fix-info-wedge 2017-12-23 04:04:18 +09:00
Aergwyn
6a8fd74e05 fix failing tests
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01:00
Dean Herbert
bdda1570d1 Move Placeholder classes to own files 2017-12-22 22:44:18 +09:00
Dean Herbert
26bb3715fe Improve state and feel of leaderboard placeholders
Closes #1721.
2017-12-22 22:42:23 +09:00
Dean Herbert
2313ff0ddb Fix beatmap info wedge not showing up when zero beatmaps are loaded
Closes #1722.
2017-12-22 22:19:11 +09:00
Aergwyn
ed827d5424 more visual tests for BeatmapInfoWedge
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Aergwyn
07f55a2a60 remove references to DummyWorkingBeatmap
determine content by data that is present instead
2017-12-22 10:18:25 +01:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization 2017-12-22 07:38:05 +09:00