1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 23:47:24 +08:00
Commit Graph

26940 Commits

Author SHA1 Message Date
Salman Ahmed
9d92b795fa Revert making ComboOffsets legacy and define BeatmapSkinComboIndex instead 2021-07-20 14:15:43 +03:00
Dan Balasescu
738d321788
Merge pull request #13946 from peppy/fix-online-play-sub-screens-not-async-loaded
Fix `OnlinePlayScreen` sub-screens not loaded asynchronously
2021-07-20 19:51:13 +09:00
Dean Herbert
3a974d5027
Merge branch 'master' into legacy-beatmap-combo-offset 2021-07-20 19:49:35 +09:00
Dean Herbert
d066ebcd70
Merge pull request #12682 from frenzibyte/refactor-combo-colour-retrieval
Refactor combo colours retrieval to use skin config lookups instead
2021-07-20 19:47:57 +09:00
Dean Herbert
16a2e63bd4 Use existing localisation 2021-07-20 19:44:02 +09:00
Dean Herbert
59457743e5 Move further to the right to avoid overlap with toolbox listing 2021-07-20 19:43:52 +09:00
Dean Herbert
9c4fbf45e9 Add the ability to enter and exit the skin editor via on-screen buttons 2021-07-20 19:36:12 +09:00
Dean Herbert
8e1f8c28bd Use default value to denote no play date, rather than null 2021-07-20 19:05:08 +09:00
Dean Herbert
1a8ab77f21 Revert nullability change 2021-07-20 19:03:29 +09:00
Dan Balasescu
15127f972e
Merge branch 'master' into fix-online-play-sub-screens-not-async-loaded 2021-07-20 18:47:41 +09:00
Dean Herbert
d87ea741ed Fix OnlinePlayScreen sub-screens not loaded asynchronously 2021-07-20 16:38:39 +09:00
Salman Ahmed
554652b033 Merge branch 'refactor-combo-colour-retrieval' into legacy-beatmap-combo-offset 2021-07-20 10:11:52 +03:00
Salman Ahmed
1af230c48c Merge branch 'master' into refactor-combo-colour-retrieval 2021-07-20 10:08:25 +03:00
Dean Herbert
fe414b942f Ensure online play subscreen is loaded before forwarding OnExiting
Closes https://github.com/ppy/osu-framework/issues/4619 (actually not a
framework issue; the framework correctly guards against this scenario,
see
4e29504384/osu.Framework/Screens/ScreenStack.cs (L277)).

Added the assertions to be very explicit about the nested stack's state
at this point. Both of those events can only be triggered if the stack
has a loaded screen (as far as I can tell), making this check
unnecessary in those cases.
2021-07-20 15:51:34 +09:00
Dean Herbert
662822a40c Avoid showing time of play on results screen when autoplay
Closes https://github.com/ppy/osu/issues/13940.
2021-07-20 15:19:44 +09:00
Dean Herbert
6cc81c24b4
Merge pull request #13785 from ekrctb/dependency-providing-container
Add a convenient way to provide ad-hoc dependency to children in visual test
2021-07-20 14:18:17 +09:00
Dean Herbert
9ea1f5900a Don't consider version suffixes when checking for updates
This is just to make life easier for me with deploys for now.
2021-07-20 01:05:37 +09:00
Dean Herbert
e77597c2b6
Merge pull request #13921 from Game4all/localise-profile-overlay
Localise user profile overlay
2021-07-20 00:37:01 +09:00
Dean Herbert
844152e1b1
Merge pull request #13861 from peppy/add-password-support
Add multiplayer room password support
2021-07-19 23:32:28 +09:00
Dan Balasescu
6e104fe084
Merge pull request #13894 from peppy/fix-beat-synced-container-alt
Fix multiple issues with `BeatSyncedContainer`
2021-07-19 23:19:20 +09:00
smoogipoo
6a55cb9df0 Revert unintended change
It's a deeper issue with ScreenStack (see:
https://github.com/ppy/osu-framework/issues/4619).
2021-07-19 22:52:07 +09:00
smoogipoo
57a99886d5 Fix password icon not disappearing when no password 2021-07-19 22:31:01 +09:00
smoogipoo
892d858d5f Fix compile error 2021-07-19 22:23:31 +09:00
smoogipoo
b7c2d6b1ab Merge branch 'master' into add-password-support 2021-07-19 22:23:09 +09:00
Dan Balasescu
5ef1fe6948
Merge branch 'master' into fix-replay-date 2021-07-19 21:58:37 +09:00
Dan Balasescu
f3bcaf7f11
Merge pull request #13929 from peppy/i-deep-cloneable
Create a deep clone of score for score submission purposes
2021-07-19 21:58:27 +09:00
smoogipoo
0a43e54dfc Fix request failing due to parameters 2021-07-19 21:24:22 +09:00
smoogipoo
a001e4aa16 Fix web request failing if password is null 2021-07-19 20:57:16 +09:00
smoogipoo
3168a927dc Fix possible exception 2021-07-19 20:50:30 +09:00
Dean Herbert
80c2b1449b Fix API request potentially firing failed events after completion
Specifically, `Cancel()` calls were not thread safe. Due to a series of
events, `ListPollingComponent` could call `Cancel` from a non-update
thread, leading to a race condition where both a `Success` and `Fail`
event can be fired.

