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

21581 Commits

Author SHA1 Message Date
Dean Herbert
4f3511e8e9 Fix ring glow lookup being incorrect 2019-09-03 12:32:10 +09:00
Dan Balasescu
93c3e5a072
Merge pull request #5893 from peppy/play-to-gameplay
Rename "play" resources to "gameplay"
2019-09-03 12:26:42 +09:00
Dean Herbert
de2d3121f7 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.0' into play-to-gameplay 2019-09-03 12:06:10 +09:00
dependabot-preview[bot]
11dfdc33d5
Bump ppy.osu.Game.Resources from 2019.830.0 to 2019.903.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.830.0 to 2019.903.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.830.0...2019.903.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 03:05:45 +00:00
Dean Herbert
444419b2e6 Update resources 2019-09-03 12:04:49 +09:00
Dean Herbert
4a8bdbd014 Merge remote-tracking branch 'upstream/master' into play-to-gameplay 2019-09-03 12:04:46 +09:00
Dan Balasescu
6a3f210766
Merge pull request #5961 from jorolf/background-beat
Add a 60bpm beat when no beatmap is playing
2019-09-03 11:49:19 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
smoogipoo
eab06995d0 Add some whitespace 2019-09-03 11:37:56 +09:00
smoogipoo
ec8726e163 Merge remote-tracking branch 'origin/master' into background-beat 2019-09-03 11:35:20 +09:00
Dan Balasescu
97b824d7d2
Merge pull request #5892 from peppy/iskincomponent
Introduce the concept of SkinComponents
2019-09-03 11:31:36 +09:00
jorolf
3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
Dean Herbert
3443a9517f
Merge pull request #5953 from peppy/fix-direct-panel-unbind-nullref
Fix potential null reference on DirectPanel unbind
2019-09-02 21:35:17 +09:00
Dean Herbert
d688aee258
Add other sample functions to SkinnableSound (#5728)
Add other sample functions to SkinnableSound

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 19:14:45 +09:00
Dean Herbert
b460f76fa6 Adjust file spacing slightly 2019-09-02 19:01:43 +09:00
Dean Herbert
0bfe4650c3 Early return if no change occurred in looping value 2019-09-02 19:01:17 +09:00
Dean Herbert
f08b523abf Name tuple items 2019-09-02 18:20:30 +09:00
Dean Herbert
9c53430a0f Only initialise when required 2019-09-02 18:18:59 +09:00
Dean Herbert
eaeecfb300 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-09-02 18:15:17 +09:00
Dean Herbert
6009cd2537
Fix OsuLegacySkin fallback logic being incorrect (#5948)
Fix OsuLegacySkin fallback logic being incorrect

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-02 17:23:18 +09:00
Dean Herbert
be5baef386
Merge pull request #5778 from EVAST9919/kudosu-info
Add kudosu history to UserProfileOverlay
2019-09-02 17:22:53 +09:00
Dan Balasescu
7e0e4d9fbc
Merge branch 'master' into fix-config-fallback-logic 2019-09-02 17:20:26 +09:00
Dean Herbert
841da7d691 Fix potential null reference on DirectPanel unbind 2019-09-02 17:12:32 +09:00
Dean Herbert
d21d68b36c Refactor to match web implementation 1:1 2019-09-02 17:04:38 +09:00
Dan Balasescu
370ac49ea5
Merge pull request #5934 from iiSaLMaN/fix-switching-ruleset-unpauses-beatmap
Ensure playing track of beatmap selected only if a track change occurred
2019-09-02 16:06:25 +09:00
Dean Herbert
0985b1679f Move enum to response class 2019-09-02 15:57:55 +09:00
Dean Herbert
3d551b08a9 Rename legacy actions 2019-09-02 15:57:23 +09:00
Dean Herbert
da45070373 Group common prefixes together 2019-09-02 15:44:21 +09:00
Dean Herbert
c06908adf7 Fix spacing specifications 2019-09-02 15:37:38 +09:00
Dean Herbert
13fadec6ec Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-09-02 15:25:41 +09:00
Dan Balasescu
daa2007b41
Merge branch 'master' into fix-switching-ruleset-unpauses-beatmap 2019-09-02 15:24:01 +09:00
Dean Herbert
bb02ef22ab
Delay initial hitobject state computation (#5951)
Delay initial hitobject state computation

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 15:23:40 +09:00
Dean Herbert
e1e4c00a15
Merge branch 'master' into improve-scrolling-ruleset-performance 2019-09-02 15:09:48 +09:00
smoogipoo
d74e1b9b64 Remove from dictionary on Remove() 2019-09-02 15:06:43 +09:00
smoogipoo
8f8d35bd15 Delay initial hitobject state computation 2019-09-02 15:06:34 +09:00
Dean Herbert
1e0e4776a2 Merge remote-tracking branch 'origin/iskincomponent' into iskincomponent 2019-09-02 14:41:36 +09:00
Dean Herbert
0f04357f1f Revert short name change for now 2019-09-02 14:41:14 +09:00
Dean Herbert
f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
Dean Herbert
81e8290caf
Merge pull request #5334 from stanriders/beatmapset-genre-language
Add genre and language sections to beatmapset overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 14:16:55 +09:00
Dean Herbert
ed637bc26e
Hide taiko swell ticks (#5950)
Hide taiko swell ticks

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 14:16:34 +09:00
Dean Herbert
13bb0676b1
Merge branch 'master' into fix-taiko-swell-tick-display 2019-09-02 13:47:04 +09:00
Dean Herbert
78f753d919
Merge pull request #5949 from smoogipoo/fix-swell-timeoffset
Fix taiko swell tick judgements having non-zero time offsets
2019-09-02 13:46:37 +09:00
Dean Herbert
043034a6ce Merge remote-tracking branch 'upstream/master' into beatmapset-genre-language 2019-09-02 13:45:25 +09:00
Dean Herbert
d4c12881f5 Remove unnecessary over-complication and fix transitions 2019-09-02 13:45:13 +09:00
Dean Herbert
6603cbd74d No language doesn't mean "Other" 2019-09-02 13:41:14 +09:00
smoogipoo
1df422e591 Hide taiko swell ticks 2019-09-02 13:30:55 +09:00
smoogipoo
5b685c4cd2 Fix swell ticks having non-zero time offsets 2019-09-02 13:25:39 +09:00
smoogipoo
fc668d8a74 Move autoplay mod to a less overridable location 2019-09-02 13:24:39 +09:00
smoogipoo
2945fef62d Expose HasCompleted from ScoreProcessor 2019-09-02 13:04:30 +09:00