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

29312 Commits

Author SHA1 Message Date
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
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
Dean Herbert
3565fe1cb2 Fix incorrect passing logic 2020-05-10 07:51:39 +09:00
Dean Herbert
7ce78d8ce4
Merge branch 'master' into taiko-scroller 2020-05-09 23:25:54 +09:00
Dan Balasescu
c9b1735a53
Merge pull request #8982 from peppy/fix-nullref-on-early-exit
Fix null reference causing hard freeze if game is forcefully closed during disclaimer
2020-05-09 20:25:18 +09:00
Dean Herbert
5dda94187e Add more edge case testing 2020-05-09 20:13:44 +09:00
Dean Herbert
bbebd26efb Use DirectoryInfo in more places 2020-05-09 20:13:31 +09:00
Dean Herbert
0bbf02d916 Merge branch 'master' into migration-backend 2020-05-09 19:32:35 +09:00
Dean Herbert
1348bdaa15 Merge branch 'custom-data-directory' into migration-backend 2020-05-09 19:32:29 +09:00
Dean Herbert
3f78ddf482 Add CanBeNull hinting 2020-05-09 19:13:18 +09:00
Dean Herbert
e2979cbe9a Merge branch 'master' into fix-nullref-on-early-exit 2020-05-09 19:13:11 +09:00
Dean Herbert
fa711a6456 Fix null reference causing hard freeze if game is forcefully closed during disclaimer 2020-05-09 19:11:51 +09:00
Huo Yaoyuan
80a193a616 Use IEnumerable<T> for TypedListConverter. 2020-05-09 17:41:59 +08:00
Dean Herbert
8f370c5ef5
Merge pull request #8980 from LittleEndu/already-downloaded
Check local availability of beatmap before disabling download buttons
2020-05-09 18:32:38 +09:00
Dean Herbert
55e0d91f37 Fix download button being disabled after importing a download disabled beatmap 2020-05-09 18:09:17 +09:00
Huo Yaoyuan
74cbe9306c Use strongly-typed JsonConerter. 2020-05-09 16:39:46 +08:00
Dean Herbert
56f17fa64f
Merge branch 'master' into custom-data-directory 2020-05-09 17:27:16 +09:00
Endrik Tombak
d1976b194d Check local availability before disabling buttons 2020-05-09 10:42:56 +03:00
Dan Balasescu
2d49210250
Merge pull request #8972 from peppy/fix-ruleset-upgrade
Fix loading a ruleset with a new version specification causing a crash
2020-05-08 21:01:17 +09:00
Dean Herbert
5c2778d5f0 Change comparison direction 2020-05-08 20:33:02 +09:00
smoogipoo
be3b77cf25 Fix potentially skipping hitobject updates 2020-05-08 20:09:59 +09:00