1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:47:52 +08:00
Commit Graph

21365 Commits

Author SHA1 Message Date
Dean Herbert
f18b5a3c02 Remove "AllowCreate" function by instead handling nulls 2019-08-28 13:27:44 +09:00
smoogipoo
7cc92e2fad Make taiko proxy containers use LifetimeManagementContainer 2019-08-28 13:20:28 +09:00
Dean Herbert
c4aaab20c7 Merge remote-tracking branch 'upstream/master' into simplify-paginated-container 2019-08-28 13:15:57 +09:00
Dean Herbert
1aa09ff05c
Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank
Try retrieving samples without bank names
2019-08-28 13:12:51 +09:00
Dan Balasescu
759f6219ae
Merge pull request #5860 from peppy/fix-skin-switch-samples
Fix hitsounds not updating immediately after switching skins
2019-08-28 11:59:02 +09:00
Dean Herbert
4add1727b7 Fix hitsounds not updating immediately after switching skins 2019-08-28 03:25:57 +09:00
iiSaLMaN
18431a42e6 Resolve merge conflicts 2019-08-27 20:06:17 +03:00
iiSaLMaN
4ef991b973 Loop over lookup names on default-samples retrieval 2019-08-27 19:42:17 +03:00
Andrei Zavatski
5fd43d42f4 CI fixes 2019-08-27 16:09:37 +03:00
Andrei Zavatski
9a383eee1a Add AllowCreate function 2019-08-27 15:58:57 +03:00
Andrei Zavatski
22ee7db805 Refactor PaginatedContainer to avoid code duplication 2019-08-27 15:47:37 +03:00
Dean Herbert
b59973c712 Update in line with framework changes 2019-08-27 18:43:58 +09:00
Dean Herbert
0f25ad8b87
Merge pull request #5850 from smoogipoo/fix-taiko-proxy-rewind
Fix taiko proxies being removed on rewind
2019-08-27 18:38:03 +09:00
Dean Herbert
0fba446c01
Obsolete legacy UpdateState() method (#5853)
Obsolete legacy UpdateState() method
2019-08-27 18:34:16 +09:00
Dean Herbert
7ccc409df7 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7 Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
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