1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
Commit Graph

28407 Commits

Author SHA1 Message Date
Dan Balasescu
eb7b04d8bc
Merge branch 'master' into fix-osu-hidden-mod-alt 2020-04-20 17:47:27 +09:00
Dan Balasescu
0428ea4dac
Merge pull request #8779 from peppy/fix-song-select-desync
Fix presenting new ruleset and beatmap at once causing wedge display desync
2020-04-20 16:02:16 +09:00
Dan Balasescu
367c3e69c4
Merge pull request #8788 from peppy/fix-editor-hard-crash
Fix hard crash in editor on legacy modes without encoder implementation
2020-04-20 15:25:48 +09:00
Dan Balasescu
dd7c6a83bd
Merge branch 'master' into fix-song-select-desync 2020-04-20 15:23:19 +09:00
Dan Balasescu
ddc5489fc9
Merge pull request #8801 from peppy/add-np-command
Add /np (now playing) command support in chat
2020-04-20 14:07:39 +09:00
Dan Balasescu
b3fa04d88f
Merge pull request #8806 from peppy/fix-keybinding-defaults
Fix DatabasedKeyBindingContainer not using defaults for non-databased ruleset
2020-04-20 14:07:30 +09:00
Dean Herbert
ee1ccb8bcb Fix in a slightly different and hopefully more understandable way 2020-04-20 14:03:55 +09:00
Dean Herbert
c2f6237f51
Merge pull request #8808 from smoogipoo/reword-exception
Fix typo in exception
2020-04-20 13:46:59 +09:00
Dan Balasescu
eba9889dd8
Merge branch 'master' into add-np-command 2020-04-20 13:41:42 +09:00
Dan Balasescu
ff88b11080
Merge branch 'master' into fix-keybinding-defaults 2020-04-20 13:29:51 +09:00
smoogipoo
355e682e24 Fix typo in exception 2020-04-20 13:23:27 +09:00
Dean Herbert
f56b85ce27 Merge branch 'master' into fix-song-select-desync 2020-04-20 12:54:32 +09:00
Dean Herbert
70ef6df4fb
Merge pull request #8777 from smoogipoo/fix-slider-notelock
Fix slider heads not being blocked when hit out-of-order
2020-04-20 11:47:30 +09:00
Dean Herbert
8c85602ad0 Use foreach for conformity 2020-04-20 11:00:42 +09:00
Dean Herbert
e1acfd26a6 Simplify return logic 2020-04-20 10:59:44 +09:00
Dean Herbert
28318a0140 Add mention of notelock in xmldoc (potentially easier to find class) 2020-04-20 10:59:08 +09:00
Dean Herbert
a4c6545a1c
Merge branch 'master' into fix-slider-notelock 2020-04-20 10:38:16 +09:00
Dean Herbert
2444dd42d0 Remove not-implemented-exception 2020-04-20 09:57:46 +09:00
Dean Herbert
f3fee73441 Fix DatabasedKeyBindingContainer not using defaults for non-databased ruleset 2020-04-20 09:35:00 +09:00
Dean Herbert
07b8ef83c9 Add /np to help line 2020-04-19 22:15:07 +09:00
Dean Herbert
3444227a91 Merge branch 'master' into add-np-command 2020-04-19 22:14:37 +09:00
Dean Herbert
6f0b921535
Merge pull request #8446 from iiSaLMaN/catch-hyperdash-fruit-colouring
Add support for custom hyper-dash legacy fruit colouring
2020-04-19 22:09:57 +09:00
Dean Herbert
48cf7becd1
Merge branch 'master' into catch-hyperdash-fruit-colouring 2020-04-19 21:48:41 +09:00
Bartłomiej Dach
e3e0cd149f Refactor test code to eliminate boolean flags 2020-04-19 12:46:28 +02:00
Dean Herbert
e4d4040afb Rename test to match other classes 2020-04-19 16:57:47 +09:00
Dean Herbert
1dd471dfcc Add /np (now playing) command support in chat 2020-04-19 15:13:25 +09:00
Dean Herbert
6b16908c05 Move todo to appease dotnet-format 2020-04-18 21:51:37 +09:00
Dean Herbert
c00a386ff6 Remove exceptions instead 2020-04-18 21:46:04 +09:00
Dean Herbert
61e3491e60 Fix hard crash in editor on legacy modes without encoder implementation 2020-04-18 12:59:22 +09:00
Dean Herbert
149efec985
Merge pull request #8672 from Alchyr/timing-equivalence
Adjust TimingControlPoint equivalency
2020-04-18 00:12:58 +09:00
Dean Herbert
f875ad6ba1
Merge branch 'master' into timing-equivalence 2020-04-17 23:48:09 +09:00
Dan Balasescu
2a3b802f72
Merge pull request #8781 from peppy/update-framework
Update framework
2020-04-17 23:14:23 +09:00
Dean Herbert
5f3ed3e93a Update framework 2020-04-17 22:25:24 +09:00
Dean Herbert
5833a7ac91 Fix presenting new ruleset and beatmap at once causing wedge display desync 2020-04-17 18:56:17 +09:00
Dan Balasescu
4e22e569f5
Merge branch 'master' into timing-equivalence 2020-04-17 17:12:38 +09:00
smoogipoo
0fba93bf65 Add back null check 2020-04-17 17:10:13 +09:00
smoogipoo
9aac98664c Remove unnecessary time property 2020-04-17 17:06:12 +09:00
smoogipoo
69fb984e71 Remove EquivalentTo() and Equals() 2020-04-17 17:04:09 +09:00
smoogipoo
bbcbd7e3fb Simplify by removing custom enumerator 2020-04-17 14:48:12 +09:00
smoogipoo
2dee5e03e3 Dispose enumerators for safety 2020-04-17 14:40:29 +09:00
smoogipoo
4e4fe5cc90 Fix slider heads not being blocked when hit out of order 2020-04-17 14:33:29 +09:00
smoogipoo
a4a7823817 Add fail-safe to ensure hittability after a hit 2020-04-17 14:22:03 +09:00
smoogipoo
08df9d49e5 Add failing test 2020-04-17 14:12:43 +09:00
smoogipoo
ee5301b887 Fix head/tail circles not getting correct hit windows 2020-04-17 14:12:38 +09:00
smoogipoo
62f77a05be Optimise by removing state machine 2020-04-17 14:00:00 +09:00
smoogipoo
3daacbc2d2 Initial inefficient refactor of hitobject enumeration 2020-04-17 13:34:20 +09:00
Dean Herbert
9dda7da489 Fix spinners being considered the "first object" for increased visibility in hidden 2020-04-16 14:11:38 +09:00
Dean Herbert
5ec8d49241
Merge pull request #8764 from smoogipoo/disable-undo-redo
Disable undo/redo menu items when they can't be performed
2020-04-16 13:47:23 +09:00
Dan Balasescu
4abb85023f
Merge pull request #8768 from Joehuu/hide-edit-item-multiplayer
Hide edit context menu item in multiplayer song select
2020-04-16 13:47:03 +09:00
smoogipoo
9e2be6f2f4 Remove bindable to promote one-way access 2020-04-16 13:25:08 +09:00