Dan Balasescu
|
eb7b04d8bc
|
Merge branch 'master' into fix-osu-hidden-mod-alt
|
2020-04-20 17:47:27 +09:00 |
|
Dan Balasescu
|
477d519df3
|
Merge branch 'master' into beatmap-listing-expanded
|
2020-04-20 17:18:18 +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 |
|
Dean Herbert
|
e61a90d469
|
Throw instead of returning zero
|
2020-04-20 15:50:48 +09:00 |
|
Dean Herbert
|
8766886b24
|
Merge branch 'master' into fix-select-new-from-sub-screen
|
2020-04-20 15:38:43 +09:00 |
|
Dean Herbert
|
c759bcc893
|
Merge branch 'dashboard-overlay-new' of https://github.com/EVAST9919/osu into dashboard-overlay-new
|
2020-04-20 15:35:04 +09:00 |
|
Dean Herbert
|
6b89c638c9
|
Move load to bdl
|
2020-04-20 15:34:48 +09:00 |
|
Dean Herbert
|
8d3f6ee463
|
Merge branch 'master' into dashboard-overlay-new
|
2020-04-20 15:33:23 +09:00 |
|
Dean Herbert
|
99e13b8ed9
|
Add better xml documentation and extract fetch method
|
2020-04-20 15:32:50 +09:00 |
|
Dean Herbert
|
5464746d3d
|
Switch to using CompositeDrawable
|
2020-04-20 15:25:58 +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 |
|
Dean Herbert
|
f26c080512
|
Merge branch 'master' into dashboard-overlay-new
|
2020-04-20 15:19:03 +09:00 |
|
smoogipoo
|
5d96d67226
|
Add special key definition just for sanity
|
2020-04-20 14:40:37 +09:00 |
|
smoogipoo
|
b881293b98
|
Allow 10k to be played on a single stage
|
2020-04-20 14:08:23 +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 |
|
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
|
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 |
|
Endrik Tombak
|
b57d709d15
|
Don't use Parent
|
2020-04-19 18:29:06 +03:00 |
|
Endrik Tombak
|
a8bfd21f3f
|
Merge branch 'master' of https://github.com/ppy/osu into scroll-to-center
|
2020-04-19 18:21:34 +03:00 |
|
Bartłomiej Dach
|
1dcb0f53a2
|
Fix whitespace formatting
|
2020-04-19 16:29:32 +02:00 |
|
Lucas A
|
ba1c465edf
|
Add comment in regards to the attaching of event handler to the assembly lookup event before call to loadUserRulesets().
|
2020-04-19 15:26:00 +02:00 |
|
Dean Herbert
|
07b8ef83c9
|
Add /np to help line
|
2020-04-19 22:15:07 +09:00 |
|
Lucas A
|
a7179d1c87
|
Fix comment wording
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2020-04-19 15:15:04 +02: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 |
|
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 |
|