1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Commit Graph

18143 Commits

Author SHA1 Message Date
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