1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 18:42:54 +08:00
Commit Graph

23085 Commits

Author SHA1 Message Date
Dean Herbert
fe93df7186 Remove unnecessary using statement 2019-10-31 16:52:56 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector 2019-10-31 16:42:32 +09:00
Dean Herbert
88cead2aab
Implement beatmap ruleset selector component (#6393)
Implement beatmap ruleset selector component

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-31 16:42:18 +09:00
Dean Herbert
bf45fa6309 Use lambda function expression 2019-10-31 16:24:03 +09:00
Dean Herbert
f8187fa301 Don't rely on masking for bar display 2019-10-31 16:23:10 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector 2019-10-31 15:15:52 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room (#6666)
Fix crash when quickly exiting multiplayer after joining a room
2019-10-31 13:15:46 +09:00
Dean Herbert
e4270dc57c
Simplify EditorClock.Seek method (#6667)
Simplify EditorClock.Seek method
2019-10-30 19:26:43 +09:00
Dean Herbert
7f2916454d Simplify EditorClock.Seek method 2019-10-30 19:09:46 +09:00
Dan Balasescu
073066170c
Merge pull request #6632 from peppy/bindable-control-points
Bindable control points
2019-10-30 18:32:12 +09:00
smoogipoo
cf2d885099 Fix control points being flushed too late 2019-10-30 18:02:18 +09:00
smoogipoo
45af796943 Remove usages of EF internals 2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points 2019-10-30 16:20:54 +09:00
Dan Balasescu
7d61e5cfd5
Merge pull request #6635 from peppy/bindable-control-point-properties
Bindable control point properties
2019-10-30 16:20:10 +09:00
Dan Balasescu
3045ba4bf4
Merge branch 'master' into bindable-control-point-properties 2019-10-30 16:02:39 +09:00
Dan Balasescu
ced6042b3e
Use internal type name 2019-10-30 15:51:09 +09:00
smoogipoo
f56d9fe50c Forcefully part room when multiplayer exits 2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9 Cancel room joins on part 2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123 Don't log cancelled join requests 2019-10-30 14:38:06 +09:00
Dean Herbert
d7ea264ef4
Fix 1x1 white pixel appearing in the centre of hitcircles on de… (#6658)
Fix 1x1 white pixel appearing in the centre of hitcircles on default skin

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-30 12:43:55 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events (#6636)
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dan Balasescu
a03da25e05
Merge branch 'master' into fix-white-pixel 2019-10-30 12:35:22 +09:00
Dan Balasescu
7204ecf166
Merge pull request #6662 from GSculerlor/signin-ux-improvement
Add feedback to user when sign in form isn't filled
2019-10-30 12:35:16 +09:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement 2019-10-30 12:10:52 +09:00
Dan Balasescu
53b85c1681
Merge pull request #6653 from peppy/fix-day-separator-purging
Fix day separators never being removed from chat history
2019-10-30 12:03:41 +09:00
Ganendra Afrasya
5c2917d303 Place sign in button inside ShakeContainer 2019-10-30 00:50:04 +07:00
Dean Herbert
e9cb3337b3 Fix 1x1 white pixel appearing in the centre of hitcircles on default skin 2019-10-29 22:31:27 +09:00
Dean Herbert
04b0916196
Merge branch 'master' into fix-day-separator-purging 2019-10-29 18:44:39 +09:00
Dean Herbert
e1d0d78858
Fix chat not always scrolling to the bottom (#6649)
Fix chat not always scrolling to the bottom
2019-10-29 18:43:09 +09:00
Dean Herbert
3de45eb04a
Fix loader animation tests failing occasionally (#6655)
Fix loader animation tests failing occasionally
2019-10-29 18:18:17 +09:00
Dean Herbert
f4c4523034 Merge branch 'update-framework' into fix-chat-scroll-to-bottom 2019-10-29 18:17:41 +09:00
Dean Herbert
342dfc26d2 Merge remote-tracking branch 'upstream/master' into fix-chat-scroll-to-bottom 2019-10-29 18:17:38 +09:00
Dean Herbert
3f192ca915
Fix song progress not displaying correctly (#6640)
Fix song progress not displaying correctly

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-29 18:16:54 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default (#6641)
Fix PlayerSettingsOverlay being shown by default
2019-10-29 18:16:33 +09:00
Dean Herbert
89d3f461e0
Fix download tracking components getting stuck on import failur… (#6639)
Fix download tracking components getting stuck on import failures
2019-10-29 18:16:23 +09:00
Dan Balasescu
f4ae65c3e8
Merge branch 'master' into fix-song-progress-display 2019-10-29 18:06:58 +09:00
Dean Herbert
97c1a6e86b Update framework 2019-10-29 18:05:32 +09:00
Dean Herbert
7c6ccce3ba Add tests covering precision case 2019-10-29 18:02:30 +09:00
Dean Herbert
8e1faf6ff1 Fix loader animation tests failing occasionally 2019-10-29 17:03:52 +09:00
Dean Herbert
d1ac5b2e7d
Merge pull request #6637 from peppy/labelled-component-bindables
Expose Current bindable in LabelledComponents
2019-10-29 16:53:42 +09:00
Dan Balasescu
f0f58c22d3
Merge branch 'master' into labelled-component-bindables 2019-10-29 16:32:57 +09:00
Dean Herbert
54befb6f8f Remove adjacent day separators 2019-10-29 15:45:41 +09:00
Dean Herbert
b06e70e546 Add failing test showing issue with day separator logic 2019-10-29 15:27:08 +09:00
Dean Herbert
09a6d1184a Tidy up order of scroll changes 2019-10-29 14:33:05 +09:00
Dean Herbert
d1c6e3f620 Add test for scroll to end when max history is exceeded 2019-10-29 14:32:52 +09:00
Dean Herbert
34aa0b14a4
Merge pull request #6644 from peppy/fix-triangles-performance
Fix game-wide performance drop when triangles intro is used
2019-10-29 13:49:05 +09:00
Dan Balasescu
c25a243d5b
Merge branch 'master' into fix-triangles-performance 2019-10-29 13:31:33 +09:00
Dean Herbert
ecf14bc7b9 Rename class to match 2019-10-29 01:21:17 +09:00
Dean Herbert
e93e9067a1
Fix beatmap carousel sorting instability (#6630)
Fix beatmap carousel sorting instability
2019-10-29 01:19:42 +09:00
Dean Herbert
a4a57eec54 Fix game-wide performance drop when triangles intro is used 2019-10-29 01:09:49 +09:00