Commit Graph

22552 Commits

Author SHA1 Message Date
8d6851cc31 Merge pull request #6319 from miterosan/rulesets_fail_load_exception_log
Log when loading rulesets from disk fails
2019-10-01 15:52:42 +09:00
81a227796e Merge remote-tracking branch 'origin/master' into rulesets_fail_load_exception_log 2019-10-01 15:41:16 +09:00
ce609302ed Fix CI error 2019-10-01 15:41:09 +09:00
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49:09 +09:00
4880fd9e02 Merge pull request #6329 from peppy/update-framework
Update framework
2019-09-30 22:17:58 +09:00
351e89bf18 Update framework 2019-09-30 22:03:56 +09:00
4e9e24f099 Merge pull request #6312 from peppy/fix-potential-null-test
Handle potential null case
2019-09-30 12:29:42 +09:00
2d4e557134 Merge branch 'master' into fix-potential-null-test 2019-09-30 12:19:11 +09:00
9f498d2990 Log the exception that caused to loading of rulesets to fail. 2019-09-29 19:25:44 +02:00
f24ac04beb Add suggested blank line for consistency 2019-09-29 15:18:29 +03:00
97a0e0097f Add testing 2019-09-29 14:56:33 +03:00
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
e4ec491e57 Merge pull request #6310 from V1ntagezTV/add-random-intro
Add the ability to choose a random intro sequence each startup
2019-09-29 14:53:24 +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
69ac2f90b3 Merge remote-tracking branch 'upstream/master' into add-random-intro 2019-09-29 14:33:16 +08:00
1532371ab5 Migrate beatmap carousel test to AddUntilStep (#6308)
Migrate beatmap carousel test to AddUntilStep

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-29 12:37:19 +08:00
636aca8838 Merge remote-tracking branch 'GSculerlor/master' into fix-test-races 2019-09-29 12:23:22 +08:00
539f3329ce Rename method to match new behaviour 2019-09-29 12:23:18 +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
bbb38e0394 Add session-wide storage as a safer alternative to statics (#6216)
Add session-wide storage as a safer alternative to statics

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-28 20:33:02 +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
a55d060791 Fix track-adjusting mods not applying after resuming from anoth… (#6299)
Fix track-adjusting mods not applying after resuming from another screen

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-28 19:53:20 +08:00
1d1df2433f Merge branch 'master' into fix-track-adjustments-not-applied-after-resume 2019-09-28 19:42:31 +08:00
2487d4f0f2 Migrate beatmap carousel test to AddUntilStep
Due to non-deterministic test failures in TestSceneBeatmapCarousel,
migrate the checkSelected helper step from AddAssert to AddUntilStep.
This adds more leniency for performance-related issues while still
checking the desired behaviour.
2019-09-28 11:58:27 +02:00
a8eef0d0c4 Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-28 12:34:16 +03:00
bfa858c663 Merge pull request #6297 from ppy/dependabot/nuget/Humanizer-2.7.9
Bump Humanizer from 2.7.2 to 2.7.9
2019-09-28 15:09:23 +08: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
5405102393 Merge pull request #6270 from iiSaLMaN/improve-hold-button-text
Replace menu button text with "press for menu" on 0ms activation delay
2019-09-27 17:47:15 +09:00
8b7f558728 Merge branch 'master' into improve-hold-button-text 2019-09-27 17:35:03 +09:00
f6b0e46fcd Merge branch 'muted-notification' of https://github.com/Craftplacer/osu into muted-notification 2019-09-27 09:19:48 +02:00
06c32d52dc Change wrong volume bindable used in test 2019-09-27 09:19:39 +02: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
67bed57cbd Bind value changed event of cursor trail appearence outside BDL
https://github.com/ppy/osu/pull/6270#discussion_r328899728
2019-09-27 08:46:49 +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
9a31ccd2e3 Add missing test cases for master, track and mute button
This also modifies the reset player method to make it possible to set something before the player is loaded but after the container has loaded.
2019-09-26 14:05:43 +02:00
12b027f2c3 Merge pull request #6275 from smoogipoo/comboinformation-bindables
Add bindable versions of IHasComboInformation properties
2019-09-26 19:04:25 +09:00
e4e6634432 Add slider combo change test 2019-09-26 17:39:26 +09:00