1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 20:22:55 +08:00
Commit Graph

26231 Commits

Author SHA1 Message Date
Dean Herbert
b9a296d3f9
Merge branch 'master' into remove-current-item 2020-02-13 19:34:15 +09:00
Dean Herbert
d633396878
Merge pull request #7816 from smoogipoo/missing-nullcheck
Add missing null-allowance to leaderboard
2020-02-13 19:30:43 +09:00
Dean Herbert
80ead1c979
Merge pull request #7813 from peppy/update-framework
Update framework
2020-02-13 19:29:59 +09:00
smoogipoo
bc1c4f6b58 Add missing null-allowance 2020-02-13 19:04:23 +09:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal
Fix disposal-related errors by making WorkingBeatmap non-disposable
2020-02-13 18:52:47 +09:00
Dean Herbert
49a1725749
Merge pull request #7812 from smoogipoo/playlist-bindables
Make playlist beatmap and ruleset into bindables
2020-02-13 18:51:42 +09:00
smoogipoo
75bef15583 Remove "current" multiplayer room item 2020-02-13 18:48:28 +09:00
Dean Herbert
be2d1c6b43 Update framework 2020-02-13 18:35:31 +09:00
Dean Herbert
d6263adb7b
Merge pull request #7806 from peppy/timeline-zoom-button-repeat
Add mouse down repeat support to timeline zoom buttons
2020-02-13 18:35:11 +09:00
Dean Herbert
24e7c3e11b
Merge pull request #7811 from smoogipoo/mod-expansion-types
Improve extensibility of mod display expansion
2020-02-13 18:34:46 +09:00
smoogipoo
91edadfe9d Make playlist beatmap and ruleset into bindables 2020-02-13 18:12:47 +09:00
smoogipoo
d4f14e552a Improve extensibility of mod display expansion 2020-02-13 18:05:53 +09:00
Dan Balasescu
c384e3cfc2
Merge branch 'master' into timeline-zoom-button-repeat 2020-02-13 18:04:36 +09:00
Dan Balasescu
08d0a08d54
Merge pull request #7803 from peppy/fix-blueprint-outside-container
Fix blueprint showing even when mouse outside of container
2020-02-13 17:54:28 +09:00
Dan Balasescu
97a03729b2
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:54:20 +09:00
Dan Balasescu
cb46d34dd7
Merge pull request #7808 from peppy/disable-interaction-progress-bar
Disallow seeking on osu!direct download progress bars
2020-02-13 17:47:07 +09:00
Dan Balasescu
d80e9550fb
Merge branch 'master' into timeline-zoom-button-repeat 2020-02-13 17:38:45 +09:00
Dan Balasescu
5a90e6f9b5
Merge branch 'master' into fix-blueprint-outside-container 2020-02-13 17:32:49 +09:00
Dan Balasescu
48a6583216
Merge branch 'master' into disable-interaction-progress-bar 2020-02-13 17:20:22 +09:00
Dean Herbert
e941f6c4dd
Merge pull request #7780 from voidedWarranties/difficultyadjust-order
Fix order and naming of Difficulty Adjust sliders
2020-02-13 15:55:00 +09:00
Dean Herbert
e2e6e67f79 Merge branch 'master' into difficultyadjust-order 2020-02-13 14:07:47 +09:00
Dean Herbert
53b62816f8 Add index constants for cross-class safety 2020-02-13 14:07:37 +09:00
Dean Herbert
045d1f9c5b Disallow seeking on osu!direct download progress bars 2020-02-13 13:36:53 +09:00
Dean Herbert
6a2b3c5c02
Merge pull request #7733 from EVAST9919/rankings-overlay-spotlights
Add spotlight selector to RankingsOverlay
2020-02-13 13:14:02 +09:00
Dean Herbert
487dd47c9e Add mouse down repeat support to timeline zoom buttons 2020-02-13 11:14:09 +09:00
Dean Herbert
2b6f99d404 Standardise placement blueprint creation and destruction 2020-02-13 10:12:56 +09:00
Dean Herbert
b65e839bd2 Simplify blueprints by removing visible state 2020-02-13 10:00:09 +09:00
Dean Herbert
0fe41fd50a Fix blueprint showing even when mouse outside of container 2020-02-13 09:03:48 +09:00
voidedWarranties
a8eb9ba45c Update xmldoc 2020-02-12 15:55:16 -08:00
Dan Balasescu
0f1d30c55e
Merge pull request #7730 from TheWildTree/adjust-beatmap-overlay
Adjust minor BeatmapSetOverlay details to better match osu-web
2020-02-12 18:13:45 +09:00
Dan Balasescu
9a9349a13a
Merge branch 'master' into adjust-beatmap-overlay 2020-02-12 16:52:42 +09:00
Dan Balasescu
935aa709b5
Merge pull request #7783 from peppy/fix-song-select-weirdness
Bypass song select filter to show externally changed beatmap temporarily
2020-02-12 15:23:47 +09:00
Dan Balasescu
866b6bb058
Merge branch 'master' into fix-song-select-weirdness 2020-02-12 15:01:15 +09:00
voidedWarranties
e9b5137147 Remove >-1 limitation by using a separate constructor 2020-02-11 21:52:22 -08:00
Dan Balasescu
c080ebcc50
Merge pull request #7792 from recapitalverb/info-column-min-width
Fix InfoColumn minWidth implementation
2020-02-12 14:06:17 +09:00
Dan Balasescu
e8ea0dcc02
Merge branch 'master' into info-column-min-width 2020-02-12 13:45:16 +09:00
Dan Balasescu
1d8f7cb4d7
Merge pull request #7793 from peppy/fix-crash-on-exit
Fix potential crash when exiting game while entering song select
2020-02-12 13:35:37 +09:00
Tree
b694b0c90c
Merge branch 'master' into adjust-beatmap-overlay 2020-02-11 21:07:26 +01:00
Dean Herbert
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
recapitalverb
2be7d1a873 Remove redundant type specification 2020-02-11 18:19:08 +07:00
recapitalverb
44568ac9e6 Avoid covariant array conversion 2020-02-11 17:36:10 +07:00
recapitalverb
28a39fd8fa Use explicit typing 2020-02-11 17:12:32 +07:00
recapitalverb
17791259ed Fix InfoColumn minWidth implementation 2020-02-11 16:21:31 +07:00
Dean Herbert
333f976580 Fix test finding deleted beatmaps under dotnet-test 2020-02-11 17:47:10 +09:00
voidedWarranties
3d1183eea0
Merge branch 'master' into difficultyadjust-order 2020-02-10 16:46:24 -08:00
voidedWarranties
ca237fd987 Simplify ordering by using only numbers, add xmldoc 2020-02-10 16:21:49 -08:00
Dean Herbert
804d210250
Merge pull request #7756 from peppy/seek-to-endtime-on-placement
Seek to previous object's end time on successful placement
2020-02-11 08:45:15 +09:00
Andrei Zavatski
0b6558dc40 Add SpotlightsLayout to RankingsOverlay 2020-02-11 02:35:23 +03:00
Andrei Zavatski
b04a4b5c8a Implement SpotlightsLayout 2020-02-11 01:44:56 +03:00
Andrei Zavatski
ed6a35cb9f Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-spotlights 2020-02-11 00:18:11 +03:00