1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 17:27:24 +08:00
Commit Graph

29060 Commits

Author SHA1 Message Date
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
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
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
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
Dean Herbert
a11be07bb1 Move log storage location after migration complete 2020-05-11 21:39:44 +09:00
Dean Herbert
6c350db097 Add connection flushing support 2020-05-11 21:39:44 +09:00
Dean Herbert
d5ae8f5ef4
Merge pull request #8986 from smoogipoo/midi-keybinds
Implement midi keybindings
2020-05-11 19:48:54 +09:00
Dean Herbert
36640f5dda Merge branch 'master' into migration-backend 2020-05-11 18:52:36 +09:00
Dean Herbert
cd2127d406
Merge branch 'master' into midi-keybinds 2020-05-11 18:43:46 +09:00
Dan Balasescu
a976d84bf5
Merge pull request #8993 from peppy/improve-encoder-test-legibility
Refactor beatmap encoder test to be a bit easier to understand
2020-05-11 17:56:03 +09:00
Dan Balasescu
27e483ee0e
Merge pull request #8989 from peppy/fix-taiko-sample-mapping
Fix taiko sample mapping for strong hits
2020-05-11 17:36:41 +09:00
smoogipoo
ca6e6f7496 Add required parameter for android build 2020-05-11 17:26:11 +09:00
Dean Herbert
b9e5009dd5 Update framework 2020-05-11 17:09:34 +09:00
Dean Herbert
d608714cea Merge branch 'master' into midi-keybinds 2020-05-11 17:09:15 +09:00
Dean Herbert
7f7d5e6617 Fix apparently required argument 2020-05-11 16:37:08 +09:00
Dean Herbert
93440874db Refactor beatmap encoder test to be a bit easier to understand 2020-05-11 16:30:54 +09:00
Dean Herbert
77041bdbb5 Move implementation to DrawableHit to avoid "breaking" legacy encoding 2020-05-11 16:29:50 +09:00
Dean Herbert
aa912881b3
Merge pull request #8990 from smoogipoo/fix-hr-load-performance
Fix hardrock potentially taking a long time to load
2020-05-11 15:15:17 +09:00
Craftplacer
43342c57b8
Fix switch case
... caused by a poor merge
2020-05-11 07:13:06 +02:00
Dan Balasescu
d697de29a6
Merge branch 'master' into taiko-don 2020-05-11 13:24:27 +09:00
Dean Herbert
adf9a90fc4
Merge pull request #8988 from peppy/dont-timeout-during-debug
Don't timeout on long beatmap load when debugging
2020-05-11 13:18:02 +09:00
smoogipoo
f195933844 Fix hardrock potentially taking a long time to load 2020-05-11 13:03:59 +09:00
Dean Herbert
b4d790c076 Fix taiko sample mapping for strong hits 2020-05-11 12:53:54 +09:00
Dean Herbert
916d8245e6 Don't timeout on long beatmap load when debugging 2020-05-11 12:50:47 +09:00
Dan Balasescu
7072207c7c
Merge pull request #8935 from peppy/custom-data-directory
Add basic custom data directory support
2020-05-11 12:49:56 +09:00
Dan Balasescu
0b05a6d895
Merge branch 'master' into custom-data-directory 2020-05-11 12:12:03 +09:00
Dan Balasescu
4768b3ee33
Merge pull request #8920 from peppy/taiko-scroller
Add taiko scroller
2020-05-11 11:46:08 +09:00
Dan Balasescu
6841bd5609
Merge branch 'master' into taiko-scroller 2020-05-11 11:10:55 +09:00