Commit Graph

28502 Commits

Author SHA1 Message Date
f26c080512 Merge branch 'master' into dashboard-overlay-new 2020-04-20 15:19:03 +09:00
5d96d67226 Add special key definition just for sanity 2020-04-20 14:40:37 +09:00
b881293b98 Allow 10k to be played on a single stage 2020-04-20 14:08:23 +09:00
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
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
ee1ccb8bcb Fix in a slightly different and hopefully more understandable way 2020-04-20 14:03:55 +09:00
c2f6237f51 Merge pull request #8808 from smoogipoo/reword-exception
Fix typo in exception
2020-04-20 13:46:59 +09:00
eba9889dd8 Merge branch 'master' into add-np-command 2020-04-20 13:41:42 +09:00
ff88b11080 Merge branch 'master' into fix-keybinding-defaults 2020-04-20 13:29:51 +09:00
355e682e24 Fix typo in exception 2020-04-20 13:23:27 +09:00
f56b85ce27 Merge branch 'master' into fix-song-select-desync 2020-04-20 12:54:32 +09:00
4c945b5feb Merge remote-tracking branch 'upstream/master' into allow-cancelling-completion 2020-04-20 06:43:30 +03:00
2c012b9af1 Use AddUntilStep whenever possible
Avoid redundant usage
2020-04-20 06:43:18 +03:00
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
6f233917b1 Centralize updating HasCompleted bindable logic 2020-04-20 06:40:51 +03:00
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
8c85602ad0 Use foreach for conformity 2020-04-20 11:00:42 +09:00
e1acfd26a6 Simplify return logic 2020-04-20 10:59:44 +09:00
28318a0140 Add mention of notelock in xmldoc (potentially easier to find class) 2020-04-20 10:59:08 +09:00
a4c6545a1c Merge branch 'master' into fix-slider-notelock 2020-04-20 10:38:16 +09:00
2444dd42d0 Remove not-implemented-exception 2020-04-20 09:57:46 +09:00
f3fee73441 Fix DatabasedKeyBindingContainer not using defaults for non-databased ruleset 2020-04-20 09:35:00 +09:00
b57d709d15 Don't use Parent 2020-04-19 18:29:06 +03:00
a8bfd21f3f Merge branch 'master' of https://github.com/ppy/osu into scroll-to-center 2020-04-19 18:21:34 +03:00
07b8ef83c9 Add /np to help line 2020-04-19 22:15:07 +09:00
3444227a91 Merge branch 'master' into add-np-command 2020-04-19 22:14:37 +09:00
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
48cf7becd1 Merge branch 'master' into catch-hyperdash-fruit-colouring 2020-04-19 21:48:41 +09:00
e3e0cd149f Refactor test code to eliminate boolean flags 2020-04-19 12:46:28 +02:00
e4d4040afb Rename test to match other classes 2020-04-19 16:57:47 +09:00
1dd471dfcc Add /np (now playing) command support in chat 2020-04-19 15:13:25 +09:00
65a8860a65 Add test cases to ensure no regression in "cancelling completion" 2020-04-19 06:01:09 +03:00
6d276890a7 Fix results screen pushed after rewinding in-between push delay 2020-04-19 05:59:56 +03:00
7e64bec94f Use HasCompleted in Player 2020-04-19 05:58:22 +03:00
fc6c245de5 Replace all judged event logic with HasCompleted bindable 2020-04-19 05:36:04 +03:00
6b16908c05 Move todo to appease dotnet-format 2020-04-18 21:51:37 +09:00
c00a386ff6 Remove exceptions instead 2020-04-18 21:46:04 +09:00
61e3491e60 Fix hard crash in editor on legacy modes without encoder implementation 2020-04-18 12:59:22 +09:00
149efec985 Merge pull request #8672 from Alchyr/timing-equivalence
Adjust TimingControlPoint equivalency
2020-04-18 00:12:58 +09:00
f875ad6ba1 Merge branch 'master' into timing-equivalence 2020-04-17 23:48:09 +09:00
2a3b802f72 Merge pull request #8781 from peppy/update-framework
Update framework
2020-04-17 23:14:23 +09:00
5f3ed3e93a Update framework 2020-04-17 22:25:24 +09:00
58a1c6e171 Reapply taiko visibility hack at a higher level 2020-04-17 19:52:58 +09:00
d4788e39bb Merge branch 'master' into taiko-drumroll-skinning 2020-04-17 19:30:18 +09:00
5833a7ac91 Fix presenting new ruleset and beatmap at once causing wedge display desync 2020-04-17 18:56:17 +09:00
4e22e569f5 Merge branch 'master' into timing-equivalence 2020-04-17 17:12:38 +09:00
0fba93bf65 Add back null check 2020-04-17 17:10:13 +09:00
9aac98664c Remove unnecessary time property 2020-04-17 17:06:12 +09:00
69fb984e71 Remove EquivalentTo() and Equals() 2020-04-17 17:04:09 +09:00
bbcbd7e3fb Simplify by removing custom enumerator 2020-04-17 14:48:12 +09:00