Commit Graph

9417 Commits

Author SHA1 Message Date
ce18a0705d Merge remote-tracking branch 'origin/master' into sliderbouncers-fix 2017-12-27 16:48:04 +09:00
9841fd6cd6 Merge pull request #1745 from peppy/notification-verbosity
Rate limit logged errors displayed as notifications
2017-12-27 15:37:14 +09:00
1af7f71c97 Merge branch 'master' into notification-verbosity 2017-12-27 15:01:28 +09:00
14cc40f4a1 Merge pull request #1774 from peppy/fix-multiple-random-selects
Fix random selection happening more than once on quick imports
2017-12-27 15:01:12 +09:00
f6e72706d9 Merge branch 'master' into fix-multiple-random-selects 2017-12-27 14:51:54 +09:00
b36e5d4d47 Merge pull request #1776 from smoogipoo/update-opentk
Update opentk
2017-12-27 13:59:35 +09:00
5ad86d2b75 Update framework 2017-12-27 13:50:54 +09:00
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
18d2be75d5 Fix random selection happening more than once on quick imports 2017-12-27 13:04:50 +09:00
c445291be7 Merge pull request #1770 from peppy/fix-play-no-beatmap
Fix crash when starting play mode with no beatmap
2017-12-27 12:30:58 +09:00
ae9f08f387 Fix crash in editor when trying to seek on a virtual track 2017-12-27 11:47:04 +09:00
d17f6cb564 Fix crash when starting play mode with no beatmap
Closes #1767
2017-12-27 11:46:44 +09:00
94449ed597 Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
50bb9d4a01 Merge pull request #1720 from Aergwyn/hide-useless-beatmap-info
Hide unnecessary lines on empty BeatmapInfoWedge
2017-12-26 20:47:30 +09:00
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
f6a5f773c4 Merge pull request #1726 from peppy/fix-info-wedge
Fix beatmap info wedge not showing up when zero beatmaps are loaded
2017-12-26 20:16:40 +09:00
1c4bcdda96 Fix test race condition
async loads
2017-12-26 20:13:55 +09:00
ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
44fbe7859a move anchor and origin so metadata doesn't move if it's partially empty 2017-12-26 11:34:26 +01:00
2aea729062 Merge pull request #1759 from peppy/quieter-notifications
Fix notification read lamp and notification count
2017-12-26 18:35:25 +09:00
460eeafd32 Merge branch 'master' into quieter-notifications 2017-12-26 18:18:28 +09:00
2fb619ed2d Merge pull request #1733 from smoogipoo/fix-taiko-stronghit
Yet another rework of sound handling in taiko
2017-12-26 18:15:06 +09:00
cf71ffdb6c Merge branch 'master' into fix-taiko-stronghit 2017-12-26 18:06:07 +09:00
b7c2461a39 Merge pull request #1742 from peppy/improve-screen-offset
Add special logic to song select to avoid obvious clipping when notifications are displayed
2017-12-26 18:01:28 +09:00
11542b697c Merge branch 'master' into improve-screen-offset 2017-12-26 17:53:13 +09:00
e65aba83fa Merge pull request #1749 from peppy/beatmap-import-prompt
Add a dialog offering to import beatmaps from stable
2017-12-26 16:53:45 +09:00
3f1ced618a Update framework 2017-12-26 16:15:15 +09:00
ab6c93fba4 Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
f7a54a203b Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
678ab2a177 Merge pull request #1748 from peppy/popup-word-wrap
Add word wrapping support for popup dialog text
2017-12-26 15:56:36 +09:00
24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
45b3acdd6f Fix progress notifications not closing properly when opening their continuation 2017-12-26 15:54:33 +09:00
ed1df94f77 Fix unread light not turning off 2017-12-26 15:54:28 +09:00
ef0031a719 Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
6c6704e6a6 Merge pull request #1750 from peppy/osu-prefixed-text
Fix many instances of non-osu-prefixed text classes being used
2017-12-26 15:47:52 +09:00
d089e27cad Merge branch 'master' into osu-prefixed-text 2017-12-26 15:40:29 +09:00
4340cff697 Merge pull request #1751 from peppy/quieter-notifications
Quieter notification overlay
2017-12-26 15:40:24 +09:00
024d9a6850 Remove unnecessary null check 2017-12-26 15:33:02 +09:00
e14ad31a07 Increase wait durations for test stability 2017-12-26 15:32:53 +09:00
9ccc49c9b5 Make selection triggering more liberal 2017-12-26 15:32:39 +09:00
ad811961a7 Merge branch 'master' into quieter-notifications 2017-12-26 15:30:12 +09:00
b36dd21f07 Merge branch 'master' into fix-info-wedge 2017-12-26 15:09:21 +09:00
ed7ae4e956 Merge branch 'master' into fix-info-wedge 2017-12-26 15:08:52 +09:00
35d7fa8a81 Cleanup things that are now not needed with these changes 2017-12-26 14:18:38 +09:00
14162b5d46 Make InputDrum handle all Normals/Claps, hitobjects all others 2017-12-26 14:18:23 +09:00
07d753441d Merge pull request #1753 from FreezyLemon/fix-hiding-last-map
Trigger null-selection in SongSelect when the last beatmap is hidden
2017-12-26 13:51:08 +09:00
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
2473f6de46 Merge branch 'master' into fix-hiding-last-map 2017-12-26 13:32:33 +09:00
58c35b8ba5 Merge remote-tracking branch 'FreezyLemon/master' into fix-taiko-stronghit 2017-12-26 12:28:40 +09:00