Commit Graph

22476 Commits

Author SHA1 Message Date
a7b58cad99 Merge branch 'master' into labelled-switch-button 2019-10-04 11:15:54 +08:00
76d42fb1ae Merge pull request #6390 from peppy/update-combo-colours
Update lazer default combo colours to match stable
2019-10-04 11:59:31 +09:00
925615320e Update lazer default combo colours to match stable 2019-10-04 10:46:48 +08:00
0dd12990c4 Fix possible nullref in MusicController (#6379)
Fix possible nullref in MusicController
2019-10-03 20:11:52 +08:00
acd303f84c Merge pull request #6126 from Craftplacer/muted-notification
Show notification when volume is muted
2019-10-03 20:07:23 +09:00
dbcb9e51c2 Merge branch 'master' into muted-notification 2019-10-03 12:51:22 +02:00
636913a4a6 Refactor PlayerLoader changes 2019-10-03 19:22:41 +09:00
6c878cb167 Prevent nullrefs 2019-10-03 19:15:37 +09:00
662a1a9c2c Use current 2019-10-03 18:55:53 +09:00
bcf0b2752e Fix possible MusicController nullref 2019-10-03 18:48:44 +09:00
b337a3793d Merge pull request #6375 from peppy/fix-carousel-test-failures
Fix random failures on BeatmapCarousel filter test
2019-10-03 18:44:22 +09:00
e9c73ce30f Fix random failures on BeatmapCarousel filter test
The "un-filter" step causes a `SelectNextRandom` invocation. If this happens to select a difficulty in set 3 other than the previously buffered difficulty #2, the subsequent test would fail.

I've split this test out to remove the random element, but added a new assert to ensure buffered (previously visited?) difficulty is re-selected on return to the same set.
2019-10-03 16:21:14 +08:00
cbdf42cd7b Only lock the database for the duration of a deletion (#6363)
Only lock the database for the duration of a deletion
2019-10-03 10:40:08 +08:00
f8eb07b211 Only lock database for the duration of a model restoration 2019-10-03 11:24:17 +09:00
c85d7c8b3f Merge branch 'master' into reduce-database-deletion-locks 2019-10-03 10:17:27 +08:00
4d4e846296 Merge branch 'master' into muted-notification 2019-10-02 17:31:34 +02:00
6929847b08 Remove redundant override 2019-10-02 17:22:34 +02:00
8d6a177a6b Merge pull request #6344 from smoogipoo/fix-track-leak
Fix memory leaks due to audio track recycle order
2019-10-02 22:43:47 +08:00
3e07e508f2 Merge branch 'master' into fix-track-leak 2019-10-02 22:20:05 +08:00
dfaa9531f8 Only lock the database for the duration of a deletion 2019-10-02 18:48:50 +09:00
2519fd26a9 Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens
Simplify exit logic of screens with textboxes using back button receptor
2019-10-02 18:38:06 +09:00
bd987e43a3 Merge pull request #6359 from LanTenDragon/holdformenu-slider-precision
Change HoldForMenu slider precision to 50
2019-10-02 18:19:19 +09:00
b161aa22c3 Merge branch 'master' into simplify-exit-logic-of-screens 2019-10-02 18:13:57 +09:00
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
c52cd02b62 Merge pull request #6348 from GSculerlor/truncate-username
Fix username overlap timestamp in match chatroom
2019-10-02 10:46:55 +09:00
b6dd610af8 Apply reviews 2019-10-01 23:18:03 +07:00
5f399add82 Resolve @iiSaLMaN 's suggested changes 2019-10-01 18:15:40 +02:00
2ac5e0bfa0 Make use of SessionStatics 2019-10-01 17:39:01 +02:00
e3502f5200 Fix typo on Key.Escape comment 2019-10-01 08:37:08 -07:00
ff6367fa4b Make back button glow when pressing escape 2019-10-01 08:26:45 -07:00
5f700f2ae9 Simplify exit logic of screens with textboxes using back button receptor 2019-10-01 08:26:34 -07:00
4e394e0ed5 Merge branch 'master' into muted-notification 2019-10-01 17:26:11 +02:00
208b9a4eba Add new virtual float for username to timestamp padding 2019-10-01 20:47:53 +07:00
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09:00
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
b4da92e5a6 Merge branch 'master' into bot-profile 2019-10-01 16:26:48 +09:00
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