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

29117 Commits

Author SHA1 Message Date
smoogipoo
4bf5477252 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-14 17:04:09 +09:00
Dan Balasescu
35623e8513
Merge pull request #9011 from peppy/directory-chooser
Add a basic directory chooser component
2020-05-14 16:13:48 +09:00
Dan Balasescu
39f8f7ed78
Merge branch 'master' into directory-chooser 2020-05-14 15:23:52 +09:00
Dan Balasescu
99b90b9b72
Merge pull request #8622 from iiSaLMaN/catch-legacy-skin-decoding
Add test for osu!catch skin configuration colour decoding
2020-05-14 15:16:13 +09:00
Salman Ahmed
ff6642190f
Update colour retrieval logic 2020-05-14 07:26:47 +03:00
Salman Ahmed
b161aa72b7
Merge remote-tracking branch 'upstream/master' into catch-legacy-skin-decoding 2020-05-14 07:22:01 +03:00
Dean Herbert
149cb93e8c Add very basic error handling when a directory cannot be enumerated 2020-05-14 13:18:37 +09:00
Dean Herbert
4198f4d96e
Merge pull request #8448 from iiSaLMaN/catch-hyperdash-catcher-colouring
Add support for custom hyper-dash catcher colouring
2020-05-14 13:06:57 +09:00
Dean Herbert
7084b748c3
Merge branch 'master' into catch-hyperdash-catcher-colouring 2020-05-14 10:42:49 +09:00
Dean Herbert
c85ebbc8a2
Merge pull request #8857 from Craftplacer/taiko-don
Add taiko mascot display for legacy skins
2020-05-14 10:41:59 +09:00
Dean Herbert
134a94e86d Rename enum members (no idea what a TaikoDon is) 2020-05-14 10:02:47 +09:00
Dean Herbert
76af6f25f1 Remove pointless test resources 2020-05-14 09:58:58 +09:00
Dean Herbert
9ba1a8af88 Fix mascot getting stuck in clear state on rewind 2020-05-14 09:44:21 +09:00
Bartłomiej Dach
0933217389 Simplify mascot scaling 2020-05-13 18:53:47 +02:00
Bartłomiej Dach
8e023f7c48 Merge branch 'master' into taiko-don 2020-05-13 18:38:19 +02:00
Dan Balasescu
b0cd5c1a08
Merge pull request #8962 from peppy/migration-backend
Storage directory migration support
2020-05-13 21:31:59 +09:00
Dean Herbert
ad1d050fb4 Throw exception on copy timeout 2020-05-13 20:29:15 +09:00
Dean Herbert
49e616b7e5 Also check for directory presence before migrating 2020-05-13 20:19:14 +09:00
Dean Herbert
9de216f1b4 Merge branch 'master' into migration-backend 2020-05-13 20:15:22 +09:00
Dean Herbert
6f2cc23a43
Merge branch 'master' into taiko-don 2020-05-13 19:27:54 +09:00
Dean Herbert
46608615b0 Merge branch 'master' into fix-taiko-scroller-time-control 2020-05-13 19:20:02 +09:00
Dean Herbert
00efeb7cc6 Fix spawning too many sprites due to not yet populated sizing 2020-05-13 19:19:58 +09:00
Dean Herbert
c048d9b6ae Fix incorrect assignment 2020-05-13 18:55:06 +09:00
Dean Herbert
e9e03d038d Tidy up naming and structure 2020-05-13 18:54:46 +09:00
Dean Herbert
246812e0b1 Change breadcrumb display icons to match design 2020-05-13 18:54:45 +09:00
Dean Herbert
49e4fc6cba Move to better namespace 2020-05-13 18:54:45 +09:00
Dean Herbert
2c83417c41 Switch to using DirectoryInfo/DriveInfo 2020-05-13 18:54:45 +09:00
Dean Herbert
8500f8fe76 Add basic implementation 2020-05-13 18:54:45 +09:00
Dean Herbert
e87d9b8208
Merge pull request #9009 from smoogipoo/disable-mania-rightclick-placement
Fix crashes when pressing right-click while placing hold notes
2020-05-13 15:14:13 +09:00
smoogipoo
78f1b230e9 Disable right-click placement in the mania editor 2020-05-13 14:43:50 +09:00
Dean Herbert
18d71c6894
Merge pull request #9002 from Craftplacer/cacheas-game-components
Use CacheAs for caching game-wide components
2020-05-13 11:42:48 +09:00
Dean Herbert
6b4c514ece
Merge pull request #8981 from huoyaoyuan/json-converter
Use strongly-typed JsonConverter
2020-05-13 11:21:31 +09:00
Dean Herbert
bbf4c687a8 Improve xmldoc 2020-05-13 11:09:17 +09:00
Bartłomiej Dach
942cc48e99 Improve mascot scaling 2020-05-12 20:26:11 +02:00
Huo Yaoyuan
f07d95ac59 Use IReadOnlyList<T> for TypedListConverter. 2020-05-12 21:49:55 +08:00
Huo Yaoyuan
f7d26688f4 Merge branch 'master' into json-converter 2020-05-12 21:43:02 +08:00
Dean Herbert
e28e89213f Fix incorrect spawning when scale adjustments are applied to child sprites 2020-05-12 16:58:47 +09:00
Dean Herbert
c7d8793c1d Remove unnecessary overlap 2020-05-12 15:44:14 +09:00
Dean Herbert
949e17cc0e Rework scroller to support backwards playback 2020-05-12 15:23:47 +09:00
Craftplacer
a86c7f478c Initial commit 2020-05-12 05:49:35 +02:00
Dean Herbert
75a40578e8 Revert ContextFactory to private 2020-05-12 12:39:52 +09:00
Dean Herbert
e4a23b3e7d Fix ignored excluding more than top level 2020-05-12 12:39:04 +09:00
Dan Balasescu
ab9149844a
Merge pull request #9001 from peppy/fix-diff-recommender-nullref
Fix null reference in difficulty recommender
2020-05-12 11:55:54 +09:00
Dan Balasescu
ead747bfdb
Merge pull request #9000 from peppy/fix-incorrect-drum-alignment
Fix version-dependent skin elements looking incorrect when beatmap skins are enabled
2020-05-12 11:55:40 +09:00
Dean Herbert
e9804bf11b Update resources 2020-05-12 11:55:34 +09:00
Dean Herbert
3b1680583e Fix taiko scroller not following gameplay time 2020-05-12 11:31:08 +09:00
Dean Herbert
a5c1b461f6 Fix null reference in difficulty recommender 2020-05-12 11:14:51 +09:00
Dean Herbert
bf719f98d5 Fix beatmap skins providing fallback version lookup, preceding user skins 2020-05-12 11:08:30 +09:00
Bartłomiej Dach
e5821ff2b2 Integrate GameplayBeatmap changes 2020-05-11 22:53:05 +02:00
Dean Herbert
984f27c107 Add simple retry logic on file copy failure (may be in use) 2020-05-11 21:39:44 +09:00