1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 18:23:01 +08:00
Commit Graph

42436 Commits

Author SHA1 Message Date
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
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
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
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
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
Dean Herbert
f81814832e
Merge pull request #13957 from frenzibyte/allow-custom-game-names
Allow running with different game IDs for debug builds of osu!lazer
2021-07-21 16:06:32 +09:00
smoogipoo
bcd1a3c232 Use existing bool 2021-07-21 16:04:07 +09:00
ekrctb
1bff4373b3 Allow specifying flipping support of selection box different from scaling 2021-07-21 15:59:45 +09:00
smoogipoo
0118c3638c Fix beatmap listing continually paginating for null cursors 2021-07-21 15:59:02 +09:00
Dan Balasescu
3121836741
Merge pull request #13942 from peppy/fix-autoplay-results-timestamp
Avoid showing time of play on results screen when autoplay
2021-07-21 15:37:31 +09:00
Dan Balasescu
747c475b95
Merge pull request #13932 from peppy/fix-multiple-request-completion-states
Fix API request potentially firing failed events after completion
2021-07-21 15:11:03 +09:00
Dean Herbert
3dddcf3582 Remove unused using statement 2021-07-21 15:11:01 +09:00
Dean Herbert
3a968977cb Add rider configuration for dual-client testing 2021-07-21 15:09:50 +09:00
Dean Herbert
4148d3fdac Add a bit more safety to argument parsing logic 2021-07-21 15:02:15 +09:00
Anton Kovalyov
bfad044b00
Remove unused imports. 2021-07-20 21:57:55 -07:00
Salman Ahmed
ebd555129f Change to int-only debug client ID 2021-07-21 07:53:24 +03:00
ekrctb
cd447f0305 Add some doc comment to JuiceStreamSelectionBlueprint 2021-07-21 13:27:07 +09:00
Anton Kovalyov
2b0d530075
Eliminate Overlay.KeyBinding namespace and move everything to Settings.Section.Input 2021-07-20 21:18:24 -07:00
ekrctb
cc0110aa52 Add doc comment to VertexState 2021-07-21 13:17:18 +09:00
ekrctb
97fba5df58 Use existing method for the same code 2021-07-21 12:59:42 +09:00
ekrctb
ca3dfb2498 Fix comment 2021-07-21 12:53:48 +09:00
Salman Ahmed
37393a8432 Allow defining custom storage name for debug builds of osu!lazer 2021-07-21 03:12:44 +03:00
Dean Herbert
59dd3452fe
Merge pull request #13954 from bdach/user-profile-beatmap-api-adjustments
Adjust user beatmap section naming on profile overlay to match web
2021-07-21 08:21:10 +09:00
Dean Herbert
ba62a0f877
Merge pull request #13955 from bdach/password-popover-enter
Allow confirming room password by pressing Enter
2021-07-21 08:20:20 +09:00
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter 2021-07-21 00:04:51 +02:00
Bartłomiej Dach
1e634d9db0
Adjust user beatmap sections on profile overlay to match web 2021-07-20 21:55:17 +02:00