Dean Herbert
|
74b5ad9c49
|
Merge branch 'master' into taiko-proxy-optimisation
|
2019-08-28 18:25:46 +09:00 |
|
Dean Herbert
|
ac0628d832
|
Update in line with framework changes (#5856)
Update in line with framework changes
|
2019-08-28 18:23:47 +09:00 |
|
Dean Herbert
|
9a98f39f06
|
Share logic with other rulesets (and make default)
|
2019-08-28 18:12:47 +09:00 |
|
Dean Herbert
|
9752dbf950
|
Fix osu! approach circles fading in too late
|
2019-08-28 18:10:58 +09:00 |
|
Dean Herbert
|
bb22c2d6e4
|
Tidy up text construction
|
2019-08-28 17:29:18 +09:00 |
|
Dean Herbert
|
b1f523dae3
|
Merge remote-tracking branch 'upstream/master' into kudosu-info
|
2019-08-28 17:13:57 +09:00 |
|
Dean Herbert
|
fcf770c744
|
Merge branch 'master' into update-framework
|
2019-08-28 17:04:44 +09:00 |
|
Dean Herbert
|
70da25cfca
|
Update framework
|
2019-08-28 17:03:54 +09:00 |
|
Dean Herbert
|
7ea55a5cdd
|
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
|
2019-08-28 16:36:20 +09:00 |
|
Dan Balasescu
|
af7b2190c1
|
Merge pull request #5858 from EVAST9919/simplify-paginated-container
Refactor PaginatedContainer to avoid code duplication
|
2019-08-28 13:50:17 +09:00 |
|
Dean Herbert
|
bef44b8e58
|
item -> model
|
2019-08-28 13:31:12 +09:00 |
|
Dean Herbert
|
3942c83c18
|
Simplify schedule layout
|
2019-08-28 13:28:57 +09:00 |
|
Dean Herbert
|
27633c8dbd
|
T -> TModel
|
2019-08-28 13:28:21 +09:00 |
|
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 |
|
Andrei Zavatski
|
b6b4173a84
|
Remove unused using
|
2019-08-28 01:27:16 +03:00 |
|
Andrei Zavatski
|
6aef05f5d8
|
Remove useless function
|
2019-08-28 01:16:55 +03:00 |
|
Andrei Zavatski
|
2d7024ffd9
|
Use CancellationTokenSource to avoid unwanted panels creation
|
2019-08-28 01:14:35 +03:00 |
|
Andrei Zavatski
|
9b1e8cf48b
|
Use CancelDelayedTasks instead of private ScheduledDelegate
|
2019-08-28 01:03:51 +03:00 |
|
Andrei Zavatski
|
11df8c5576
|
Remove a lot of loading animation calls
|
2019-08-28 01:02:26 +03:00 |
|
Andrei Zavatski
|
f9841369e8
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting
|
2019-08-27 22:22:28 +03: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 |
|
Andrei Zavatski
|
ed827d514f
|
Add comments
|
2019-08-27 15:36:08 +03:00 |
|
Andrei Zavatski
|
f49b58c102
|
Simplify text building
|
2019-08-27 15:30:41 +03:00 |
|
Andrei Zavatski
|
7f0a4fbef9
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
|
2019-08-27 15:11:55 +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 |
|