1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:02:54 +08:00
Commit Graph

35834 Commits

Author SHA1 Message Date
Salman Ahmed
a44cfe2901 Hide menu cursor when user is idle 2022-10-12 17:50:31 +03:00
Salman Ahmed
8305d886e6 Refactor internal visibility logic to route back to PopIn/PopOut 2022-10-12 17:50:04 +03:00
Dean Herbert
19f3810020 Revert namespace change
Let's not
2022-10-12 18:50:47 +09:00
Dean Herbert
3da54814f8
Merge pull request #20641 from pfgithub/patch-fix-save-collections
Preserve collections when saving a beatmap
2022-10-12 18:36:45 +09:00
Dean Herbert
8bf4ca4b53 Add legacy skin fallback when beatmap skin is providing resources 2022-10-12 17:47:20 +09:00
Dean Herbert
fd20515a6d Don't throw if LegacySkin doesn't have a transformer encapsulating it
This allows for more flexibility in lookups.
2022-10-12 17:29:17 +09:00
Dean Herbert
1c93551590 Remove completely incorrect check before applying ruleset transformer 2022-10-12 17:07:13 +09:00
Dan Balasescu
9473c350b5
Merge pull request #20266 from cdwcgt/catch-combo-hide
Fade out CatchComboDisplay when hide HUD
2022-10-12 16:59:07 +09:00
Dan Balasescu
3ac3c33cc3
Merge pull request #20712 from peppy/reduce-import-transaction-scope
Reduce the scope of realm transactions during import operations
2022-10-12 16:56:21 +09:00
Dario Headley
b72c8970eb Max Combo Counter added 2022-10-12 09:50:01 +02:00
Dan Balasescu
300888b423
Merge pull request #20720 from peppy/fix-welcome-intro-delay
Fix incorrect delay for non-theme music on "welcome" intro
2022-10-12 16:15:54 +09:00
Dean Herbert
e43c8e84b0 Use Show instead of Alpha=1 2022-10-12 15:48:42 +09:00
Dean Herbert
47fe4eb0bd Merge branch 'master' into comment-deletion 2022-10-12 15:48:26 +09:00
Dean Herbert
5ce890cdb5
Merge pull request #20568 from Susko3/update-displays-in-setting
Sync displays dropdown in settings with OS displays
2022-10-12 15:35:31 +09:00
Dean Herbert
d2d589a156 Expose HUD state via Player 2022-10-12 15:11:52 +09:00
Dean Herbert
1d6d047a69
Merge branch 'master' into master 2022-10-12 14:52:07 +09:00
Dean Herbert
d6998c810c Fix incorrect delay for non-theme music on "welcome" intro 2022-10-12 14:51:14 +09:00
Dean Herbert
db148d145b Fix incorrect offset logic for beatmaps without a preview point specified 2022-10-12 14:47:37 +09:00
Dean Herbert
721bfb5369 Rename parameter to read better 2022-10-12 14:46:35 +09:00
Dean Herbert
195ece02c6
Merge branch 'master' into update-displays-in-setting 2022-10-12 14:37:49 +09:00
Dean Herbert
ab24e87013
Merge branch 'master' into improve-drag-selection 2022-10-12 13:20:17 +09:00
Dean Herbert
b444f0fd0b
Merge pull request #20714 from frenzibyte/improve-flashlight-on-break
Improve flashlight display on break periods
2022-10-12 13:10:12 +09:00
Dean Herbert
a5948e7680
Merge pull request #20704 from ekrctb/scrolling-drag-box
Anchor editor drag box on time (catch, mania)
2022-10-12 11:48:05 +09:00
Salman Ahmed
84fdd2e107 Improve flashlight display on break periods 2022-10-11 17:16:57 +03:00
ekrctb
fcb9e2cc00 Refactor blueprint container drag code 2022-10-11 22:39:53 +09:00
Salman Ahmed
0a97ee71a9 Hide menu cursor when non-mouse input is applied 2022-10-11 16:23:51 +03:00
Salman Ahmed
60c92c8744 Enable NRT on MenuCursorContainer 2022-10-11 16:23:51 +03:00
Salman Ahmed
894127a948 Expose bindable for identifying last input source 2022-10-11 16:21:54 +03:00
Salman Ahmed
9b45a9cf76 Rename various cursor symbols
- `IProvideCursor.MenuCursor` -> `IProvideCursor.Cursor`
 - `MenuCursor` -> `MenuCursorContainer
2022-10-11 16:21:01 +03:00
Dean Herbert
390ff8b9da Reduce the scope of realm transactions during import operations 2022-10-11 21:58:28 +09:00
Dan Balasescu
cc0ca470f1
Merge pull request #20702 from peppy/update-prefer-no-video
Fix beatmap update button not respecting user "prefer no video" setting
2022-10-11 19:36:14 +09:00
Dan Balasescu
2ae41521eb
Merge pull request #20708 from peppy/mania-holding-sounds
Implement hold "sliding" samples in osu!mania
2022-10-11 17:31:44 +09:00
Dan Balasescu
88e82d3154
Merge pull request #20681 from peppy/fix-hidden-hud-interaction
Fix HUD components being interactive even when the HUD is visually hidden
2022-10-11 17:19:27 +09:00
NotGumballer91
d18466d740
Fix delay inconsistency in IntroCircles.cs 2022-10-11 16:16:57 +08:00
Dan Balasescu
6cdc9b2662
Merge pull request #20682 from peppy/fix-show-score-from-song-select
Fix clicking a leaderboard score at song select transtiioning briefly to main menu
2022-10-11 17:16:16 +09:00
NotGumballer91
5baad52a9e
Fix unintended delay on osu!theme 2022-10-11 16:15:56 +08:00
Dan Balasescu
045eb884b5
Merge pull request #20683 from peppy/storyboard-handle-backwards-events
Add support for weird storyboards which have backwards events
2022-10-11 17:12:22 +09:00
Dean Herbert
f41b79688f Avoid casting by accepting all Playfields but throwing on a bad choice 2022-10-11 16:54:41 +09:00
Dean Herbert
f060e6a780 Implement hold "sliding" samples in osu!mania 2022-10-11 16:31:37 +09:00
Dean Herbert
9bab02fab4 Remove unused using statement 2022-10-11 16:23:05 +09:00
Dean Herbert
eba3d37a11 Add xmldoc and simplify calling 2022-10-11 15:50:02 +09:00
Dean Herbert
6f6290a21a Use async flow for storing key binding changes to realm 2022-10-11 15:37:22 +09:00
Dean Herbert
a44ba579c5 Fix beatmap update button not respecting user "prefer no video" setting
Closes #20701.
2022-10-11 14:27:40 +09:00
ekrctb
6ab29a62d0 Anchor drag box on time (catch, mania)
Not done for taiko because I cannot figure out how it should work with the overlapping scroll algorithm.
2022-10-11 14:23:17 +09:00
ekrctb
1a24762f9b Improve drag box selection logic
`AllowDeselectionDuringDrag` is remove.
Instead, selected hit objects are not automatically deselected
when clock is seeked to a later time (the hit object is dead).
Update drag box selection even if mouse is not moved
(in case clock is running or scroll wheel is used).
2022-10-11 14:11:45 +09:00
Dan Balasescu
ccab04d141
Merge pull request #20645 from frenzibyte/flag-markdown
Add support for inline country flags in wiki overlay
2022-10-11 14:01:24 +09:00
Dean Herbert
cb21126623
Merge pull request #20586 from ekrctb/time-based-selection
Use hit object time for timeline drag selection instead of relying on blueprint
2022-10-11 13:20:15 +09:00
pfg
e619c9c1e6 fix style 2022-10-10 21:48:41 -04:00
pfg
de8d485305 Move 'transferCollections' to a shared location 2022-10-10 21:45:33 -04:00
NotGumballer91
a883f44ea2
Merge branch 'master' into master 2022-10-11 02:11:21 +08:00
NotGumballer91
ef840e98cf
Update IntroCircles.cs 2022-10-11 01:49:53 +08:00
NotGumballer91
8a4f2efa14
Update IntroScreen.cs 2022-10-11 01:49:49 +08:00
NotGumballer91
3cd6ce8e3f
Update WorkingBeatmap.cs 2022-10-11 01:48:55 +08:00
Dean Herbert
3d58df2b61 Merge branch 'master' into flag-markdown 2022-10-11 01:58:43 +09:00
Dean Herbert
d700040a0d Make country code parsing resilient to invalid cases 2022-10-11 01:39:53 +09:00
Dean Herbert
be5a413753 Update framework 2022-10-11 01:35:35 +09:00
Dean Herbert
5a43cb6bb2
Merge pull request #20606 from sw1tchbl4d3r/barline_generator_improvements
Barline generator improvements
2022-10-11 01:31:30 +09:00
sw1tchbl4d3
5a4196fd51 Make currentEffectPoint non-nullable 2022-10-10 15:34:29 +02:00
NotGumballer91
9a3689b6e9
Update IntroCircles.cs 2022-10-10 21:04:14 +08:00
NotGumballer91
749dc40062
Update WorkingBeatmap.cs 2022-10-10 21:03:11 +08:00
NotGumballer91
e3b405cc23
Update IWorkingBeatmap.cs 2022-10-10 21:02:23 +08:00
sw1tchbl4d3
d389808427 Make effect point search more efficient 2022-10-10 14:00:26 +02:00
Dean Herbert
28185178d6 Add support for weird storyboards which have backwards events
Closes https://github.com/ppy/osu/issues/20632.
Not adding test coverage because this is just weird.
2022-10-10 16:51:55 +09:00
sw1tchbl4d3
eae32ca483 Switch DefinitelyBigger to AlmostBigger to account for fp errors 2022-10-10 09:39:40 +02:00
Dean Herbert
e57819d687
Merge pull request #20665 from frenzibyte/fix-smoke-blocked-on-relax
Fix smoke being blocked with "Relax" mod enabled
2022-10-10 16:36:03 +09:00
Dean Herbert
b783fdf667 Fix clicking a leaderboard score at song select transtiioning briefly to main menu
- Regressed in #20567.
- Closes #20651.
2022-10-10 16:20:18 +09:00
Dean Herbert
20adc522b9 Fix HUD components being interactive even when the HUD is visually hidden 2022-10-10 16:05:41 +09:00
Dean Herbert
26a473e85e Update resources (fixes osu!mania flashlight crash) 2022-10-10 14:24:36 +09:00
D.Headley
5d2e3dcf4a Remove leftover Enum 2022-10-09 22:52:54 +02:00
Salman Ahmed
2d4f390372 Remove non-smoke key bindings on "Relax" mod instead 2022-10-09 17:14:16 +03:00
Salman Ahmed
a9aba74351 Add markdown country flag support 2022-10-08 21:50:25 +03:00
Salman Ahmed
098a56a784 Add custom container extension support 2022-10-08 21:25:11 +03:00
pfg
edec613724 Remove unnecessary '?' 2022-10-08 13:58:42 -04:00
pfg
ff14453c2b Preserve collections when saving a beatmap 2022-10-08 12:42:29 -04:00
ansel
c384093802 Update main test and add failure scenario test 2022-10-08 18:53:41 +03:00
ansel
b697200460 Properly modify comment visual state on deletion 2022-10-08 18:41:08 +03:00
ansel
4e7c30504f Schedule action buttons visibility changes 2022-10-08 17:15:10 +03:00
ansel
abf56c27a1 Do not requere dialog overlay 2022-10-08 17:11:09 +03:00
sw1tchbl4d3
63ffaa6929 Respect OmitFirstBarLine effect 2022-10-07 20:38:32 +02:00
sw1tchbl4d3
903c8612c8 Move endTime to next timing point 2022-10-07 20:34:31 +02:00
Dean Herbert
072b64b8d4 Update all dependencies 2022-10-07 21:16:11 +09:00
Dan Balasescu
c18d4afdcc Merge branch 'master' into fix-leaderboard-first-place-fade 2022-10-07 19:55:16 +09:00
Dan Balasescu
0fb4ac4733
Merge pull request #20603 from peppy/bg-dim-reduce
Adjust out-of-the-box background dim back down to 70%
2022-10-07 19:40:13 +09:00
Dan Balasescu
57e4d6cc4a
Merge pull request #20562 from peppy/fix-score-submission-crash
Fix potential crash when score submission token retrival fails
2022-10-07 19:24:35 +09:00
Dean Herbert
a8742f0cc3 Adjust out-of-the-box background dim back down to 70%
It was previously bumped from 60% to 80%, but I've recently
felt that this is too high as a default, and takes away from storyboards
and video backgrounds.
2022-10-07 18:47:32 +09:00
Dean Herbert
a543222a2b Add ability to pad stage vertically 2022-10-07 15:45:35 +09:00
Dean Herbert
eea3d5adb8 Standardise column index naming and xmldoc 2022-10-07 15:24:36 +09:00
Dean Herbert
13e0a59f70 Add note about why LegacyManiaSkinConfigurationLookup exist 2022-10-07 15:24:36 +09:00
Dean Herbert
3947011baf Fix regression in legacy dual stage handling logic 2022-10-07 15:24:36 +09:00
Dan Balasescu
bce20e0a59 Merge branch 'master' into adjust-flashlight 2022-10-07 14:45:30 +09:00
Dan Balasescu
7385ef3e1b Extract combo scale to virtual function 2022-10-07 14:26:19 +09:00
Joseph Madamba
b27e70ca47 Fix language settings dropdown not updating when changing language in first run setup 2022-10-06 21:11:00 -07:00
ekrctb
6164e0896a Don't reselect already selected items in SelectAll 2022-10-07 10:46:07 +09:00
Dean Herbert
4980e53c9c
Merge pull request #20376 from goodtrailer/smoke
Add cursor "smoke" trails
2022-10-07 03:41:07 +09:00
ekrctb
9247ff3e0a Allow changing scrolling speed in catch editor
Scroll speed is not saved and doesn't affect gameplay.
It is purely a feature for a better visualization.
It is currently bind to scroll speed increase/decrease.
Default F3/F4 crashes with editor shortcuts so it has to be changed.
2022-10-06 18:06:16 +09:00
ekrctb
29cc554632 Ensure blueprint is added for selected hit object 2022-10-06 13:59:54 +09:00
ekrctb
0d448e6cc8 Fix items without blueprints are not deselected 2022-10-06 13:50:56 +09:00
Dean Herbert
e9ab465da6
Merge branch 'master' into localisation-settings 2022-10-06 13:22:08 +09:00
ekrctb
b0213c29e9 Use mid time instead of start time
It is closer to the old blueprint-based behavior
2022-10-05 22:19:22 +09:00
ekrctb
6753f6b01a Move AllowDeselectionDuringDrag down
Because it is now ignored in the timeline implementation anyways
2022-10-05 22:14:11 +09:00
ekrctb
3108c42ece Fix inspect issues 2022-10-05 22:04:43 +09:00
ekrctb
00b3d97f69 Improve timeline selection performance
But selecting a large number of hit objects is still very slow
because all DHOs must be added
and also `AddBlueprintFor` has quadratic behaviors
2022-10-05 21:58:05 +09:00
ekrctb
0613388aaa Make sure all selected items get deleted 2022-10-05 21:58:05 +09:00
ekrctb
0ffde02f79 Use hit object time for timeline selection 2022-10-05 21:51:01 +09:00
ekrctb
8d29e9e76b Move selection logic from DragBox to BlueprintContainer 2022-10-05 21:51:01 +09:00
Dan Balasescu
35d04fe33c
Merge pull request #20582 from peppy/fix-being-playing-unobserved
Silence unobserved exceptions in `BeginPlayingInternal`
2022-10-05 20:51:55 +09:00
Dan Balasescu
c52ddb0e50
Merge pull request #20570 from ekrctb/scrolling-lifetime
Compute lifetime start from entry for scrolling hit objects
2022-10-05 20:45:43 +09:00
Dean Herbert
365a78d358 Merge branch 'master' into smoke 2022-10-05 18:58:18 +09:00
Dean Herbert
64858cfb8e Update resources 2022-10-05 18:55:49 +09:00
Dean Herbert
4f084664ac Merge branch 'master' into comment-deletion 2022-10-05 14:34:50 +09:00
Dean Herbert
74db42394a Silence unobserved exceptions in BeginPlayingInternal
Closes #20526.
2022-10-05 14:31:13 +09:00
Dean Herbert
276021dd85 Remove now unnecessary ScheduleAfterChildren 2022-10-05 14:20:01 +09:00
Dean Herbert
e06ece7531 Update framework 2022-10-05 14:19:51 +09:00
Dean Herbert
c7d645b086 Merge branch 'master' into fix-gameplay-leaderboard-overlap 2022-10-05 14:15:50 +09:00
Dan Balasescu
d9c3f5834c
Merge pull request #20567 from peppy/fix-show-replay-crash
Fix potential crash when attempting to display an imported score at song select
2022-10-04 19:46:15 +09:00
Dean Herbert
75b9bf2cf9
Merge branch 'master' into intel-exclusive-warning 2022-10-04 19:02:01 +09:00
Dan Balasescu
7293ad751e Update packages 2022-10-04 18:59:35 +09:00
Dan Balasescu
41082ab928 Fix misplaced parenthesis 2022-10-04 18:21:29 +09:00
ekrctb
1cccd03480 Fix scrolling nested hit object lifetime not set 2022-10-04 15:17:14 +09:00
ekrctb
781f5420b0 Add test for scrolling hit object lifetime 2022-10-04 15:17:11 +09:00
ekrctb
5d80950eaf Compute lifetime from entry in scrolling container 2022-10-04 15:12:28 +09:00
Susko3
efc9bed4f0 Use IWindow.DisplaysChanged to update displays 2022-10-03 23:52:04 +02:00
Susko3
31fefc1ee2 Add nullable annotation to LayoutSettings 2022-10-03 23:23:02 +02:00
Susko3
e98b4b4fbd Make updateDisplayModeDropdowns regular method 2022-10-03 23:14:21 +02:00
Dean Herbert
0bac5ef465 Merge branch 'master' into smoke 2022-10-03 21:29:42 +09:00
Dean Herbert
dfb143ec0b Update resources 2022-10-03 21:14:57 +09:00
Dean Herbert
332d63b53b Always return to main menu before attempting to present a score from import 2022-10-03 20:29:44 +09:00
Dean Herbert
13ee5c179e Add missing parenthesis in log message 2022-10-03 18:42:40 +09:00
Dan Balasescu
deae7cff60 Adjust flashliht scaling to match classic 2022-10-03 18:38:29 +09:00
Dan Balasescu
0df217d85c Add ability to adjust flashlight smoothness 2022-10-03 18:24:56 +09:00
Dean Herbert
d9f678d942 Change song select random key binding to not handle key repeat 2022-10-03 18:16:54 +09:00
Dean Herbert
42aac16b37 Adjust leaderboard score panels sizing based on accuracy/combo width 2022-10-03 18:12:36 +09:00
Dean Herbert
65369e96eb Ensure token retrieval failure logic only runs once 2022-10-03 17:29:46 +09:00
Dean Herbert
c4dd23ed15 Log token retrieval failures even when gameplay is allowed to continue 2022-10-03 17:29:34 +09:00
Dean Herbert
4dbac917fc
Merge pull request #20547 from nanashi-1/solo-gameplay-leaderboard-max-combo
Display highest combo rather than current combo for local play on leaderboard
2022-10-03 16:57:05 +09:00
Salman Ahmed
a810afafb3 Reschedule results display delegate to avoid potential softlocks in the future 2022-10-02 15:37:56 +03:00
Salman Ahmed
59728b0ccb Fix results display delegate potentially cancelled while not exiting 2022-10-02 15:30:06 +03:00
nanashi-1
2493468800 display highest combo instead of current combo 2022-10-02 18:40:31 +08:00
ansel
85adfc2df7 Fix DI type 2022-09-28 18:26:36 +03:00
ansel
7645fe20f5 Merge branch 'master' into comment-deletion 2022-09-28 17:55:22 +03:00
ansel
636befb499 Add visual feedback for deleting process 2022-09-28 17:49:37 +03:00
Dan Balasescu
f318452510
Merge pull request #20503 from peppy/change-default-skin
Change default skin for new installations to "Argon"
2022-09-28 18:34:40 +09:00
Dean Herbert
4ee435507d Update framework 2022-09-28 17:58:47 +09:00
Dean Herbert
cbbca616c1 Merge branch 'master' into fix-leaderboard-first-place-fade 2022-09-28 17:58:45 +09:00
Dan Balasescu
1890a66b28
Merge pull request #20509 from o-dasher/cleanup-setting-sources
Removes unnecessary setting sources specifications
2022-09-28 17:55:42 +09:00
Dan Balasescu
cbed268ac9
Merge pull request #20510 from sw1tchbl4d3r/high_bpm_judgements
Clamp `LifetimeStart` of `HitObject`s to their judgement windows
2022-09-28 17:49:35 +09:00
Dean Herbert
baa9e0441f
Merge pull request #20428 from frenzibyte/fix-update-progress-notification
Fix update progress notification not closing on completion
2022-09-28 17:43:45 +09:00
Dean Herbert
9b3778f226
Merge pull request #20507 from smoogipoo/fix-multiplayer-tests
Fix failing multiplayer tests
2022-09-28 17:41:55 +09:00
Dan Balasescu
715b1f64f3
Merge pull request #20518 from peppy/fix-leaderboard-wobble
Fix leaderboard wobble when in first place
2022-09-28 17:03:31 +09:00
Dean Herbert
cdcc8494c9 Fix fade being applied for too long when leaderboard scrolls to start 2022-09-28 16:10:19 +09:00