This is intended to be the simplest fix possible, locking and guarding
specifically on the callbacks. Further work could be done in the future
to improve the flow surrounding `pendingFailure`, potentially reducing
redundant work and cleaning up the code, but that's not happening here.

Closes https://github.com/ppy/osu/issues/13632.
2021-07-19 20:27:01 +09:00
smoogipoo
2eec524f27 Fix password not copied from multiplayer client 2021-07-19 20:20:08 +09:00
smoogipoo
d6aa15e5d7 Remove local APIRoom from test multiplayer client 2021-07-19 20:19:23 +09:00
smoogipoo
a5a0f12e19 Also copy password in test room manager 2021-07-19 20:07:56 +09:00
smoogipoo
26d0eea485 Set HasPassword correctly in the response room 2021-07-19 20:03:32 +09:00
smoogipoo
2515785f93 Use room password to fill settings textbox 2021-07-19 20:03:32 +09:00
smoogipoo
8c0daa89a0 Make test multiplayer client validate password 2021-07-19 20:03:27 +09:00
smoogipoo
063f14da98 Update test room manager to not return passwords 2021-07-19 20:03:27 +09:00
Dean Herbert
b3f60c8253 Fix date being updated on replays unexpectedly 2021-07-19 19:28:35 +09:00
Dean Herbert
f16b4957aa Move clone to earlier in the process 2021-07-19 19:18:34 +09:00
Dean Herbert
23ef666f34
Merge pull request #13887 from ekrctb/legacy-converted-y
Preserve Y position of hit objects in osu!catch
2021-07-19 18:48:23 +09:00
Dan Balasescu
f1f6af88a1
Merge pull request #13926 from peppy/set-rank-on-failed-submission
Set score's rank on a failed submission
2021-07-19 18:45:21 +09:00
Dan Balasescu
473011070f
Merge pull request #13908 from peppy/editor-disallow-placement-when-untimed
Fix editor composer allowing object placement without timing present
2021-07-19 18:37:19 +09:00
Dean Herbert
13cb658d29 Mark identifiers as verbatim strings 2021-07-19 18:15:09 +09:00
Dean Herbert
80539fefe1 Merge branch 'master' into localise-profile-overlay 2021-07-19 18:14:59 +09:00
Dean Herbert
b29209d13f Ensure tool is always set back to select tool when beatmap becomes untimed 2021-07-19 17:08:40 +09:00
Dean Herbert
bde35d9f21 Rename radio button classes to be local to editor 2021-07-19 16:57:12 +09:00
ekrctb
87c39909c6 Simplify DependencyProvidingContainer
Using an array of tuple for dependencies instead of using children.
2021-07-19 14:37:19 +09:00
Dean Herbert
caba78cb5d Copy score during submission process to ensure it isn't modified 2021-07-19 14:14:28 +09:00
Dean Herbert
e507faef29 Add deep cloning support to Score/ScoreInfo/Replay 2021-07-19 14:14:28 +09:00
Dean Herbert
3c028ce05c Add IDeepCloneable interface and update existing CreateCopy methods to use it 2021-07-19 12:54:17 +09:00
Dean Herbert
d7f997a7f3 Set score's rank on a failed submission
As we don't have a `RankInfo.F`, this is the next best choice. I am also
adding a check osu-web side for this - this is just to make sure we
aren't sending scores with SS when they are not actually completed.

