1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 13:22:57 +08:00
Commit Graph

30833 Commits

Author SHA1 Message Date
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
「空白」
35e7cee458 Squash commits from private fork
Temporary comments left to-remove later
2020-05-12 03:18:47 +09:00
Bartłomiej Dach
848a3fb6d7 Take hitobject start/end times into account in drain 2020-05-11 19:06:36 +02:00
Bartłomiej Dach
e650b10b5e Add test case for maximal break 2020-05-11 19:03:41 +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
Bartłomiej Dach
1d999bb634 Integrate PeriodTracker changes 2020-05-10 18:32:38 +02:00
Bartłomiej Dach
ee2ff77b89 Merge branch 'master' into fix-draining-in-between-break-sections 2020-05-10 17:57:44 +02:00
Bartłomiej Dach
5bab53b04c Centralise trail visibility state management 2020-05-10 17:05:30 +02:00
Bartłomiej Dach
77e5e131c9 Merge branch 'master' into catch-hyperdash-catcher-colouring 2020-05-10 16:49:44 +02:00
Dean Herbert
8243dc239a
Merge branch 'master' into taiko-don 2020-05-10 22:34:47 +09:00
Dean Herbert
da368383aa
Merge pull request #8945 from Game4all/publicly-expose-hud
Add ability for a ruleset to disable gameplay overlays from displaying
2020-05-10 22:10:37 +09:00
Dean Herbert
44fdf1e6b0
Reword xmldoc 2020-05-10 20:09:41 +09:00
Dean Herbert
c712e98f2b
Merge branch 'master' into publicly-expose-hud 2020-05-10 20:06:28 +09:00
Dean Herbert
36ee54f876
Merge pull request #8973 from smoogipoo/mania-holdnote-selection-fix
Fix hold note selection pieces disappearing on movement
2020-05-10 15:30:58 +09:00
Dean Herbert
729585e151
Merge branch 'master' into mania-holdnote-selection-fix 2020-05-10 15:07:30 +09:00
Dan Balasescu
2f12c4126a
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-10 13:49:08 +09:00
smoogipoo
738c6da594 Implement midi keybindings 2020-05-10 13:39:20 +09:00
Dean Herbert
384862d48b Fix incorrect relative paths when using GetStorageForDirectory 2020-05-10 13:20:13 +09:00
Dean Herbert
5902cd81a4 Move passing transforms to post-load for safety 2020-05-10 07:52:54 +09:00