1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

18054 Commits

Author SHA1 Message Date
smoogipoo
9252b7876b Don't serialise AllControlPoints 2020-04-21 13:58:23 +09:00
Dean Herbert
af32f51116
Merge pull request #8800 from iiSaLMaN/allow-cancelling-completion
Fix results screen pushed after rewinding in-between push delay
2020-04-21 12:49:49 +09:00
Dean Herbert
a91c63819b Refactor updateCompletionState implementation for legibility and code share 2020-04-21 11:55:28 +09:00
Dean Herbert
5a2129da7c
Merge branch 'master' into allow-cancelling-completion 2020-04-21 11:22:37 +09:00
Dan Balasescu
f16ae522b7
Merge branch 'master' into taiko-drumroll-skinning 2020-04-21 11:16:34 +09:00
Dan Balasescu
3b3a7bdd85
Merge branch 'master' into scroll-to-center 2020-04-21 10:21:08 +09:00
Bartłomiej Dach
e3cd3cf1da Convert to auto-properties 2020-04-20 21:43:07 +02:00
Bartłomiej Dach
9b6e26583b Add xmldocs 2020-04-20 21:42:43 +02:00
Lucas A
a541f92682 Resolve ruleset dependencies on game core / framework assemblies by checking already loaded assemblies in AppDomain. 2020-04-20 13:56:15 +02:00
Dean Herbert
a842f17630 Merge branch 'master' into taiko-drumroll-skinning 2020-04-20 20:48:41 +09:00
Dean Herbert
8ebc2ae03d Never run subtree masking 2020-04-20 20:48:35 +09:00
Dan Balasescu
ea77fc222d
Merge pull request #8810 from peppy/fix-web-request-result
Fix inline executions of APIRequest.Perform not getting result populated early enough
2020-04-20 20:23:08 +09:00
Dan Balasescu
6ba1bef683
Merge pull request #8771 from EVAST9919/dashboard-overlay-new
Replace SocialOverlay with DashboardOverlay
2020-04-20 20:22:37 +09:00
Dan Balasescu
4cb57f8205
Merge pull request #8769 from peppy/fix-osu-hidden-mod-alt
Fix spinners being considered the "first object" for increased visibility in hidden
2020-04-20 19:51:15 +09:00
Dean Herbert
cf41b90193 Merge branch 'master' into dashboard-overlay-new 2020-04-20 18:25:47 +09:00
Dean Herbert
b3d4b4a3f4 Add back missing fill flow 2020-04-20 18:25:39 +09:00
dependabot-preview[bot]
3f3ff5fdb1
Bump Humanizer from 2.7.9 to 2.8.2
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.9 to 2.8.2.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.9...v2.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-20 09:24:40 +00:00
Dean Herbert
801f02a3d7 Fix inline executions of APIRequest.Perform not getting result populated early enough 2020-04-20 17:48:02 +09:00
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
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
Dean Herbert
ee1ccb8bcb Fix in a slightly different and hopefully more understandable way 2020-04-20 14:03:55 +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
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
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
48cf7becd1
Merge branch 'master' into catch-hyperdash-fruit-colouring 2020-04-19 21:48:41 +09:00
Dean Herbert
1dd471dfcc Add /np (now playing) command support in chat 2020-04-19 15:13:25 +09: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
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
f875ad6ba1
Merge branch 'master' into timing-equivalence 2020-04-17 23:48:09 +09:00
Dean Herbert
5f3ed3e93a Update framework 2020-04-17 22:25:24 +09:00
Dean Herbert
d4788e39bb Merge branch 'master' into taiko-drumroll-skinning 2020-04-17 19:30:18 +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
Andrei Zavatski
c5a343d3a0 Fix overlay accepting state changes while hidden 2020-04-16 14:10:39 +03:00
Dean Herbert
d62094cd4b Fix carousel not correctly updating when selection changes to a new beatmap from a child screen 2020-04-16 18:10:35 +09:00
Andrei Zavatski
87f52b8233 Remove redundant switch section 2020-04-16 12:09:44 +03:00
Andrei Zavatski
eb86be0a6d Adjust header content margin 2020-04-16 12:07:38 +03:00
Andrei Zavatski
894598eb22 Replace SocialOverlay with DashboardOverlay 2020-04-16 12:05:51 +03:00
Andrei Zavatski
29bea4e11c Implement OverlayView component 2020-04-16 11:42:21 +03:00
Dean Herbert
2ab4a7293e Clean up enum sorting attribute code 2020-04-16 17:26:09 +09:00
Andrei Zavatski
ef0da9e3e8 Basic overlay layout implementation 2020-04-16 11:01:36 +03:00
Dean Herbert
86e8aaa2f4
Merge branch 'master' into beatmap-listing-expanded 2020-04-16 16:15:40 +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
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
4eefe47ce3
Merge branch 'master' into fix-0-customsampleset 2020-04-16 11:20:31 +09:00
Joehu
e2b28bfe88 Hide edit context menu item in multiplayer song select 2020-04-15 18:17:12 -07:00
Dean Herbert
18c28390ef Setup drumroll testing 2020-04-15 16:29:39 +09: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
Dean Herbert
c0a1aae63a
Merge branch 'master' into beatmap-listing-expanded 2020-04-15 13:26:16 +09:00
smoogipoo
44981431c5 Remove suffix hackery 2020-04-14 21:33:32 +09:00
smoogipoo
b29957798f Fix no audiomanager in test scene working beatmap 2020-04-14 21:05:42 +09:00
smoogipoo
6935221463 Improve logic for CSB transfer 2020-04-14 21:05:07 +09:00
smoogipoo
f3dbddd75c Update bindings in LoadComplete() 2020-04-14 15:52:38 +09:00
smoogipoo
b8b334ca27 Always unbind bindings 2020-04-14 15:21:56 +09:00
smoogipoo
3183827329 Reorder fields 2020-04-14 15:09:31 +09:00
smoogipoo
7d2d0785fd Fix potential unsafe ordering of binds 2020-04-14 15:07:32 +09:00
smoogipoo
9619fb9f6a Remove bind in Player 2020-04-14 15:00:36 +09:00
Dan Balasescu
ac8a3efc46
Merge branch 'master' into low-hp-red-layer 2020-04-14 14:47:01 +09:00
Dan Balasescu
33f7e429a8
Merge pull request #8444 from LittleEndu/select-recommended
Make beatmap carousel select recommended difficulties
2020-04-14 14:25:17 +09:00
Dan Balasescu
79a306cb79
Merge pull request #8714 from peppy/dummy-api-request-support
Add support for testing arbitrary API requests/responses via Dummy API
2020-04-14 14:08:54 +09:00
Dan Balasescu
eb968d2bdb
Merge branch 'master' into timing-equivalence 2020-04-14 14:02:02 +09:00
Dan Balasescu
948e225e12
Merge branch 'master' into select-recommended 2020-04-14 13:59:03 +09:00
Dan Balasescu
d965baa4bd
Merge branch 'master' into dummy-api-request-support 2020-04-14 13:42:42 +09:00
Dan Balasescu
2d2c8700b4
Merge branch 'master' into fix-missing-background-when-video 2020-04-14 13:29:33 +09:00
Dean Herbert
c5f8bbb25f Fix beatmap background not displaying when video is present 2020-04-14 11:56:37 +09:00