o-dasher 5fc6f1f4a5 Fix conflicts

5fc6f1f4a5 · 2024-07-14 21:55:48 -03:00

History

..

Audio

Adjust AudioFilter to framework-side changes

2024-06-18 07:30:46 +02:00

Beatmaps

Change red shade for timing control points

2024-07-12 13:39:40 +09:00

Collections

Merge pull request #28762 from frenzibyte/change-chevron-display

2024-07-08 20:05:59 +09:00

Configuration

Remove scroll-dropdown-into-view logic

2024-07-04 07:34:19 +03:00

Database

Fix(?) xmldoc

2024-07-10 19:22:49 +09:00

Extensions

…

Graphics

Use separate samples for scrolling to top and scrolling to previous

2024-07-12 21:01:19 +09:00

Input

Implement quick exit hotkeys for editor test play

2024-07-02 14:34:36 +02:00

IO

Update naming of enum fields in ObjType

2024-05-01 17:24:53 +03:00

IPC

…

Localisation

Merge pull request #28553 from frenzibyte/mod-select-customisation-panel

2024-07-08 11:26:21 +02:00

Models

…

Online

Merge branch 'master' into daily-challenge/better-results

2024-07-04 23:56:09 +09:00

Overlays

Merge pull request #28832 from nekodex/ui-sfx-tweaks

2024-07-13 23:24:06 +09:00

Performance

Expose high performance session state

2024-04-16 10:04:38 +08:00

Properties

Make medal overlay respect overlay disable via activation mode

2024-02-20 16:31:31 +01:00

Replays

Update HasFlag usages

2024-07-03 00:19:04 +09:00

Rulesets

Fix conflicts

2024-07-14 21:55:48 -03:00

Scoring

Add basic flow for mounting beatmaps for external editing

2024-07-10 18:29:51 +09:00

Screens

Merge pull request #28683 from frenzibyte/footer-v2-integration

2024-07-12 22:45:06 +09:00

Skinning

Add basic flow for mounting beatmaps for external editing

2024-07-10 18:29:51 +09:00

Storyboards

Update HasFlag usages

2024-07-03 00:19:04 +09:00

Tests

Add screen footer to ScreenTestScene

2024-07-11 15:30:07 +03:00

Updater

Warn about not using an official "deployed" build

2024-03-21 00:47:45 +09:00

Users

Fix nullability inspection

2024-05-10 23:26:43 +08:00

Utils

Fix code quality and null handling

2024-06-07 00:01:50 +08:00

.editorconfig

…

FodyWeavers.xml

…

osu!.res

…

osu.Game.csproj

Update resources

2024-07-13 20:22:52 +09:00

OsuGame.cs

Move logoContainer local again

2024-07-12 22:01:20 +09:00

OsuGameBase_Importing.cs

…

OsuGameBase.cs

Revert "Temporary rollback of framework / SDL3"

2024-05-22 16:29:39 +08:00

PerformFromMenuRunner.cs

…