Dean Herbert
2e20380d07
Merge branch 'master' into placement-blueprint-movement
2019-10-06 13:52:22 +08:00
Dean Herbert
d547f9cc68
Merge pull request #6406 from Joehuu/resume-music-gameplay-exit
...
Resume music to same position when exiting gameplay
2019-10-06 13:51:10 +08:00
Roman Kapustin
bdea75b995
Autoscroll playlist on song change
2019-10-05 23:53:05 +03:00
Joehu
e257f4ca04
Resume music to same position when exiting gameplay
2019-10-05 10:31:44 -07:00
Dean Herbert
8c3caed2e0
Merge pull request #6396 from bdach/allow-fallback-decoder-overwrite
...
Allow fallback decoder overwrite
2019-10-05 11:08:41 +08:00
Dean Herbert
93c0cf14c1
Merge branch 'master' into allow-fallback-decoder-overwrite
2019-10-05 10:56:57 +08:00
Dean Herbert
0c4f84a963
Fix keybinding order of beatmap options ( #6400 )
...
Fix keybinding order of beatmap options
2019-10-05 10:56:31 +08:00
Joehu
a71db11ea5
Remove depth parameter description
2019-10-04 18:38:44 -07:00
Joehu
de658c932e
Fix test regression
2019-10-04 17:22:42 -07:00
Joehu
5d460eaf6b
Remove depth specification and button order regression
2019-10-04 17:14:19 -07:00
Joehu
e7ba6ef5c4
Fix keybinding order of beatmap options
2019-10-04 14:32:43 -07:00
Bartłomiej Dach
7c2c537bc9
Allow fallback decoder overwrite
...
To fix the runtime crashes in difficulty calculation components, remove
the check for pre-existing fallback registration along with
the exception. The xmldoc for the registration function has been
extended to make users aware of possible consequences of calling it.
2019-10-04 18:20:20 +02:00
Bartłomiej Dach
76c74719a4
Add test for fallback decoder overwrite
...
LegacyDifficultyCalculatorBeatmapDecoder was registered as a fallback
decoder in commit ffde389
2019-10-04 17:00:51 +02:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement
2019-10-04 19:05:56 +08:00
Dean Herbert
ff05748b69
Merge branch 'master' into fix-mania-placement
2019-10-04 19:00:24 +08:00
Dean Herbert
5098cfe556
Add StartTimeChanged event to EditorBeatmap and add tests ( #6373 )
...
Add StartTimeChanged event to EditorBeatmap and add tests
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 18:44:01 +08:00
Dean Herbert
9eab56e2fc
Merge branch 'master' into editor-beatmap-changed-event
2019-10-04 17:58:58 +08:00
Dan Balasescu
c2f5f14839
Merge pull request #6374 from peppy/fix-negative-key-counter
...
Fix key counters appearing negative on intense beatmaps
2019-10-04 15:39:33 +09:00
Dan Balasescu
456def70c8
Merge branch 'master' into fix-negative-key-counter
2019-10-04 15:26:18 +09:00
Dan Balasescu
457e0c4d7b
Merge pull request #6117 from bdach/beatmap-parsing-fallback-v2
...
Add fallback decoder option for badly-headered files
2019-10-04 15:03:10 +09:00
Dean Herbert
aeb62825cd
Move out requireMoreUpdateLoops for better consistency
2019-10-04 13:42:06 +08:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay ( #6369 )
...
Fix Alt-F4 being blocked during gameplay
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 13:33:00 +08:00
Dean Herbert
ddef7fa3ba
Repair behavioural change
2019-10-04 13:32:47 +08:00
Dean Herbert
bcdc22087a
Merge remote-tracking branch 'upstream/master' into fix-negative-key-counter
2019-10-04 13:24:59 +08:00
Dan Balasescu
2b61bb709e
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-10-04 14:08:27 +09:00
Dean Herbert
f1772d01d2
Add the new switch button + labelled switch button ( #6257 )
...
Add the new switch button + labelled switch button
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 13:01:57 +08:00
Dan Balasescu
dc984d0d81
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-10-04 13:51:56 +09:00
smoogipoo
ffde389641
Add difficulty calculator beatmap decoder fallback
2019-10-04 13:28:32 +09:00
Dean Herbert
626f7388c8
Add tests for quick retry and quick exit scenarios
2019-10-04 12:23:01 +08:00
Dan Balasescu
35ef5a0007
Merge pull request #6250 from Joehuu/truncate-metadata-on-wedge
...
Truncate long metadata on beatmap info wedge
2019-10-04 12:44:02 +09:00
Dean Herbert
47c1f36f9d
Add ValidForResume check
2019-10-04 11:41:53 +08:00
Dean Herbert
e646b2677c
Add test coverage
2019-10-04 11:25:23 +08:00
Dean Herbert
71985c7ef1
Update fail logic to match
2019-10-04 11:23:42 +08:00
Dean Herbert
a7b58cad99
Merge branch 'master' into labelled-switch-button
2019-10-04 11:15:54 +08:00
Dan Balasescu
e9cb06a5e2
Merge branch 'master' into truncate-metadata-on-wedge
2019-10-04 12:08:06 +09:00
Dean Herbert
a7d7a28d34
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays
2019-10-04 11:05:28 +08:00
Dan Balasescu
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
Dean Herbert
925615320e
Update lazer default combo colours to match stable
2019-10-04 10:46:48 +08:00
smoogipoo
a5e1cb8feb
Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge
2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays
2019-10-03 08:43:31 -07:00
Dean Herbert
0dd12990c4
Fix possible nullref in MusicController ( #6379 )
...
Fix possible nullref in MusicController
2019-10-03 20:11:52 +08:00
Dan Balasescu
acd303f84c
Merge pull request #6126 from Craftplacer/muted-notification
...
Show notification when volume is muted
2019-10-03 20:07:23 +09:00
Craftplacer
dbcb9e51c2
Merge branch 'master' into muted-notification
2019-10-03 12:51:22 +02:00
smoogipoo
636913a4a6
Refactor PlayerLoader changes
2019-10-03 19:22:41 +09:00
smoogipoo
6c878cb167
Prevent nullrefs
2019-10-03 19:15:37 +09:00
smoogipoo
662a1a9c2c
Use current
2019-10-03 18:55:53 +09:00
Dan Balasescu
4aeb5b520d
Merge branch 'master' into fix-negative-key-counter
2019-10-03 18:52:08 +09:00
smoogipoo
bcf0b2752e
Fix possible MusicController nullref
2019-10-03 18:48:44 +09:00
Dan Balasescu
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
smoogipoo
2d0c522398
Remove unused method
2019-10-03 18:43:46 +09:00
