Craftplacer
6929847b08
Remove redundant override
2019-10-02 17:22:34 +02:00
Craftplacer
5f399add82
Resolve @iiSaLMaN 's suggested changes
2019-10-01 18:15:40 +02:00
Craftplacer
2ac5e0bfa0
Make use of SessionStatics
2019-10-01 17:39:01 +02:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification
2019-10-01 17:26:11 +02:00
Dean Herbert
2f877be0c4
Hide unnecessary profile sections for bots ( #6289 )
...
Hide unnecessary profile sections for bots
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-01 16:08:30 +08:00
Dan Balasescu
b4da92e5a6
Merge branch 'master' into bot-profile
2019-10-01 16:26:48 +09:00
Dan Balasescu
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
smoogipoo
81a227796e
Merge remote-tracking branch 'origin/master' into rulesets_fail_load_exception_log
2019-10-01 15:41:16 +09:00
smoogipoo
ce609302ed
Fix CI error
2019-10-01 15:41:09 +09:00
Dan Balasescu
4880fd9e02
Merge pull request #6329 from peppy/update-framework
...
Update framework
2019-09-30 22:17:58 +09:00
Dean Herbert
351e89bf18
Update framework
2019-09-30 22:03:56 +09:00
Dan Balasescu
4e9e24f099
Merge pull request #6312 from peppy/fix-potential-null-test
...
Handle potential null case
2019-09-30 12:29:42 +09:00
Dan Balasescu
2d4e557134
Merge branch 'master' into fix-potential-null-test
2019-09-30 12:19:11 +09:00
miterosan
9f498d2990
Log the exception that caused to loading of rulesets to fail.
2019-09-29 19:25:44 +02:00
Andrei Zavatski
f24ac04beb
Add suggested blank line for consistency
2019-09-29 15:18:29 +03:00
Andrei Zavatski
97a0e0097f
Add testing
2019-09-29 14:56:33 +03:00
Andrei Zavatski
907f73ef8f
Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile
2019-09-29 14:45:36 +03:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
69ac2f90b3
Merge remote-tracking branch 'upstream/master' into add-random-intro
2019-09-29 14:33:16 +08:00
Dean Herbert
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
Dean Herbert
636aca8838
Merge remote-tracking branch 'GSculerlor/master' into fix-test-races
2019-09-29 12:23:22 +08:00
Dean Herbert
539f3329ce
Rename method to match new behaviour
2019-09-29 12:23:18 +08:00
Dean Herbert
740efa5747
Handle potential null case
2019-09-29 12:19:42 +08:00
V1ntagezTV
9f1c378733
moved into the switch case
2019-09-29 00:35:47 +05:00
V1ntagezTV
2681e2064a
remove comment
2019-09-29 00:34:09 +05:00
V1ntagezTV
1babd139bc
remove needless blank
2019-09-29 00:22:23 +05:00
V1ntagezTV
52b044b7f6
Add random intro!
2019-09-29 00:10:17 +05:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification
2019-09-28 20:33:32 +08:00
Dean Herbert
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
Dean Herbert
a45f8c968b
Rename and add simple xmldoc
2019-09-28 20:21:51 +08:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics
2019-09-28 20:16:52 +08:00
Dean Herbert
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
Dean Herbert
1d1df2433f
Merge branch 'master' into fix-track-adjustments-not-applied-after-resume
2019-09-28 19:42:31 +08:00
Bartłomiej Dach
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
Andrei Zavatski
a8eef0d0c4
Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile
2019-09-28 12:34:16 +03:00
Dean Herbert
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
iiSaLMaN
fb9f21237e
Reset track adjustments on resuming from another screen
2019-09-28 04:18:16 +03:00
dependabot-preview[bot]
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
Dan Balasescu
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
Dan Balasescu
8b7f558728
Merge branch 'master' into improve-hold-button-text
2019-09-27 17:35:03 +09:00
Craftplacer
f6b0e46fcd
Merge branch 'muted-notification' of https://github.com/Craftplacer/osu into muted-notification
2019-09-27 09:19:48 +02:00
Craftplacer
06c32d52dc
Change wrong volume bindable used in test
2019-09-27 09:19:39 +02:00
Andrei Zavatski
4908cb826b
Fix line breaks
2019-09-27 09:46:11 +03:00
Andrei Zavatski
475455d7cd
Add missing line breaks
2019-09-27 09:32:46 +03:00
Andrei Zavatski
94eacbca5d
Fix Bot users have all the profile sections in ProfileOverlay
2019-09-27 09:22:25 +03:00
Dean Herbert
f4f5a7e9c8
Fix test regressions
2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4
Allow null NotificationManager
2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f
Assign to field and move to load complete
2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5
Bind event to activation delay change
2019-09-27 02:59:42 +03:00
