1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:52:53 +08:00
Commit Graph

40966 Commits

Author SHA1 Message Date
Dan Balasescu
6613301588
Merge branch 'master' into refactor-scrolling-hoc-2 2021-06-16 19:20:11 +09:00
Dean Herbert
f4fb2e127d
Merge pull request #13518 from smoogipoo/sort-by-localisation
Localise "sort by" text in overlays
2021-06-16 18:50:53 +09:00
Dan Balasescu
537cbd1214
Merge pull request #13520 from bdach/add-more-language-enum-values
Add more languages to settings dropdown
2021-06-16 18:49:42 +09:00
Dan Balasescu
635b3cdf1c
Merge pull request #13514 from peppy/mod-approach-different
Add osu! mod "Approach Different"
2021-06-16 18:25:31 +09:00
Dan Balasescu
dd934c5d3f
Merge pull request #13519 from ekrctb/fix-player-test
Don't invoke "completed" action for test scene virtual track
2021-06-16 18:25:03 +09:00
Bartłomiej Dach
cc5145a131 Fix languages with a sub-language part not working properly 2021-06-16 11:10:03 +02:00
ekrctb
2b0e6b6b51 Don't invoke "completed" action for test scene virtual track
`MusicController` tries to play the next music when a track is completed.
In test scenes, we want to keep the virtual track, not random songs.
2021-06-16 17:44:21 +09:00
Dean Herbert
7891ee4f32 Change order of settings to make scrolling easier
There's an issue with dropdown menus nested inside a scroll view being
very frustrating to scroll to off-screen items. This works around that
to some extent by giving the user more "parent-scrollable" space to
mouse wheel or drag over.
2021-06-16 17:32:31 +09:00
Dean Herbert
0c1023da31 Simplify transform logic 2021-06-16 17:27:52 +09:00
Dean Herbert
ee5f4f1856 Remove default (and make default "Gravity") 2021-06-16 17:27:43 +09:00
Bartłomiej Dach
d298e95df7 Limit maximum height of settings enum dropdowns 2021-06-16 10:25:50 +02:00
Bartłomiej Dach
64bb1f381b Add more languages to settings dropdown 2021-06-16 10:25:30 +02:00
smoogipoo
fafd936c93 Localise "sort by" string in overlays 2021-06-16 16:21:41 +09:00
Dean Herbert
b24730efdb
Merge pull request #13512 from smoogipoo/add-localisation-example
Localise parts of the beatmap listing overlay
2021-06-16 16:03:40 +09:00
Dean Herbert
5be00ad0a9
Merge pull request #13502 from smoogipoo/gh-actions
Add GitHub actions workflow
2021-06-16 15:29:18 +09:00
Dean Herbert
cb80577922
Merge pull request #13509 from bdach/fix-seasonal-backgrounds
Fix seasonal backgrounds not cycling
2021-06-16 15:26:46 +09:00
Dean Herbert
68fa7d68cc
Merge pull request #13511 from smoogipoo/fix-possible-nullref-2
Fix possible nullref in difficulty recommender
2021-06-16 15:20:45 +09:00
Dean Herbert
f802679d38
Merge pull request #13497 from smoogipoo/fix-present-score
Make PresentScore() use replay hash as fallback
2021-06-16 15:18:01 +09:00
Dean Herbert
f6f1a068b2 Rename "easing" references to be "style" instead 2021-06-16 15:15:12 +09:00
Dean Herbert
b1dd502e06 Rename class to match new name 2021-06-16 15:09:42 +09:00
Dean Herbert
2ce487bdac Rename mod and fix easing mappings / naming 2021-06-16 14:31:22 +09:00
Dean Herbert
c5f76c7352
Merge branch 'master' into AddApproachCircleMod 2021-06-16 14:30:58 +09:00
smoogipoo
4c5268694e Localise some of the BeatmapListingOverlay 2021-06-16 13:46:13 +09:00
smoogipoo
fa00d07107 Upgrade osu-resources 2021-06-16 13:26:36 +09:00
smoogipoo
451ce04d19 Make Resharper inspections fail CI job
As per https://github.com/ppy/osu-framework/pull/4514.
2021-06-16 13:22:50 +09:00
smoogipoo
a5261f0cb3 Add difficulty recommender instantly 2021-06-16 11:48:49 +09:00
smoogipoo
6be41e497a Fix possible nullref in difficulty recommender 2021-06-16 11:27:38 +09:00
Bartłomiej Dach
022b1a28d5 Add missing equality implementation for seasonal backgrounds
The equality operator is used to determine whether the next background
in the cycle should be loaded, to avoid pointless loads of the same
background several times (see #13362 and #13393). Its omission in the
latter pull caused seasonal backgrounds to no longer cycle.

Closes #13508.
2021-06-15 23:21:48 +02:00
Bartłomiej Dach
30703d518c Add failing assert for seasonal background equality 2021-06-15 23:19:33 +02:00
Bartłomiej Dach
81c43bcf19
Merge pull request #13503 from frenzibyte/legacy-spinner-background-colour 2021-06-15 20:18:20 +02:00
Bartłomiej Dach
1fb343b432
Merge branch 'master' into legacy-spinner-background-colour 2021-06-15 19:40:44 +02:00
Bartłomiej Dach
3ef3e33876
Merge branch 'master' into gh-actions 2021-06-15 18:37:39 +02:00
Dean Herbert
819e3afbfb
Merge pull request #13504 from smoogipoo/fix-malformed-database-test
Fix malformed database test failing in single-threaded mode
2021-06-16 01:34:45 +09:00
Dean Herbert
7fdf456178
Merge pull request #13500 from smoogipoo/remove-cake
Remove cake
2021-06-16 01:25:16 +09:00
smoogipoo
e79e1bbcc0 Fix malformed database test failing in single-threaded mode 2021-06-15 22:53:43 +09:00
smoogipoo
a4c4867d6a Add scripts for running inspections locally 2021-06-15 22:40:31 +09:00
Salman Ahmed
52145c9237 Assign skinnable colour to spinner-background with correct default 2021-06-15 16:17:05 +03:00
Salman Ahmed
a85a592f70 Add lookup for spinner background colour 2021-06-15 16:16:25 +03:00
smoogipoo
5283948a6d Fix incorrect directory 2021-06-15 22:05:13 +09:00
smoogipoo
04e8703eee Add github actions workflows 2021-06-15 21:59:18 +09:00
smoogipoo
9fcf105364 Remove cake 2021-06-15 21:46:23 +09:00
smoogipoo
e29e2328f8 Inline inspection actions into appveyor.yml 2021-06-15 21:45:02 +09:00
smoogipoo
f39dbb8b6e Upgrade cfs 2021-06-15 21:42:09 +09:00
Dan Balasescu
b871ee4e71
Merge pull request #13463 from Pasi4K5/enhance-mod-settings-text-box-visibility
Enhance text box visibility in mod settings
2021-06-15 17:01:39 +09:00
Dan Balasescu
e9d4ee3c87
Merge branch 'master' into enhance-mod-settings-text-box-visibility 2021-06-15 16:09:55 +09:00
smoogipoo
579a4aa9c8 Remove comment 2021-06-15 14:10:09 +09:00
smoogipoo
eb4c093371 Use hash as fallback 2021-06-15 14:06:17 +09:00
ekrctb
bbf0022689 Use natural anchor for TimeAtPosition and PositionAtTime
The natural anchor is the end of the scrolling direction (e.g. Bottom for Down scrolling).
2021-06-15 13:15:20 +09:00
Dan Balasescu
1ddcb352c5
Merge pull request #13449 from ekrctb/refactor-scrolling-hoc-1
Refactor `ScrollingHitObjectContainer` and expose more useful methods
2021-06-15 11:21:26 +09:00
smoogipoo
f6c6eea6dc Make PresentScore() only consider replay hash 2021-06-15 11:16:35 +09:00