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

42477 Commits

Author SHA1 Message Date
Dan Balasescu
5ca2c4eda8
Merge pull request #13982 from peppy/log-startup-component-loads
Output startup component load start/end times to non-debug logs
2021-07-22 22:09:47 +09:00
Dan Balasescu
175f3ca57d
Merge pull request #13979 from peppy/fix-incorrect-success-oop
Fix derived API request types firing success when they shouldn't
2021-07-22 20:07:23 +09:00
Dean Herbert
cde8ae6f18
Merge pull request #13483 from emu1337/diffspike-balance
Spike difficulty / AR&FL adjustments
2021-07-22 19:28:22 +09:00
Dean Herbert
29ffae4025
Merge pull request #13967 from nekodex/new-select-sounds
Add new 'soft' select sound variant and use it in some places
2021-07-22 16:21:03 +09:00
Dean Herbert
8b1202153a
Merge pull request #13951 from LumpBloom7/timeline-object-interactions
Make timeline blueprints outside of TimelineBlueprint boundaries interactable
2021-07-22 16:20:22 +09:00
Dean Herbert
957a0686ed Split out nested classes from TimelineBlueprintContainer
They got too big.
2021-07-22 15:48:08 +09:00
Dean Herbert
b5cc9010de Move resolved property to top of class 2021-07-22 15:39:01 +09:00
Dean Herbert
0cfa8f0f5b Update resources 2021-07-22 15:35:35 +09:00
Dean Herbert
e8aaf4df16
Merge pull request #13961 from ekrctb/catch-editor-flip
Implement horizontal flipping of hit objects in catch editor
2021-07-22 15:27:59 +09:00
Dean Herbert
84b67deb4d
Merge pull request #13958 from ByAgenT/refactor-keybindings-overlay
Move and merge Overlays.KeyBinding into Overlays.Settings.Sections.Input
2021-07-22 15:16:04 +09:00
Dean Herbert
04c69c95cf
Merge pull request #13978 from Henry-YSLin/truncate-playlist-item-text
Truncate beatmap text in playlist item
2021-07-22 15:00:03 +09:00
Dean Herbert
1d2fdd9841
Merge pull request #13937 from ekrctb/selection-editable-path
Add initial implementation of juice stream path editing
2021-07-22 14:48:02 +09:00
Dean Herbert
db6f323266 Output startup component load start/end times to non-debug logs
Useful for diagnosing issues in cases like #13981.
2021-07-22 14:45:57 +09:00
Dean Herbert
57e5f5575a Fix derived API request types firing success when they shouldn't
The usual case of `virtual`/`override` being dangerous when logic is
added to the base implementation. As such, I've removed this completely.
2021-07-22 14:23:27 +09:00
Dean Herbert
2151c1863e Rename variables for catch-specific casting to avoid any confusion 2021-07-22 14:07:32 +09:00
ekrctb
19657cd00e Guard against empty range in PositionRange 2021-07-22 13:29:32 +09:00
ekrctb
7b6981c632 Don't show the flip button when flipping is a no-op 2021-07-22 13:29:32 +09:00
Henry Lin
aab7678a69 Truncate beatmap text 2021-07-22 12:18:37 +08:00
ekrctb
d93bf5be80 Don't handle mouse down at fixed vertices 2021-07-22 12:58:39 +09:00
Jamie Taylor
507b53dc73
Use 'Soft' hover/select samples for EditorTable row selection 2021-07-21 22:02:40 +09:00
Jamie Taylor
e3d1868af5
Add hover/select sounds to directory/file selector components 2021-07-21 22:02:17 +09:00
Jamie Taylor
cd54653977
Add 'Soft' HoverSampleSet variant 2021-07-21 22:00:13 +09:00
Dan Balasescu
edce3e0efe
Merge pull request #13965 from Game4all/localise-beatmap-panel-pills
Localise beatmap panels status pills
2021-07-21 21:08:55 +09:00
Lucas A
ea4f9b2ac7 Localise beatmap online status pill. 2021-07-21 13:15:07 +02:00
Lucas A
032ced5d16 Localise beatmap explicit content pill. 2021-07-21 13:05:01 +02:00
Dean Herbert
fe9e72d767
Merge pull request #13959 from smoogipoo/fix-beatmaplisting-null-cursor
Fix beatmap listing continually paginating when no more beatmaps are available
2021-07-21 19:55:40 +09:00
Dean Herbert
73866c2837
Merge branch 'master' into catch-editor-flip 2021-07-21 19:54:39 +09:00
Derrick Timmermans
9d43ca122f
Allow context menus to be triggered as well 2021-07-21 12:04:09 +02:00
Dan Balasescu
4c63e8e036
Merge pull request #13964 from peppy/fix-mod-overflow
Fix mod display overflowing on contracted results panels
2021-07-21 18:52:00 +09:00
Derrick Timmermans
f85ff40a6b
Add back LeftMouse button check 2021-07-21 11:47:21 +02:00
Dean Herbert
006971485b
Merge pull request #13934 from ekrctb/catcher-area-catcher
Move `Catcher` from `CatcherArea` to `CatchPlayfield`
2021-07-21 18:43:20 +09:00
Dean Herbert
adda96ac86
Merge pull request #13962 from ekrctb/platform-action
Adapt to framework `PlatformAction` type change
2021-07-21 18:17:38 +09:00
Dean Herbert
a261f1ef8f
Merge pull request #13960 from ekrctb/selection-box-can-flip
Allow specifying different value of scaling and flipping support for a selection box
2021-07-21 18:05:18 +09:00
Dean Herbert
6effa24157 Merge branch 'master' into catcher-area-catcher 2021-07-21 18:00:35 +09:00
Dean Herbert
0a950a5da7 Disable auto property get-only inspection 2021-07-21 17:59:50 +09:00
Dan Balasescu
b390018e64
Merge branch 'master' into fix-mod-overflow 2021-07-21 17:26:47 +09:00
Dan Balasescu
b556d6d382
Merge pull request #13963 from peppy/tidy-mod-display
Tidy up `ModDisplay`
2021-07-21 17:26:39 +09:00
Dean Herbert
173334383f Update framework 2021-07-21 16:56:09 +09:00
Dean Herbert
b910c21230 Add ModFlowDisplay and consume in ContractedPanelMiddleContent 2021-07-21 16:53:04 +09:00
ekrctb
179ba3c9a8 Merge branch 'master' into catcher-area-catcher
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs
2021-07-21 16:45:28 +09:00
Dean Herbert
b65e607941 Add test covering mod displays with too many mods 2021-07-21 16:43:41 +09:00
Dean Herbert
5bee06fd5f Remove forgotten AutoSize specification 2021-07-21 16:43:29 +09:00
ekrctb
d9f9ad35be Move catcher base size constant to Catcher. 2021-07-21 16:43:24 +09:00
Dean Herbert
396ad79d50 Remove unnecessary UnbindAll call 2021-07-21 16:43:08 +09:00
ekrctb
30777795ce Add some doc comment to CatcherArea 2021-07-21 16:40:35 +09:00
Dean Herbert
a63065dbe9 Tidy up ModDisplay 2021-07-21 16:38:25 +09:00
ekrctb
94678064ff Rename CatcherArea.MovableCatcher to Catcher 2021-07-21 16:28:31 +09:00
ekrctb
da3499f10e Simplify the way of getting catcher 2021-07-21 16:27:44 +09:00
ekrctb
1bac471b49 Adapt to PlatformAction type change 2021-07-21 16:12:53 +09:00
ekrctb
d2d3214d47 Implement horizontal flipping of hit objects in catch editor 2021-07-21 16:07:02 +09:00