I'm working on a separate PR to ensure this does not get mutated during
the player exit process.
2021-07-19 12:36:15 +09:00
Bartłomiej Dach
fb5d25405e
Replace calls to obsoleted GetOrDefault() extension 2021-07-18 21:52:16 +02:00
Lucas A
80885301a3 Fix codefactor issues. 2021-07-18 19:36:34 +02:00
Lucas A
9257cd7fad Revert the use of an enum in ProfileHeader. 2021-07-18 19:18:06 +02:00
Lucas A
77807f9e32 Merge branch 'master' into localise-profile-overlay 2021-07-18 19:14:05 +02:00
Derrick Timmermans
2e2a2bdd99
Allow moving timeline selection when mousedown event is outside of blueprint container 2021-07-18 18:06:59 +02:00
Derrick Timmermans
ee220feecf
Avoid using guesses to determine whether inputs blocked 2021-07-18 16:04:23 +02:00
Lucas A
2c26248042 Localise missing text of PaginatedKudosuHistoryContainer. 2021-07-17 17:36:49 +02:00
Lucas A
28845364a3 Localise score weighting. 2021-07-17 16:52:35 +02:00
Lucas A
77d8f240f8 Use ctor default values. 2021-07-17 16:41:42 +02:00
Lucas A
a7c280508f Throw instead of silently returning. 2021-07-17 16:40:37 +02:00
Lucas A
2545275f71 Partly localise Kudosu section. 2021-07-17 16:29:09 +02:00
Lucas A
148eb890ff Localise Historical section. 2021-07-17 16:24:11 +02:00
Lucas A
2f3ed4a4ab Fix PaginatedProfileSubsection ctor arguments 2021-07-17 16:13:33 +02:00
Lucas A
fbbf8ce5a3 Localise Ranks section. 2021-07-17 15:53:24 +02:00
Lucas A
d17f658985 Localise Recent section. 2021-07-17 15:50:56 +02:00
Lucas A
5bb45c7f84 Localise beatmap section. 2021-07-17 15:45:17 +02:00
kj415j45
f4eeb9139e Correct code style 2021-07-17 21:37:58 +08:00
Lucas A
d36842aa15 Localise TopHeaderContainer 2021-07-17 15:32:28 +02:00
Dean Herbert
c6bc95767d Simplify popover hide logic and add test coverage 2021-07-17 22:31:47 +09:00
Lucas A
213e3c0716 Localise DetailHeaderContainer 2021-07-17 15:29:34 +02:00
Lucas A
c6a27e4baa Localise CentreHeaderContainer. 2021-07-17 15:27:40 +02:00
Lucas A
2cfec1dc32 Localise osu!supporter badge. 2021-07-17 15:26:18 +02:00
Lucas A
a0c6945f8f Localise user graph. 2021-07-17 15:25:45 +02:00
Lucas A
306a34a802 Localise level badge tooltip. 2021-07-17 15:21:30 +02:00
kj415j45
0183564810 Merge branch 'localisation-base' of https://github.com/kj415j45/osu into localisation-base 2021-07-17 21:19:14 +08:00
Lucas A
4d276b114b Localise profile header. 2021-07-17 15:18:45 +02:00
kj415j45
ca1080dfb5 use switch statement
Co-authored-by: bdach <dach.bartlomiej@gmail.com>
2021-07-17 21:16:57 +08:00
Lucas A
d9c7ea2026 Localise profile section titles. 2021-07-17 14:57:05 +02:00
Lucas A
e6b8307b8e Localise ProfileHeader 2021-07-17 14:46:14 +02:00
bdach
7859d02c5b Allow null for breadcrumb control 2021-07-17 20:33:26 +08:00
LiangXiang Shen
6bebb1fdb9
Merge branch 'master' into localisation-base 2021-07-17 19:50:52 +08:00
huoyaoyuan
e3c10e3994 Add missing LocalisableString 2021-07-17 19:40:32 +08:00
kj415j45
22ff40fdd5 Fix broken WikiHeader 2021-07-17 19:40:25 +08:00
huoyaoyuan
5b694ad28b Replace string with LocalisableString 2021-07-17 19:37:32 +08:00
Dean Herbert
64cf9b702e Fix incorrec nesting of manual input manager test containers 2021-07-17 17:26:11 +09:00
Dean Herbert
c966cb0530 Fix dependency lookup failing due to location of PopoverContainer 2021-07-17 15:04:18 +09:00
Dean Herbert
d609839ff6 Fix test not working due to popover container being too global 2021-07-17 15:04:00 +09:00
Dean Herbert
87d3bd4b93 Fix time until next beat potentially being exactly zero at point of trigger 2021-07-17 14:35:43 +09:00
Dean Herbert
50eed26bd1 Rename radio button item to label 2021-07-17 02:32:23 +09:00
Dean Herbert
eac9b1ec7e Disable toolbox composition buttons when beatmap is not timed 2021-07-17 02:30:13 +09:00
Dean Herbert
3ae5f6707a Expose whether an EditorBeatmap has timing present or not via bindable 2021-07-17 02:30:00 +09:00
Dean Herbert
7a671754f2 Change RadioButton's object to a string 2021-07-17 02:29:31 +09:00
Derrick Timmermans
e35cff99c7
Pass on mouseDown input to timeline if no selection modification is made with that input 2021-07-16 17:21:43 +02:00
Dan Balasescu
6eed857d63
Merge branch 'master' into input-settings-localisation 2021-07-16 23:25:25 +09:00
Dan Balasescu
da7e880e46
Merge pull request #13893 from peppy/mouse-settings-localisation
Add localisation coverage of `MouseSettings`
2021-07-16 23:25:12 +09:00
Derrick Timmermans
3e8a13bfbf
Allow interacting with timeline objects outside of drawable bounds 2021-07-16 16:16:34 +02:00
Dean Herbert
7df7137c88 Add localisation support for remaining input settings sections 2021-07-16 23:03:55 +09:00
Dean Herbert
b3d89254a9 Bump LocalisationAnalyser for new key generation 2021-07-16 23:03:55 +09:00
Gagah Pangeran Rosfatiputra
8541e73fc1
use text flow in markdown image caption 2021-07-16 16:26:15 +07:00
Dean Herbert
b6996d647e Add ability to disable mistimed event firings 2021-07-15 16:22:48 +09:00
Dean Herbert
d0fc258886 Remove unused OsuLogo.BeatMatching 2021-07-15 15:11:42 +09:00
Dean Herbert
98a1f40a98 Ensure EarlyActivationMilliseconds is applied even in idle state 2021-07-15 15:10:14 +09:00
Dean Herbert
c47ff1919c Fix regression in idle behaviour and refactor further 2021-07-15 14:56:49 +09:00
Dean Herbert
5ecf6511e6 Fix default timing points being used if "track" is not running 2021-07-15 14:41:50 +09:00
Dean Herbert
a3129ad00e Refactor BeatSyncedContainer to support GameplayClock 2021-07-15 14:37:13 +09:00
Dean Herbert
3f3adfe297 Add localisation support for MouseSettings 2021-07-15 13:09:51 +09:00
Dean Herbert
d58534dce6 Update CommonStrings to latest localiser tools output 2021-07-15 13:09:51 +09:00
Dean Herbert
5b91111eda Update SettingsSubsection.Header to accept a LocalisableString 2021-07-15 13:09:51 +09:00
Dean Herbert
687c9aa33d Add tooltip and keywords for "high precision" setting 2021-07-15 12:37:52 +09:00
Dean Herbert
9d693c75cf Add Schedule to restore password text box focus behaviour 2021-07-14 23:56:52 +09:00
Dean Herbert
cc09a8b5ba Update to use OsuPopover implementation 2021-07-14 23:55:46 +09:00
Dean Herbert
b5dd9403b1 Merge branch 'master' into add-password-support 2021-07-14 23:53:03 +09:00
Dean Herbert
c0c14a6bda
Merge pull request #13877 from bdach/osu-popover
Implement osu!-side popover
2021-07-14 23:52:56 +09:00
Dean Herbert
339fab75a8 Rename colour variable in line with other usages 2021-07-14 23:27:03 +09:00
Dean Herbert
c6116676eb Update framework 2021-07-14 23:23:48 +09:00
Dean Herbert
fdfd82aec4 Add elastic scale on appear 2021-07-14 23:23:44 +09:00
ekrctb
7f432665e5 Preserve Y position of hit objects in osu!catch 2021-07-14 14:38:38 +09:00
Dan Balasescu
4b4c341fb8
Merge pull request #13884 from peppy/remove-read-from-difficulty
Remove `IApplicableToDifficulty.ReadFromDifficulty`
2021-07-14 13:10:34 +09:00
Dan Balasescu
95d767bd0c
Merge branch 'master' into fix-orange-hue 2021-07-14 12:32:45 +09:00
Dean Herbert
ed29646291 Remove IApplicableToDifficulty.ReadFromDifficulty
This was added specifically for `ModDifficultyAdjust`, but turned out to
be more of a headache than we expected. We have since removed usage and
would hope that this is not required by any other mods.

