1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 03:17:28 +08:00
Commit Graph

23046 Commits

Author SHA1 Message Date
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
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
c5540048ab Fix tail circle not moving with slider position changes 2019-10-01 19:39:06 +09:00
smoogipoo
90ad1c5166 Add more tests for slider selection blueprint 2019-10-01 19:33:27 +09:00
smoogipoo
ba5c9547e1 Add more tests for hitcircle selection blueprint 2019-10-01 19:33:15 +09:00
smoogipoo
a310c4b65f Make selection blueprints a bit more testable 2019-10-01 19:32:47 +09:00
smoogipoo
afb6023309 Merge remote-tracking branch 'origin/master' into rework-selection-updates 2019-10-01 18:39:39 +09:00
smoogipoo
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09: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
smoogipoo
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49: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
42d1379848 Load the rulesets lasily 2019-09-29 20:40:23 +02: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
193a9b0dd7
Merge branch 'master' into labelled-switch-button 2019-09-29 14:56:26 +08:00