Commit Graph

14398 Commits

Author SHA1 Message Date
907f73ef8f Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-29 14:45:36 +03:00
193a9b0dd7 Merge branch 'master' into labelled-switch-button 2019-09-29 14:56:26 +08:00
ce62f3c75b Simplify and future-proof random retrieval method
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
2019-09-29 14:35:35 +08:00
740efa5747 Handle potential null case 2019-09-29 12:19:42 +08:00
9f1c378733 moved into the switch case 2019-09-29 00:35:47 +05:00
2681e2064a remove comment 2019-09-29 00:34:09 +05:00
1babd139bc remove needless blank 2019-09-29 00:22:23 +05:00
52b044b7f6 Add random intro! 2019-09-29 00:10:17 +05:00
02c1f490f1 Merge branch 'master' into muted-notification 2019-09-28 20:33:32 +08:00
a45f8c968b Rename and add simple xmldoc 2019-09-28 20:21:51 +08:00
d01c30fd52 Merge branch 'master' into introduce-session-statics 2019-09-28 20:16:52 +08:00
1d1df2433f Merge branch 'master' into fix-track-adjustments-not-applied-after-resume 2019-09-28 19:42:31 +08:00
a8eef0d0c4 Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-28 12:34:16 +03:00
fb9f21237e Reset track adjustments on resuming from another screen 2019-09-28 04:18:16 +03:00
3af7c910fb Bump Humanizer from 2.7.2 to 2.7.9
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-27 19:09:07 +00:00
8b7f558728 Merge branch 'master' into improve-hold-button-text 2019-09-27 17:35:03 +09:00
4908cb826b Fix line breaks 2019-09-27 09:46:11 +03:00
475455d7cd Add missing line breaks 2019-09-27 09:32:46 +03:00
94eacbca5d Fix Bot users have all the profile sections in ProfileOverlay 2019-09-27 09:22:25 +03:00
f4f5a7e9c8 Fix test regressions 2019-09-27 13:20:17 +08:00
b50ef8ffa4 Allow null NotificationManager 2019-09-27 13:15:33 +08:00
2670a23e6f Assign to field and move to load complete 2019-09-27 08:15:24 +03:00
7904f77cd5 Bind event to activation delay change 2019-09-27 02:59:42 +03:00
45f2bcc440 Fix combo bindings not being bound to nested hitobjects 2019-09-26 17:39:19 +09:00
706e884cc0 Update accent colour on combo index change 2019-09-26 17:13:13 +09:00
bbf0544a8d Add bindables for IHasComboInformation properties 2019-09-26 16:55:08 +09:00
911094e790 Replace menu button text with "press for menu" on 0ms activation delay 2019-09-26 01:42:56 +03:00
e2744054c7 Merge branch 'master' into back-button-part-2 2019-09-25 22:46:08 +09:00
7d5544460b Fix mania scrolling speed not including beatmap slider multipli… (#6236)
Fix mania scrolling speed not including beatmap slider multiplier

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-25 22:34:46 +09:00
45f833ceea Add invocation null checks for safety 2019-09-25 22:14:42 +09:00
3aa9a172d8 Merge branch 'master' into introduce-session-statics 2019-09-25 16:14:39 +03:00
42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
8c01677e0b Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 22:12:00 +09:00
8844d567cb Use bindable setting instead 2019-09-25 15:56:47 +03:00
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
f11156c2dc Fix tests not working correctly 2019-09-25 19:30:25 +09:00
9f77a1ef35 Adjust namespaces 2019-09-25 17:53:08 +09:00
d32a0acd10 Merge remote-tracking branch 'origin/master' into labelled-switch-button 2019-09-25 17:51:12 +09:00
c9e39c124e Add a labelled switch button 2019-09-25 17:42:35 +09:00
261ba5c80a Fix button not transforming correctly in some cases 2019-09-25 17:42:27 +09:00
ff9033f9ac Merge remote-tracking branch 'upstream/master' into muted-notification 2019-09-25 16:47:56 +09:00
3bd0fc2947 Merge remote-tracking branch 'upstream/master' into android-build-automation 2019-09-25 16:33:36 +09:00
0eff9aa5e9 Merge branch 'master' into improve-carousel-tests 2019-09-25 15:55:11 +09:00
213488a25e Merge branch 'master' into abstract-update-manager 2019-09-25 15:41:45 +09:00
c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
bb1289e83c Merge branch 'master' into improve-carousel-tests 2019-09-25 14:24:28 +09:00
102dbd85bd Fix CI errors 2019-09-24 16:48:22 -07:00
9861b21440 Remove unnecessary padding/margin 2019-09-24 16:28:40 -07:00
7fab1a4337 Truncate long metadata on beatmap info wedge 2019-09-24 16:06:33 -07:00