Opting for complete removal rather than obsoletion, as we discovered
this was already broken in multiple cases, with fixes being quite
logically complex.

If you happen to be a ruleset developer relying on this, open an issue
and we'll talk you through a better approach (or check what
`ModDifficultyAdjust` is doing now for an example).
2021-07-14 12:32:16 +09:00
Dean Herbert
48d5a3f94f
Merge pull request #13866 from frenzibyte/remove-duplicates
Reference `OverlayColourProvider` static colours in `OsuColour`'s definitions xmldocs
2021-07-14 12:06:47 +09:00
Salman Ahmed
80636be767 Link Lime1 and Orange1 to their OverlayColourProvider's alternative 2021-07-14 03:22:00 +03:00
Salman Ahmed
b4961cd12e Revert "Remove duplicated colour definitions"
This reverts commit 9869986c59.
2021-07-14 03:18:13 +03:00
Bartłomiej Dach
9bec53bfa8 Implement osu!-side popover 2021-07-14 01:05:06 +02:00
Dean Herbert
8d82412b39
Merge pull request #13851 from gagahpangeran/autolink-md
Add autolink support in osu markdown container
2021-07-13 19:40:53 +09:00
Dean Herbert
2436ebb6d3
Merge pull request #13874 from Naxesss/short-object-checks
Add object duration checks
2021-07-13 19:01:02 +09:00
Dan Balasescu
4ce96109b7
Merge branch 'master' into fix-match-screen-buttons-no-user 2021-07-13 18:20:23 +09:00
Dan Balasescu
0557761e51
Merge pull request #13862 from peppy/fix-multiplayer-create-game-failure-crash
Fix crash when multiplayer server join fails during game creation
2021-07-13 18:00:47 +09:00
Dean Herbert
e791669c40 Fix multiplayer screen buttons showing no text when local user not available 2021-07-13 17:59:58 +09:00
Naxess
3a5912e35e Add new checks to verifiers 2021-07-13 10:53:25 +02:00
Naxess
6da2a3d51f Add zero-length objects check and tests 2021-07-13 10:50:11 +02:00
Dean Herbert
60e17fc2b7 Fix disconnected-from-server multiplayer exit sequence being blocked by confirmation dialog 2021-07-13 17:12:35 +09:00
Gagah Pangeran Rosfatiputra
1c69da09d3
Merge branch 'master' into autolink-md 2021-07-13 15:04:36 +07:00
Dean Herbert
481e4dedb0 Move PopoverContainer to OsuGameBase 2021-07-13 16:51:31 +09:00
Dean Herbert
6409a518db Focus password text box on popover display 2021-07-13 16:35:37 +09:00
Dean Herbert
5cffaf4d3b Add extra explanatory comment to avoid any confusion 2021-07-13 14:34:56 +09:00
Dean Herbert
c7c691078a Merge branch 'master' into fix-multiplayer-create-game-failure-crash 2021-07-13 14:34:42 +09:00
Dean Herbert
5a2667ae89 Merge branch 'master' into add-password-support 2021-07-13 14:27:59 +09:00
Dean Herbert
125bd36ab1 Send password in request ctor directly 2021-07-13 14:27:07 +09:00
Dean Herbert
35b5f0462c Merge branch 'master' into add-password-support 2021-07-13 14:26:56 +09:00
Dean Herbert
35841fa4f7
Merge branch 'master' into fix-difficulty-bindable-bind-order 2021-07-13 13:42:53 +09:00
Dean Herbert
5cff379cd9
Merge pull request #13860 from smoogipoo/fix-bindable-ctor
Fix DifficultyBindable not binding correctly and not having default ctor
2021-07-13 13:42:44 +09:00
Dean Herbert
5af2190246 Merge branch 'master' into fix-bindable-ctor 2021-07-13 12:46:01 +09:00
Dean Herbert
ac15dae930 Update framework 2021-07-13 12:35:25 +09:00
Dan Balasescu
351a46b379
Merge pull request #13823 from ekrctb/catch-editor-tests
Add some tests for catch editor blueprints
2021-07-13 08:27:41 +09:00
Bartłomiej Dach
cce4a4dc31 Fix incorrect value copy order in BindTo() 2021-07-12 22:27:36 +02:00
Salman Ahmed
821c1b5335 Update hue of green colour scheme 2021-07-12 19:11:40 +03:00
Salman Ahmed
62a00a82de Revert completely irrelevant changes
This reverts commit b2b966463a.
2021-07-12 19:11:28 +03:00
Salman Ahmed
b2b966463a Update hue of green colour scheme 2021-07-12 19:05:36 +03:00