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

18394 Commits

Author SHA1 Message Date
Dan Balasescu
0eae8d078b
Merge branch 'master' into master 2020-05-05 13:33:29 +09:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
alex
c987af988c Fix typo 2020-05-04 18:26:12 -07:00
Dan Balasescu
c14842d18b
Merge pull request #8937 from ppy/dependabot/nuget/Microsoft.CodeAnalysis.FxCopAnalyzers-3.0.0
Bump Microsoft.CodeAnalysis.FxCopAnalyzers from 2.9.8 to 3.0.0
2020-05-04 21:42:29 +09:00
Dan Balasescu
a7a156b4f1
Merge pull request #8939 from ppy/dependabot/nuget/Humanizer-2.8.11
Bump Humanizer from 2.8.2 to 2.8.11
2020-05-04 19:27:29 +09:00
smoogipoo
fe31bac505 Fix build error 2020-05-04 18:20:20 +09:00
dependabot-preview[bot]
4ee2e6cd47
Bump Humanizer from 2.8.2 to 2.8.11
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.8.2 to 2.8.11.
- [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.8.2...v2.8.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-04 08:57:09 +00:00
Dean Herbert
5edabbdee2 Redirect log output to custom data directory 2020-05-04 17:35:35 +09:00
Dean Herbert
6621d363da Add basic custom data directory support 2020-05-04 17:01:05 +09:00
smoogipoo
6d3a24ff01 Reorder tick hit results 2020-05-04 15:55:42 +09:00
smoogipoo
f42be7a6d7 Merge branch 'master' into sorcerer-catch-changes 2020-05-04 15:25:09 +09:00
Dean Herbert
06f58dd3e3 Ensure correct beatmap and ruleset when presenting a score from song select 2020-05-04 15:20:43 +09:00
Dean Herbert
a1cd007cad Fix song select tests potentially failing due to difficulty panels not yet displayed 2020-05-04 14:44:53 +09:00
Dan Balasescu
5767bcb8d7
Merge branch 'master' into add-interval-list 2020-05-04 02:00:14 +09:00
Dan Balasescu
425457db81
Merge pull request #8924 from peppy/cached-online-lookups
Add local beatmap lookup cache to improve performance of imports
2020-05-04 01:12:02 +09:00
Dean Herbert
cea6be5e52 Expose as JudgementResult instead of "passing" state 2020-05-03 23:55:44 +09:00
Dean Herbert
68d40cf790 Fix test failures due to online cache download 2020-05-03 13:25:57 +09:00
Dean Herbert
6fef4eeb8f Rename class and extract out lookup method 2020-05-03 09:35:48 +09:00
Dean Herbert
035b513b68 Use QuerySingle instead of QueryFirst 2020-05-03 09:32:33 +09:00
Dean Herbert
b9b5779251 Move deletion to catch instead of finally 2020-05-03 09:31:56 +09:00
Dean Herbert
917393697c Update framework 2020-05-02 14:38:46 +09:00
Dean Herbert
deb87517d0 Add local beatmap lookup cache 2020-05-02 14:35:12 +09:00
Bartłomiej Dach
8118747732 Make PeriodTracker actually immutable 2020-05-02 01:33:33 +02:00
Dean Herbert
ff1d63060d Add and consume passing state in GameplayBeatmap 2020-05-01 20:08:18 +09:00
Joehu
700214d249 Truncate beatmap title and artist on score panel 2020-04-30 22:13:38 -07:00
smoogipoo
e0ae9f791c Update framework 2020-05-01 11:56:40 +09:00
smoogipoo
15d3648533 Merge branch 'master' into display-modes 2020-05-01 11:55:13 +09:00
Dean Herbert
d470e092a3
Merge branch 'master' into fix-overlapping-object-undoredo 2020-05-01 10:45:29 +09:00
Dan Balasescu
5740563391
Merge pull request #8903 from peppy/carousel-loading-spinner
Show loading spinner when carousel is not ready to be displayed
2020-04-30 21:29:53 +09:00
Dean Herbert
53474c74ee
Merge pull request #8913 from smoogipoo/fix-mania-undo-redo-crash
Fix mania crashing on undo/redo
2020-04-30 21:03:38 +09:00
Dean Herbert
000c34dc26 Move recommender to field construction 2020-04-30 21:01:53 +09:00
Dan Balasescu
273266abc1
Merge pull request #8910 from peppy/taiko-kiai-playfield
Add kiai support to osu!taiko skinned playfields
2020-04-30 21:00:08 +09:00
smoogipoo
c96bc5c51c Fix undo/redo behaving poorly with simultaneous objects 2020-04-30 20:39:41 +09:00
smoogipoo
9bec42bc7e Fix mania crashing on undo/redo 2020-04-30 20:03:46 +09:00
Dean Herbert
d0a8c0fa71 Add kiai support to osu!taiko skinned playfields 2020-04-30 16:43:00 +09:00
Dean Herbert
21c6ac8c43 Allow closing the game during intro 2020-04-30 12:12:28 +09:00
Dean Herbert
cf4e79cf38 Show loading spinner when carousel is not ready to be displayed 2020-04-30 11:51:06 +09:00
Dean Herbert
c3ef1d3170
Merge pull request #8893 from peppy/reduce-initial-channel-load-overhead
Reduce initial channel load overhead by only loading history on active channel
2020-04-29 19:56:23 +09:00
Dan Balasescu
a8c3cdbd2e
Merge pull request #8895 from peppy/improve-beatmap-lookup-performance
Further improve beatmap carousel load performance by avoiding incorrect query construction
2020-04-29 19:35:26 +09:00
Dan Balasescu
f282d57aa7
Merge branch 'master' into reduce-initial-channel-load-overhead 2020-04-29 19:30:56 +09:00
Dean Herbert
064e5004ed
Merge branch 'master' into fix-mania-selection 2020-04-29 17:15:48 +09:00
Dean Herbert
d1ec99ffd9 Further improve beatmap carousel load performance by avoiding incorrect query construction 2020-04-29 16:51:22 +09:00
Dean Herbert
c73d45bc01 Reduce initial channel load overhead by only loading history on active channel 2020-04-29 15:23:28 +09:00
Dean Herbert
68fe3e12bc
Merge pull request #8887 from smoogipoo/mania-dt-speed
Fix speed adjustment mods affecting mania scroll speed
2020-04-29 14:52:51 +09:00
Salman Ahmed
6fa9feb15c
Merge remote-tracking branch 'upstream/master' into add-interval-list 2020-04-29 05:14:40 +03:00
Salman Ahmed
6e76e5900a
Rename is-in-any check method to a more legible name 2020-04-29 05:11:44 +03:00
Salman Ahmed
8d899f4e77
Apply changes to the BreakTracker and more adjustment 2020-04-29 05:11:43 +03:00
Salman Ahmed
00918ecb6d
Replace interval collection with a more-specific immutable component
Covers all small changes into one commit:
 - Remove generics and use `double` type instead.
 - Make the component immutable and not enumerable for simplicity of it's worth.
 - Make the component more-specific (to time period tracking)
 - Apply small adjustments to the component
2020-04-29 05:11:43 +03:00
Dean Herbert
cd22e5883d
Merge pull request #8883 from peppy/dont-use-internal-ef-linq
Avoid using internal EF methods in tests
2020-04-29 09:54:06 +09:00
Dean Herbert
119000f1ab Reduce database includes where possible 2020-04-28 21:43:35 +09:00
smoogipoo
1aaab40228 Fix mods affecting mania scroll speed 2020-04-28 19:34:02 +09:00
smoogipoo
7d54d4b800 Improve test scene 2020-04-28 18:36:10 +09:00
Dean Herbert
c3a41c8476 Also avoid using internal TypeExtensions 2020-04-28 17:02:10 +09:00
smoogipoo
da30eafa30 Prevent potential exception 2020-04-28 14:47:45 +09:00
Dan Balasescu
e915f22516
Merge branch 'master' into schedule-music-controller-operations 2020-04-28 14:09:56 +09:00
Dean Herbert
19fe15887a
Merge pull request #8860 from Joehuu/fix-mod-sel-score-multi-being-off-screen
Fix score multiplier being cut off in mod select at higher ui scales
2020-04-28 13:52:56 +09:00
Dean Herbert
832fa74a5e Reword comment slightly 2020-04-28 13:26:42 +09:00
smoogipoo
799b5179ed Merge branch 'master' into fix-mania-selection 2020-04-28 13:00:33 +09:00
Dean Herbert
62be138aa9 Avoid calls on MusicController executing before it may have finished loading 2020-04-28 11:46:08 +09:00
Shane Woolcock
9477a5373c
Merge branch 'master' into display-modes 2020-04-28 12:04:20 +09:30
Joseph Madamba
a34ec03efc
Reword width comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-04-27 12:44:20 -07:00
smoogipoo
cebc0fc046 Attempt to fix multiple selection movements 2020-04-27 20:35:24 +09:00
dependabot-preview[bot]
c0b225ffc8
Bump ppy.osu.Game.Resources from 2020.412.0 to 2020.427.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2020.412.0 to 2020.427.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2020.412.0...2020.427.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 08:59:34 +00:00
smoogipoo
7f5a1d7f44 Merge branch 'master' into fix-mania-selection 2020-04-27 17:09:40 +09:00
smoogipoo
bc6b02664f Merge branch 'master' into taiko-drumroll-party 2020-04-27 11:52:13 +09:00
Joehu
1b9362041a Revert multiplier number changes and set width
Safe arbitrary width taken from "0.00x" (highest width of 67), rounded to the nearest tenth.
2020-04-26 19:50:11 -07:00
Joehu
8a47a615db Remove unranked label from footer 2020-04-26 19:29:22 -07:00
smoogipoo
104c61d622 Remove unnecessary scale 2020-04-27 11:06:23 +09:00
Dean Herbert
48168dddce Adjust editor timeline current marker to promote tick visibility 2020-04-27 10:54:32 +09:00
Dean Herbert
2737726f93
Merge pull request #8864 from Game4all/keybinds-ruleset-icon
Fix custom rulesets not showing correct icons in key binding settings
2020-04-27 08:48:00 +09:00
Bartłomiej Dach
a436f8e6d4 Trim other leftover RelativeSizeAxes 2020-04-26 22:54:01 +02:00
Lucas A
801968ed51 Remove un-needed RelativeSizeAxes specifications. 2020-04-26 21:17:40 +02:00
Lucas A
a756486a4d Make settings section icons actual drawables. 2020-04-25 20:35:46 +02:00
Dean Herbert
b50e8471d2 Reword comment 2020-04-25 18:23:09 +09:00
Salman Ahmed
1953c8fc10
Fix ruleset selector not receiving key input on toolbar absence 2020-04-25 09:53:09 +03:00
Salman Ahmed
37cc1ed5a2
Fix potential null reference while hiding toolbar 2020-04-25 09:51:39 +03:00
Tim Oliver
c1c930c472 Fixed linting warnings 2020-04-25 13:47:20 +08:00
Joehu
4b60be87b5 Move unranked label under multiplier number to avoid width changes 2020-04-24 16:34:41 -07:00
Dean Herbert
cbcd915ec8 Fix crash on switching comments page at an inopportune time 2020-04-24 18:18:10 +09:00
Dean Herbert
59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders
Implement legacy beatmap encoding for all rulesets
2020-04-24 17:49:34 +09:00
Dean Herbert
fe0038ed14
Merge branch 'master' into fix-mania-placement 2020-04-24 17:00:12 +09:00
Joehu
0f6ec274f9 Add transitions to footer when flowing to another row 2020-04-23 22:44:17 -07:00
Joehu
118db03b56 Fix vertical spacing and score multiplier splitting apart
Also cleans up margin and its hacks (alignment done with anchor/origin now).
2020-04-23 22:41:38 -07:00
Joehu
abb687286b Fix score multiplier being cut off in mod select at higher ui scales 2020-04-23 22:34:00 -07:00
Dan Balasescu
e67ac515fc
Merge branch 'master' into fix-editor-hard-crash 2020-04-24 12:29:48 +09:00
Dean Herbert
131f011239
Merge branch 'master' into all-ruleset-encoders 2020-04-24 11:32:48 +09:00
Dean Herbert
1c13fa6c61 Fix editor crashing when entering with no beatmap selected 2020-04-24 10:27:32 +09:00
smoogipoo
4ebb28d3e7 wip 2020-04-23 17:52:54 +09:00
smoogipoo
6df45164fa Expose direction from scrolling test container 2020-04-23 11:17:16 +09:00
smoogipoo
86ef73aa27 Implement HitObjectContainer.Clear() 2020-04-23 11:16:59 +09:00
smoogipoo
40f11ed15c Resolve broken test scene 2020-04-23 10:37:05 +09:00
smoogipoo
7796593b2c Merge branch 'master' into fix-testbeatmap-rulesetid 2020-04-23 10:35:08 +09:00
Dean Herbert
dd9ceed802
Merge branch 'master' into all-ruleset-encoders 2020-04-22 22:51:42 +09:00
Dean Herbert
97dcd546f1
Merge pull request #8833 from smoogipoo/remove-obsoletes
Remove obsolete nested hitobject methods
2020-04-22 22:40:06 +09:00
smoogipoo
08982e0e00 Ensure editor tests wait for load to complete 2020-04-22 19:49:21 +09:00
smoogipoo
0a34fddcc3 Fix TestBeatmap not setting appropriate ruleset ID 2020-04-22 19:38:27 +09:00
smoogipoo
93151f7612 Add back necessary events + addition to list 2020-04-22 18:32:59 +09:00
smoogipoo
e1142b424d Fix test failures 2020-04-22 18:14:21 +09:00
smoogipoo
8b0274fedd Remove obsolete methods 2020-04-22 17:55:50 +09:00
smoogipoo
9c22d2f1dd Use platform bindings for editor actions 2020-04-22 17:41:24 +09:00
smoogipoo
3b805daa0b Fix hold note end time being written incorrectly 2020-04-22 16:40:07 +09:00
smoogipoo
7cdc9a599c Fix mania holds written as spinners 2020-04-22 16:27:07 +09:00
Dean Herbert
223c822e57
Merge branch 'master' into all-ruleset-encoders 2020-04-22 13:04:16 +09:00
Dean Herbert
aaa0f908d5
Merge pull request #8818 from smoogipoo/fix-beatmap-encoder
Fix beatmap encoder by enabling untested test cases
2020-04-22 13:03:56 +09:00
smoogipoo
07a73ba83c Merge branch 'master' into rulesetstore-ruleset-dir 2020-04-22 10:23:04 +09:00
Dean Herbert
360c9f8e38 Add test coverage and handle null creator 2020-04-22 09:19:34 +09:00
Dean Herbert
0c74f1aaa9 Fix now playing output showing empty brackets when no difficulty specified 2020-04-22 09:08:33 +09:00
smoogipoo
d8fdd73e17 Implement IHasCurve on DrumRoll 2020-04-22 09:06:04 +09:00
smoogipoo
ea0ebc8527 Implement beatmap encoding for all legacy rulesets 2020-04-22 09:06:04 +09:00
smoogipoo
d27ca725f9 Use IEnumerable<T> instead 2020-04-22 09:04:44 +09:00
smoogipoo
516e6a4bb1 Fix overlapping control points not written correctly 2020-04-22 09:04:44 +09:00
smoogipoo
1421e876b1 Remove implicit new combo from spinners 2020-04-22 09:04:44 +09:00
smoogipoo
d8d85e5b08 Don't output certain properties if they don't exist 2020-04-22 09:04:44 +09:00
smoogipoo
3093c3e185 Fix custom sample set not being written correctly 2020-04-22 09:04:44 +09:00
smoogipoo
a702a521f8 Fix not being able to serialise converted beatmaps 2020-04-22 09:04:44 +09:00
Dean Herbert
6193b80589 Update framework 2020-04-21 21:20:57 +09:00
Dean Herbert
231a2b9f81
Merge pull request #8821 from peppy/replace-direct-overlay
Replace direct overlay with new beatmaplisting overlay
2020-04-21 21:19:33 +09:00
Dean Herbert
ed9663985b Rename panels 2020-04-21 20:55:33 +09:00
Dan Balasescu
6e68728ade
Merge branch 'master' into fix-beatmap-listing-focus 2020-04-21 20:05:13 +09:00
smoogipoo
a41ac50e2f Line widths should not receive scale factor 2020-04-21 17:15:06 +09:00
smoogipoo
b8a1831d98 Read line widths from skin 2020-04-21 17:14:04 +09:00
Dean Herbert
9b9b710ded Move and rename remaining direct classes 2020-04-21 16:41:07 +09:00
Dean Herbert
1cec0575b7 Remove unused classes and replace overlay in game 2020-04-21 16:38:47 +09:00
Dean Herbert
594cef1473 Fix BeatmapListingOverlay not taking focus 2020-04-21 16:35:24 +09:00
Dean Herbert
c3b36d8f20
Merge pull request #7924 from EVAST9919/beatmap-listing-expanded
Implement sorting by genre and language in BeatmapListingOverlay
2020-04-21 16:34:59 +09:00
Dean Herbert
aa153290a9
Merge pull request #8815 from smoogipoo/fix-controlpoint-decode
Fix control point overriding working incorrectly
2020-04-21 16:18:50 +09:00
Dean Herbert
eeb7612010 Update DirectOverlay implementation 2020-04-21 15:40:10 +09:00
Dean Herbert
c2ed6491a9 Move and shorten enum names 2020-04-21 15:39:15 +09:00
Dean Herbert
89320b510c Apply class renaming 2020-04-21 15:13:19 +09:00
smoogipoo
fcfb2b9026 Merge branch 'master' into fix-select-new-from-sub-screen 2020-04-21 14:36:53 +09:00
Dean Herbert
1e683fe553
Merge pull request #8814 from smoogipoo/allcontrolpoint-serialisation
Don't serialise AllControlPoints
2020-04-21 14:31:19 +09:00
smoogipoo
72fb34f82c Fix overriding control points incorrectly 2020-04-21 14:19:05 +09:00
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
smoogipoo
ae210d567d Add temporary solution for tick hit/miss count 2020-04-16 18:16:08 +09: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
Dean Herbert
68c25c38a7
Merge branch 'master' into no-video-option 2020-04-14 11:36:31 +09:00
Dean Herbert
081a02f748
Merge branch 'master' into catch-hyperdash-fruit-colouring 2020-04-14 10:01:15 +09:00
Bartłomiej Dach
06407a1081 Merge branch 'master' into fix-classic-scoring 2020-04-14 02:13:45 +02:00
Bartłomiej Dach
13c81db0cf Fix incorrect classic score formula
Upon closer inspection the classic score formula was subtly wrong. The
version given in the wiki is:

	Score = Hit Value + (Hit Value * ((Combo multiplier * Difficulty
	multiplier * Mod multiplier) / 25))

The code previously used:

	bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1)
	* scoreMultiplier) / 25);

