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

21832 Commits

Author SHA1 Message Date
smoogipoo
3723c441d2 Merge remote-tracking branch 'origin/master' into fix-taiko-proxy-rewind
# Conflicts:
#	osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
2019-08-27 17:42:45 +09:00
Dan Balasescu
a2a33c9519
Merge pull request #5855 from peppy/fix-skin-sample-reading
Fix skin sample reading failing
2019-08-27 17:41:35 +09:00
Dean Herbert
0ea10a4922 Fix skin sample reading failing 2019-08-27 17:18:32 +09:00
smoogipoo
9e926d44c0 Obsolete legacy UpdateState() method 2019-08-27 16:09:47 +09:00
Dean Herbert
2a3f3dacb3
Merge pull request #5848 from iiSaLMaN/use-transform-management-for-taiko-ruleset
Use automatic state logic for taiko ruleset

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-27 15:49:15 +09:00
smoogipoo
2b22fd799d Use constant value for offset 2019-08-27 15:33:53 +09:00
smoogipoo
bc7a81e733 Add initial fade transform 2019-08-27 15:33:53 +09:00
smoogipoo
dba3679817 Fix DrawableSwell not proxying its content in time/correctly 2019-08-27 15:33:28 +09:00
smoogipoo
b85e62a6e2 Fix taiko proxies being removed on rewind 2019-08-27 15:24:49 +09:00
Dean Herbert
66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank 2019-08-27 14:44:16 +09:00
Dean Herbert
70a3183b73
Merge pull request #5816 from Game4all/select-filters-persistence
Save user's group and sort filter choices

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-27 14:42:54 +09:00
Dean Herbert
7885c79467 Make bindables private 2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence 2019-08-27 14:12:59 +09:00
Dean Herbert
8b8c747ad5
Use automatic state logic for mania ruleset (#5844)
Use automatic state logic for mania ruleset
2019-08-27 13:20:39 +09:00
Salman Ahmed
ba969d2d7d
Merge branch 'master' into use-transform-managment-for-mania-ruleset 2019-08-27 07:07:58 +03:00
smoogipoo
fff2da7289 Fix hold notes disappearing instantaneously 2019-08-27 12:59:57 +09:00
Dan Balasescu
1237a63619
Merge pull request #5842 from iiSaLMaN/use-transform-state-management-for-catch
Use automatic state logic for catch ruleset
2019-08-27 12:22:41 +09:00
smoogipoo
6014a66804 Add initial fade transform to fix rewind 2019-08-27 12:22:31 +09:00
Dan Balasescu
9acbf59e68
Merge branch 'master' into use-transform-state-management-for-catch 2019-08-27 12:11:56 +09:00
Dean Herbert
fac05bf60b
Merge pull request #5840 from EVAST9919/fix-diff-icons
Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-27 12:10:47 +09:00
smoogipoo
6368189d46 Refactor 2019-08-27 11:59:25 +09:00
iiSaLMaN
0eef398ca7 Remove redundant using directive 2019-08-27 05:19:21 +03:00
iiSaLMaN
cd68d030bd Remove unnecessary UpdateState overrides 2019-08-27 05:04:34 +03:00
iiSaLMaN
843da26dba Use transform management for taiko hit objects 2019-08-27 05:03:56 +03:00
Dean Herbert
6aab7168d4
Merge branch 'master' into relative-beat-lengths 2019-08-27 10:59:52 +09:00
iiSaLMaN
c11f508400 Use transform management for mania hit objects 2019-08-26 22:06:30 +03:00
iiSaLMaN
24e7146a97 Revert unintended change 2019-08-26 15:26:19 +03:00
iiSaLMaN
62edfe7327 Correct comment 2019-08-26 15:16:01 +03:00
iiSaLMaN
3f93780306 Override transform update functions in bar line 2019-08-26 15:15:48 +03:00
iiSaLMaN
fb69755869 Use transform management for catch hit objects 2019-08-26 15:15:23 +03:00
Andrei Zavatski
9321f20884 Move arrow to the first line 2019-08-26 14:32:27 +03:00
Andrei Zavatski
fd0f42eee4 Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load 2019-08-26 14:11:24 +03:00
Dean Herbert
d11930d90c
Add a sane default lifetime end for scrolling hitobjects (#5837)
Add a sane default lifetime end for scrolling hitobjects

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-26 19:30:16 +09:00
Dean Herbert
07380af877
Merge branch 'master' into scrolling-lifetime-safety 2019-08-26 19:07:05 +09:00
Dean Herbert
0422c19c2f Group lifetime setters together 2019-08-26 19:06:23 +09:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths 2019-08-26 18:59:50 +09:00
Dean Herbert
28dc51279a
Allow RulesetConfigCache to return null configs (#5835)
Allow RulesetConfigCache to return null configs
2019-08-26 18:59:26 +09:00
Dean Herbert
b41bed8ba0
Add nullref safety to FrameStablePlayback boolean (#5834)
Add nullref safety to FrameStablePlayback boolean
2019-08-26 18:58:27 +09:00
Dean Herbert
1ec69ecef8
Fx component lookups being incorrect for non-databased legacy s… (#5838)
Fx component lookups being incorrect for non-databased legacy skins
2019-08-26 18:57:04 +09:00
Dean Herbert
62641c149d Fx component lookups being incorrect for non-databased legacy skins 2019-08-26 18:20:45 +09:00
Dan Balasescu
3cdd3cc9fa
Merge pull request #5725 from Desconocidosmh/master
Fix autoplay missing very dense notes on Taiko and Mania
2019-08-26 18:17:48 +09:00
smoogipoo
d4a296f911 Slight refactoring 2019-08-26 17:45:12 +09:00
smoogipoo
fd4c6e08ca Merge remote-tracking branch 'origin/master' 2019-08-26 17:37:06 +09:00
Dan Balasescu
7dbd54f611
Merge pull request #5832 from peppy/fix-beatmap-skin-parse-fail
Don't return DefaultSkin on beatmap skin parsing failure
2019-08-26 16:52:10 +09:00
smoogipoo
fb1cd9e5e7 Add a sane default lifetime end for scrolling hitobjects 2019-08-26 16:47:23 +09:00
smoogipoo
6dfe95db74 Allow RulesetConfigCache to return null configs 2019-08-26 16:34:12 +09:00
smoogipoo
6596d7fc46 Add nullref safety to FrameStablePlayback boolean 2019-08-26 16:33:24 +09:00
smoogipoo
fb8b5ee106 Add test 2019-08-26 16:31:46 +09:00
smoogipoo
1cfe2b7de8 Fix timing points beyond the end time potentially becoming dominant 2019-08-26 16:31:34 +09:00
Dean Herbert
db987c6077 Move SliderBall colour logic to OsuLegacySkinProvider 2019-08-26 14:45:29 +09:00