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
80585d446c
Split applyPositionOffset into two methods and add xmldocs
2019-10-03 18:40:48 +09:00
smoogipoo
f1ff22cf8b
Fix hold note blueprint placing in the wrong direction
2019-10-03 18:40:48 +09:00
smoogipoo
39369620fa
Remove position offset from ColumnAt
2019-10-03 18:40:48 +09:00
smoogipoo
0a409075be
Fix note placement offset not working for down-scroll
2019-10-03 18:40:48 +09:00
smoogipoo
754fbc59e1
Fix note placement being offset
2019-10-03 18:40:48 +09:00
smoogipoo
ee34c5ccb4
Add a flip step to mania placement test scenes
2019-10-03 18:40:48 +09:00
Dean Herbert
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
smoogipoo
f2ba87a1d2
Fix placement blueprint test scenes not working
2019-10-03 16:28:56 +09:00
smoogipoo
652acac87f
Move placement movement event to BlueprintContainer
2019-10-03 16:14:42 +09:00
Dean Herbert
6268bbcfc8
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-10-03 15:12:21 +08:00
Dean Herbert
b28689c774
Fix key counters appearing negative on intense beatmaps
...
When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction.
I have changed this to use `Rate` as exposed by the frame stable clock.
- Closes #6198 .
2019-10-03 15:01:54 +08:00
smoogipoo
2c13043c42
Hook up the event to HitObjectComposer
2019-10-03 14:40:00 +09:00
smoogipoo
3fb0b0b668
Rename to StartTimeChanged and add xmldocs
2019-10-03 14:37:16 +09:00
smoogipoo
f2719afd0e
Add tests for Editorbeatmap
2019-10-03 14:27:40 +09:00
smoogipoo
897b3233af
Add start time tracking to EditorBeatmap
2019-10-03 14:23:48 +09:00
Dean Herbert
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
smoogipoo
f8eb07b211
Only lock database for the duration of a model restoration
2019-10-03 11:24:17 +09:00
Dean Herbert
c85d7c8b3f
Merge branch 'master' into reduce-database-deletion-locks
2019-10-03 10:17:27 +08:00
Joehu
8017788521
Revert "Fix alt-f4 being blocked in interface"
...
This reverts commit 752dd26a4f
2019-10-02 16:08:24 -07:00
Joehu
148089f160
Revert "Remove unnecessary exitConfirmed condition check"
...
This reverts commit 38fe519c91
2019-10-02 16:08:19 -07:00
Joehu
38fe519c91
Remove unnecessary exitConfirmed condition check
2019-10-02 12:28:48 -07:00
Joehu
ff56453f1a
Fix test regressions
2019-10-02 12:07:07 -07:00
Joehu
752dd26a4f
Fix alt-f4 being blocked in interface
2019-10-02 11:17:43 -07:00
Joehu
a69b9f1148
Fix alt-f4 being blocked during gameplay
2019-10-02 11:16:31 -07:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification
2019-10-02 17:31:34 +02:00
Craftplacer
6929847b08
Remove redundant override
2019-10-02 17:22:34 +02:00
Dean Herbert
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
Dean Herbert
3e07e508f2
Merge branch 'master' into fix-track-leak
2019-10-02 22:20:05 +08:00
smoogipoo
dfaa9531f8
Only lock the database for the duration of a deletion
2019-10-02 18:48:50 +09:00
Dan Balasescu
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
Dan Balasescu
bd987e43a3
Merge pull request #6359 from LanTenDragon/holdformenu-slider-precision
...
Change HoldForMenu slider precision to 50
2019-10-02 18:19:19 +09:00
Dan Balasescu
b161aa22c3
Merge branch 'master' into simplify-exit-logic-of-screens
2019-10-02 18:13:57 +09:00
HDragonHR
faf8fe132e
Change bindable int to float
2019-10-02 12:26:46 +08:00
Dan Balasescu
c52cd02b62
Merge pull request #6348 from GSculerlor/truncate-username
...
Fix username overlap timestamp in match chatroom
2019-10-02 10:46:55 +09:00
Ganendra Afrasya
b6dd610af8
Apply reviews
2019-10-01 23:18:03 +07:00
