1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-29 21:07:19 +08:00

14398 Commits

Author SHA1 Message Date
Dean Herbert
a7d7a28d34
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-04 11:05:28 +08:00
Dean Herbert
925615320e Update lazer default combo colours to match stable 2019-10-04 10:46:48 +08:00
Dean Herbert
d2c9a29c0d Remove unnecessary local assign 2019-10-04 10:45:18 +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
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
smoogipoo
bcf0b2752e Fix possible MusicController nullref 2019-10-03 18:48:44 +09:00
smoogipoo
2d0c522398 Remove unused method 2019-10-03 18:43:46 +09: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
897b3233af Add start time tracking to EditorBeatmap 2019-10-03 14:23:48 +09: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 752dd26a4f5a73823a9acbcbc5b518f9a9b6f4bf.
2019-10-02 16:08:24 -07:00
Joehu
148089f160 Revert "Remove unnecessary exitConfirmed condition check"
This reverts commit 38fe519c91f9836f46b6a9347e4ceb97a96f0d67.
2019-10-02 16:08:19 -07:00
Joehu
38fe519c91 Remove unnecessary exitConfirmed condition check 2019-10-02 12:28:48 -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
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
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
Ganendra Afrasya
b6dd610af8 Apply reviews 2019-10-01 23:18:03 +07: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
Joehu
e3502f5200 Fix typo on Key.Escape comment 2019-10-01 08:37:08 -07:00
Joehu
ff6367fa4b Make back button glow when pressing escape 2019-10-01 08:26:45 -07:00
Joehu
5f700f2ae9 Simplify exit logic of screens with textboxes using back button receptor 2019-10-01 08:26:34 -07:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification 2019-10-01 17:26:11 +02:00
Ganendra Afrasya
208b9a4eba Add new virtual float for username to timestamp padding 2019-10-01 20:47:53 +07:00
smoogipoo
a310c4b65f Make selection blueprints a bit more testable 2019-10-01 19:32:47 +09:00
smoogipoo
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09:00
Dan Balasescu
b4da92e5a6
Merge branch 'master' into bot-profile 2019-10-01 16:26:48 +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
smoogipoo
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49:09 +09:00
Dean Herbert
351e89bf18 Update framework 2019-09-30 22:03:56 +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