1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 19:17:20 +08:00

28392 Commits

Author SHA1 Message Date
Salman Ahmed
4c945b5feb Merge remote-tracking branch 'upstream/master' into allow-cancelling-completion 2020-04-20 06:43:30 +03:00
Salman Ahmed
2c012b9af1 Use AddUntilStep whenever possible
Avoid redundant usage
2020-04-20 06:43:18 +03:00
Salman Ahmed
e12e3391fb Base wait steps duration on the delay used for results display
With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.
2020-04-20 06:42:33 +03:00
Salman Ahmed
6f233917b1 Centralize updating HasCompleted bindable logic 2020-04-20 06:40:51 +03: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
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
Salman Ahmed
65a8860a65 Add test cases to ensure no regression in "cancelling completion" 2020-04-19 06:01:09 +03:00
Salman Ahmed
6d276890a7 Fix results screen pushed after rewinding in-between push delay 2020-04-19 05:59:56 +03:00
Salman Ahmed
7e64bec94f Use HasCompleted in Player 2020-04-19 05:58:22 +03:00
Salman Ahmed
fc6c245de5 Replace all judged event logic with HasCompleted bindable 2020-04-19 05:36:04 +03:00
Dean Herbert
149efec985
Merge pull request #8672 from Alchyr/timing-equivalence
Adjust TimingControlPoint equivalency
2020.418.0
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
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
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
Dean Herbert
03a74a4320 Apply same conditional check changes to DrawableCarouselBeatmapSet 2020-04-16 12:13:26 +09:00
Dean Herbert
91b13f91ea Add exception disallowing potential edit when disabled at a property level 2020-04-16 12:11:12 +09:00
Dean Herbert
c4caf38feb Simplify menu item checks (and add for other items) 2020-04-16 12:10:20 +09:00
Dean Herbert
255ae0ea61 Merge branch 'master' into hide-edit-item-multiplayer 2020-04-16 11:46:10 +09:00
Dean Herbert
3ca42cce71
Merge pull request #8756 from smoogipoo/fix-0-customsampleset
Fix 0 custom sample bank not falling back to user skin
2020-04-16 11:43:09 +09:00
Dean Herbert
4eefe47ce3
Merge branch 'master' into fix-0-customsampleset 2020-04-16 11:20:31 +09:00
Dean Herbert
06e25091f6 Fix typo 2020-04-16 10:44:08 +09:00
Joehu
e2b28bfe88 Hide edit context menu item in multiplayer song select 2020-04-15 18:17:12 -07:00
smoogipoo
ce21cfbb03 Use bindables in menu items 2020-04-15 16:17:34 +09:00
smoogipoo
e8c955ed9b Add CanUndo/CanRedo bindables 2020-04-15 16:17:17 +09:00
smoogipoo
102c1d9095 Add disabled state to menu items 2020-04-15 16:17:17 +09:00
smoogipoo
72707a9973 Fix OS-dependent substring 2020-04-15 13:54:23 +09:00
Dan Balasescu
2af2a49f22
Merge pull request #8755 from peppy/fix-multi-stage-mania-replays
Fix osu!mania replays actuating incorrect keys when multiple stages are involved
2020-04-15 13:42:37 +09:00
Dan Balasescu
8b83c3daab
Merge pull request #8761 from EVAST9919/typo-fix
Fix typo in DrawableTaikoHitObject
2020-04-15 13:22:19 +09:00
Dan Balasescu
a42f24b900
Merge branch 'master' into fix-multi-stage-mania-replays 2020-04-15 13:08:28 +09:00