which is not equivalent to the version on the wiki. The error is in the 1
factor, as in the above version it is being divided by 25, while it should
be outside the division to keep parity with the previous formula.

The tests attached in the previous commit demonstrate that this change
causes a single hit without combo to increase total score by its exact
numeric value.
2020-04-14 01:09:58 +02:00
Endrik Tombak
d9c91fb943 Merge branch 'master' of https://github.com/ppy/osu into no-video-option
 Conflicts:
	osu.Game/Overlays/Direct/PanelDownloadButton.cs
2020-04-13 17:40:28 +03:00
Endrik Tombak
13812fef4c Replace BindTo with setting the bindable 2020-04-13 17:28:02 +03:00
Dean Herbert
bdec4ca2b4
Merge pull request #8736 from smoogipoo/fix-red-point-placement
Rework slider control point placement to improve path progression
2020-04-13 22:30:49 +09:00
Dean Herbert
89d8063588 Add support for Perform/PerformAsync 2020-04-13 21:35:35 +09:00
Dean Herbert
1c8a71b284 Exception instead of assert 2020-04-13 21:24:47 +09:00
Dean Herbert
e2a49ebf32
Merge pull request #8741 from peppy/limit-max-history
Limit upper number of editor beatmap states saved to 50
2020-04-13 21:16:58 +09:00
Dean Herbert
63de493c85
Merge branch 'master' into fix-red-point-placement 2020-04-13 20:56:50 +09:00
Dean Herbert
69c371d1f5
Merge pull request #8740 from EVAST9919/scroll-to-top-overlays
Use OverlayScrollContainer for overlays
2020-04-13 20:49:41 +09:00
Dean Herbert
2388799acf Limit upper number of editor beatmap states saved to 50 2020-04-13 20:37:46 +09:00
Dean Herbert
64422fbf6d
Merge pull request #8697 from smoogipoo/more-change-state-support
Add change state support to more Editor components
2020-04-13 20:19:04 +09:00
Dean Herbert
0be2dc9b2d Tidy up SectionsContainer class layout/ordering 2020-04-13 20:13:48 +09:00
smoogipoo
58a7313091 Fix fallback for file hit samples 2020-04-13 20:09:17 +09:00
Dan Balasescu
71d7ab3ba7
Merge pull request #8711 from peppy/taiko-hit-skinning
Add basic taiko "hit" skinning support
2020-04-13 20:00:53 +09:00
smoogipoo
cee4b005e6 Fix custom sample set 0 not falling back to default samples 2020-04-13 20:00:06 +09:00
Dean Herbert
ca5971578a
Merge branch 'master' into more-change-state-support 2020-04-13 19:13:07 +09:00
Dean Herbert
ef5e88dd82
Merge pull request #8696 from smoogipoo/editor-undo-redo
Add undo/redo support to the Editor
2020-04-13 19:12:47 +09:00
Dan Balasescu
63c3139d22
Merge branch 'master' into taiko-hit-skinning 2020-04-13 18:48:26 +09:00
Andrei Zavatski
4c5d01a611 Remove unused usings 2020-04-13 12:34:51 +03:00
Andrei Zavatski
b741e359cd Use OverlayScrollContainer for overlays 2020-04-13 12:23:28 +03:00
Dean Herbert
0e88c28060 Merge branch 'editor-undo-redo' into more-change-state-support 2020-04-13 18:07:00 +09:00
Dan Balasescu
5416b2d2ff
Merge branch 'master' into stereo-shifted-playback 2020-04-13 17:51:05 +09:00
Dan Balasescu
2fd6555f2a
Merge branch 'master' into stereo-shifted-playback 2020-04-13 17:28:41 +09:00
Dean Herbert
6aab19413c Rename differ to patcher, add xmldoc 2020-04-13 17:20:20 +09:00
Dean Herbert
bb53f96c71 Store states as byte[] instead of Streams 2020-04-13 17:18:50 +09:00
Andrei Zavatski
1e3251e3e9 Remove excessive logic 2020-04-13 10:59:53 +03:00
Andrei Zavatski
b8ecc41667 Add comment 2020-04-13 10:52:34 +03:00
Andrei Zavatski
29dd225205 Make button protected 2020-04-13 10:45:15 +03:00
Dean Herbert
0c60dbe796
Merge branch 'master' into editor-undo-redo 2020-04-13 16:03:53 +09:00
Dean Herbert
39b5c9f396
Merge branch 'master' into overlay-scroll-container 2020-04-13 15:44:20 +09:00
smoogipoo
bde0b259c1 Improve slider placement test scene 2020-04-13 15:31:54 +09:00
Dean Herbert
142cddfb10 Rename CurrentBeatmap to SelectedBeatmap 2020-04-13 15:13:35 +09:00
Dean Herbert
72fb466a0b
Merge branch 'master' into present-from-overlay 2020-04-13 15:01:24 +09:00
Andrei Zavatski
b4800dd461 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container 2020-04-13 08:09:17 +03:00
smoogipoo
f38b64d201 Fix placement blueprints handling double clicks 2020-04-13 13:57:15 +09:00
Dean Herbert
c51bad0e35 Cache ManiaPlayfield instead 2020-04-13 13:42:21 +09:00
Dean Herbert
cdff6060d3 Remove recursive hierarchy traversal for mania sample balance 2020-04-13 13:01:27 +09:00
Dean Herbert
65b96079a0 Move dampening to base implementation and change range to 0..1 2020-04-13 13:01:02 +09:00
Endrik Tombak
633b969017 Apply review suggestions 2020-04-12 21:57:35 +03:00
Bartłomiej Dach
3efb4aba25 Use BindTarget 2020-04-12 19:48:15 +02:00
Endrik Tombak
b475316a4e Simplify and comment 2020-04-12 20:40:08 +03:00
Endrik Tombak
3b9e0fa67d Use readonly IBindable 2020-04-12 19:42:28 +03:00
Endrik Tombak
ed28e8c8f5 Rename param 2020-04-12 19:38:09 +03:00
Endrik Tombak
ecd25e567d Present selected difficulty 2020-04-12 16:00:05 +03:00
TheWildTree
07dc277321 Remove unused changelog comments class 2020-04-12 14:55:42 +02:00
Endrik Tombak
63a1686dfb Scroll to screen middle 2020-04-12 12:42:52 +03:00
Dean Herbert
c5d6c7728a Update resources 2020-04-12 18:29:25 +09:00
Andrei Zavatski
7a9ee907bf Fix incorrect button state in some cases 2020-04-12 07:34:58 +03:00
Dean Herbert
25f36e87a6
Merge branch 'master' into overlay-scroll-container 2020-04-12 12:34:41 +09:00
Fire937
22d89dbff7 Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback 2020-04-12 01:46:32 +02:00
Fire937
f274ec297c Add positional sound support for all rulesets
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
2020-04-12 01:33:25 +02:00
Endrik Tombak
fc1d497a86 Change PlaylistDownloadButton default 2020-04-11 14:21:28 +03:00
Endrik Tombak
df76636ffc Implement "prefer no video" option 2020-04-11 14:08:16 +03:00
Dean Herbert
c96df97586 Add support for non-generic requests 2020-04-11 18:02:49 +09:00
Dean Herbert
415adecdf6 Add support for Result fetching 2020-04-11 18:02:43 +09:00
Dean Herbert
832822858c Add basic request / response support 2020-04-11 17:48:23 +09:00
Dean Herbert
73a3f1fe65 Remove unnecessary DI 2020-04-11 17:30:34 +09:00
Dean Herbert
7aac0e59a8 Reduce dictionary lookups 2020-04-11 17:13:35 +09:00
Dean Herbert
310cf830d4 Simplify api request logic 2020-04-11 17:13:35 +09:00
Dean Herbert
abea7b5299 Tidy up function passing, naming, ordering etc. 2020-04-11 17:13:35 +09:00
smoogipoo
a84fe2525b Fix nested hitobjects potentially indirectly masked away 2020-04-11 16:53:45 +09:00
Dean Herbert
7f753f6b4d Remove current ruleset from function call 2020-04-11 16:43:09 +09:00
Dean Herbert
a843793957 Un-nest class 2020-04-11 16:41:11 +09:00
Dean Herbert
ff591299e0
Merge branch 'master' into select-recommended 2020-04-11 16:40:07 +09:00