h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 13:17:26 +08:00
Code Issues Releases Wiki Activity
42,917 Commits 3 Branches 653 Tags 368 MiB
d08d22e3e9
Commit Graph

27177 Commits

Author SHA1 Message Date
Dean Herbert
b01b0d711f Merge branch 'master' into mute-mod-improvements 2021-07-31 14:55:44 +09:00
Dean Herbert
c082498955 Fix some missed instances of verbatim string conversion 2021-07-31 14:29:38 +09:00
Dean Herbert
e6f337a3c8 User verbatim string for ToLocalisableString calls (and rename US spelling) 2021-07-31 14:27:20 +09:00
Salman Ahmed
397c73e786 Add audio adjustment support to Metronome 2021-07-31 02:16:02 +03:00
Salman Ahmed
3409bc6b27 Update mapper usages with LocalisableDescription 2021-07-31 01:47:14 +03:00
Lucas A
c7e9d09ce3 Localise left over numeric value. 2021-07-30 19:08:27 +02:00
Lucas A
652fe6c413 Uppercase sort filter control text. 2021-07-30 19:07:49 +02:00
Lucas A
5381e11880 Revert unintentional change. 2021-07-30 19:06:25 +02:00
Dean Herbert
7e87023557 Update resources 2021-07-30 23:57:40 +09:00
Lucas A
8a42d88793 Fix whitespace inspections. 2021-07-30 16:28:18 +02:00
Lucas A
db1ed873e4 Localise ranking tables. 2021-07-30 15:24:10 +02:00
Lucas A
9717281969 Localise rankings Spotlight selector. 2021-07-30 14:53:01 +02:00
Jamie Taylor
9538c4c7f2
Make the news collapsable month sections sound like dropdowns, because they pseudo kinda are 2021-07-30 21:35:28 +09:00
Jamie Taylor
9b7bb37244
Add hover+select sounds to some components that are missing them 2021-07-30 21:35:28 +09:00
Jamie Taylor
7dc1de7423
Use 'Submit' select sample variant for back button 2021-07-30 21:35:28 +09:00
Jamie Taylor
c1d8a7e2ad
Add and use 'Submit' select sample variant for particular components 2021-07-30 21:35:28 +09:00
Jamie Taylor
be3c02ff7f
Remove 'Soft' select sample variant usage (soft is the new default) 2021-07-30 21:35:27 +09:00
Lucas A
9515a67f57 Localise ranking sort tab control. 2021-07-30 14:35:25 +02:00
Lucas A
fcfa6d5bd1 Localise rankings overlay header. 2021-07-30 14:18:35 +02:00
Dan Balasescu
e8d56b4ed0
Merge pull request #14065 from peppy/fix-broken-exception-handling 
Fix incorrect authorisation loss exception handling with recent changes
 2021-07-30 19:53:21 +09:00
Dean Herbert
cd516c4ac7 Fix regressed metronome handling 2021-07-30 19:38:43 +09:00
Dean Herbert
185ea776f5 Fix incorrect authorisation loss exception handling with recent changes 2021-07-30 18:11:40 +09:00
Dean Herbert
dac79636a8
Merge pull request #14063 from Joehuu/fix-progress-graph-visibility 
Fix song progress graph not being correctly hidden
 2021-07-30 17:44:22 +09:00
Dean Herbert
d5e68f53b5 Change some defaults and always tween 2021-07-30 17:38:04 +09:00
Dean Herbert
bdc5eb6d3d Add ability to also mute hitsounds 2021-07-30 17:25:01 +09:00
Dean Herbert
0c3f1195e9 Allow audio adjustments to be applied to DrawableRulesets 2021-07-30 17:25:01 +09:00
Dan Balasescu
43e3556deb
Merge pull request #14060 from bdach/uncouple-rankings-tables 
Uncouple display logic from text in rankings overlay tables
 2021-07-30 16:25:22 +09:00
Dean Herbert
3cfd235b7f Add tween when missing to avoid sudden volume difference 2021-07-30 16:10:20 +09:00
Dean Herbert
b399ddaea0 Add inverse setting 2021-07-30 16:10:10 +09:00
Dean Herbert
a2f3edbfc0 Fade track volume out as combo increases 2021-07-30 15:49:11 +09:00
Joseph Madamba
451c65a2c8 Fix song progress graph not being correctly hidden 2021-07-29 23:41:01 -07:00
Dean Herbert
3a347188a5 Allow LinkFlowContainer to still open external URLs when OsuGame is not available 2021-07-30 13:21:26 +09:00
Bartłomiej Dach
c8891d4504
Integrate editor colour display with colour picker & popover 2021-07-29 23:14:37 +02:00
Bartłomiej Dach
0691c0dd63
Switch Colour{Display,Palette} to use Colour4 2021-07-29 23:14:32 +02:00
Bartłomiej Dach
59a33b5d02
Uncouple display logic from text in rankings overlay tables 2021-07-29 22:23:47 +02:00
Bartłomiej Dach
cbc504c1ed
Merge branch 'master' into fix-api-request-abort 2021-07-29 21:29:57 +02:00
Dean Herbert
46c72334fb Fix stack overflow in ruleset change rejection logic 2021-07-30 01:54:30 +09:00
Henry Lin
daefea9221 Merge branch 'master' into mod-muted 
# Conflicts:
#	osu.Game/Overlays/MusicController.cs
 2021-07-29 21:24:09 +08:00
Henry Lin
888e8f1c80 Use shared metronome class 2021-07-29 21:18:07 +08:00
Dan Balasescu
b0bd4ef794
Merge pull request #14052 from Henry-YSLin/music-controller-reset-all-adjustments 
Reset all types of adjustments in `MusicController.ResetTrackAdjustments`
 2021-07-29 22:17:34 +09:00
Henry Lin
7251c28c4a Merge branch 'master' into mod-muted 2021-07-29 21:14:03 +08:00
Henry Lin
89e8296eb1 Reset all types of adjustments in MusicController; Rename AllowRateAdjustments to AllowTrackAdjustments 2021-07-29 15:39:26 +08:00
Henry Lin
935984d200 Rename MetronomeBeatContainer to Metronome 2021-07-29 15:17:21 +08:00
Henry Lin
18e760ee91 Extract metronome from OsuModTarget 2021-07-29 14:52:18 +08:00
Henry Lin
0620cd130e Change mod description 2021-07-29 14:41:47 +08:00
Dean Herbert
c67c763a92
Merge pull request #14030 from Game4all/update-framework-changes 
Update `TableContainer` usages in line with framework changes
 2021-07-29 15:36:15 +09:00
Dean Herbert
3a5324c947 Fix aborting an APIRequest potentially resulting in incorrect success 2021-07-29 13:01:52 +09:00
Dan Balasescu
2a94fc214f
Merge pull request #14046 from peppy/fix-rapid-reconnection 
Fix `HubClientConnector` reconnecting with no delay on server-triggered error
 2021-07-29 01:52:21 +09:00
Lucas A
fbd02dc830 Update framework. 2021-07-28 18:24:29 +02:00
smoogipoo
89f0739a4a Update with framework changes 2021-07-28 21:54:11 +09:00
Dan Balasescu
5144bf8354
Merge pull request #14045 from peppy/avoid-unnecessary-error-deserialisation 
Avoid deserialisation JSON request content when error is not present (or not relevant)
 2021-07-28 20:58:46 +09:00
Dean Herbert
607da5143e
Merge pull request #14016 from ggliv/osu-mod-mirror 
Add "Mirror" mod
 2021-07-28 20:57:30 +09:00
Dean Herbert
cd2a1af6de Fix HubClientConnector reconnecting with no delay on server-triggered error 2021-07-28 20:46:02 +09:00
Dean Herbert
1ed4fdd5f5 Avoid deserialisation JSON request content when error is not present (or not relevant) 2021-07-28 20:13:40 +09:00
Henry Lin
22d83c75e3 Revert imports re-ordering 
Out of the scope of this PR
 2021-07-28 18:32:38 +08:00
Henry Lin
58bbe9db7e Added muted mod 2021-07-28 18:21:08 +08:00
Bartłomiej Dach
239b38a0ab
Reduce implicit conversions by using default 2021-07-27 21:46:29 +02:00
Lucas A
94877117b9 Apply changes in-line with framework changes. 2021-07-27 18:22:47 +02:00
Dan Balasescu
6f35036f53
Merge pull request #14027 from gagahpangeran/comment-markdown 
Add support for markdown in comments
 2021-07-27 14:38:59 +09:00
smoogipoo
34c671f712 Temporary changes to compile with latest framework 2021-07-27 12:06:52 +09:00
smoogipoo
5b06a9d120 Apply changes required for AudioMixer 2021-07-27 03:55:49 +09:00
Dan Balasescu
7ae1b5bae7
Merge pull request #14022 from peppy/fix-invalid-ruleset-causing-crash 
Fix invalid/unavailable ruleset causing game-wide crash
 2021-07-27 02:39:26 +09:00
Gabe Livengood
49160e4482
review modifications: maniamodmirror inheritance, reflection utilities, vertical flip option 2021-07-26 10:46:41 -04:00
Gagah Pangeran Rosfatiputra
6631f0de19
add CommentMarkdownHeading 2021-07-26 21:07:35 +07:00
Gagah Pangeran Rosfatiputra
2a6aeb5310
use CommentMarkdownContainer in DrawableContainer 2021-07-26 18:18:55 +07:00
Gagah Pangeran Rosfatiputra
43100c5288
initial CommentMarkdownContainer 2021-07-26 18:18:33 +07:00
Dan Balasescu
3a81d5e8ce
Merge pull request #14023 from peppy/add-high-precision-macos-note 
Add warning about using high precision mouse on non-windows platforms
 2021-07-26 18:07:38 +09:00
Dean Herbert
5984699842
Update comment to match updated string 
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2021-07-26 17:40:07 +09:00
Dean Herbert
c8944b62ec Update incorrect linked comment 2021-07-26 17:28:58 +09:00
Dean Herbert
075507648a Show warning for linux as well 2021-07-26 17:28:58 +09:00
Dean Herbert
b70bd7689e Add warning about using high precision mouse on macOS 2021-07-26 17:00:06 +09:00
Dean Herbert
af9f910a12 Change WarningText to accept LocalisableString 
Can't work just yet, but best to have the flow in place to maintain 100%
localisation on classes which were already localised.
 2021-07-26 16:59:29 +09:00
Dean Herbert
046f30a268 Reject invalid global ruleset values 2021-07-26 16:34:38 +09:00
Dean Herbert
888954747c Rename class, add commenting and avoid firing requests to create rooms for testing purposes 2021-07-26 15:47:13 +09:00
Dan Balasescu
488dd3ea52
Merge pull request #13980 from peppy/fix-online-song-select-background 
Fix song select background not showing in multiplayer/playlists
 2021-07-26 15:16:39 +09:00
Dean Herbert
3770193ede Fix keyboard navigation at multiplayer lounge not iterating in correct order 2021-07-26 13:49:09 +09:00
Dean Herbert
971a67c669 Add failing test coverage for misordered rooms 2021-07-26 13:46:55 +09:00
Salman Ahmed
749d7a7b24 Fix DrawableRoom swallowing mouse down events before reaching its container 2021-07-26 04:41:47 +03:00
Gabe Livengood
2e1cd4a389
remove accidental tab characters 2021-07-25 21:26:21 -04:00
Gabe Livengood
eb585a6120
Add "Mirror" mod 2021-07-25 20:40:50 -04:00
Bartłomiej Dach
f015b2b63c
Merge branch 'master' into update-packages 2021-07-25 11:49:11 +02:00
Dean Herbert
bb3747ffc9 Fix beatmap search requests double-escaping 
Closes #14008.
 2021-07-25 17:06:40 +09:00
Dean Herbert
afaf44d522 Update LocalisationAnalyser and other packages 2021-07-25 15:07:41 +09:00
Dan Balasescu
dbdaddfbcc
Merge pull request #14004 from Joehuu/fix-beatmap-info-mod-overflow 
Fix mod selector overflowing from beatmap info overlay
 2021-07-25 12:21:29 +09:00
Dan Balasescu
ce30bd8cc7
Merge pull request #14003 from Game4all/localise-profile-overlay-header-stats 
Localise profile overlay numeric statistics
 2021-07-25 12:20:38 +09:00
Joseph Madamba
f6d4ead32a Fix mod selector overflowing from beatmap info overlay 2021-07-24 15:31:01 -07:00
Lucas A
b0b46eed40
Apply review suggestions. 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2021-07-24 21:32:26 +02:00
Lucas A
fa68caa892 Fix CI inspections. 2021-07-24 19:34:12 +02:00
Dean Herbert
48120faeb2 Fix inability to join a multiplayer room which has no password 2021-07-24 19:21:16 +09:00
Lucas A
eba78317d5 Localise kudosu info stats. 2021-07-24 10:16:47 +02:00
Lucas A
5b55366178 Localise profile header stat buttons. 2021-07-24 10:14:13 +02:00
Lucas A
be26414fe3 Localise user history graph. 2021-07-24 10:13:20 +02:00
Lucas A
6095aa2791 Localise profile line chart. 2021-07-24 10:08:47 +02:00
Lucas A
c92f69467a Localise counter pills. 2021-07-24 10:06:31 +02:00
Lucas A
d23e47c253 Localise level progess bar stats. 2021-07-24 10:03:13 +02:00
Joseph Madamba
dce47917fd Fix ruleset icons overflowing from settings footer 2021-07-23 19:07:54 -07:00
Lucas A
011fad167d Localise rank graph tooltip. 2021-07-23 23:38:31 +02:00
Lucas A
48c21674ed Localise expanded header container. 2021-07-23 23:19:51 +02:00
Lucas A
a3f9d96a8e Localise collapsed header container. 2021-07-23 23:12:22 +02:00
Lucas A
ff3d38de6f Localise accuracy display. 2021-07-23 22:37:08 +02:00
Dean Herbert
17168b8137 Fix authentication loss not handled correctly 
This handles the case where on initial API connection, the server
responds with an `Unauthorized` response. It doesn't perform this same
checking/handling on every API request, which is probably what we want
eventually.

Opting to not address the full issue because I know this is going to be
a long one (see
05c50c0f6c/osu.Game/Online/API/APIAccess.cs (L233)).
 2021-07-23 19:03:19 +09:00
Dan Balasescu
05c50c0f6c
Merge pull request #13988 from bdach/fix-unencoded-mp-room-password 
Fix room password not being percent-encoded in join request
 2021-07-23 16:48:04 +09:00
Dean Herbert
50a2abbe7f
Merge pull request #12683 from frenzibyte/legacy-beatmap-combo-offset 
Apply combo offsets "colour hax" only on beatmap skins
 2021-07-23 14:30:18 +09:00
Dean Herbert
b6c1cf4956 Update framework 2021-07-23 13:59:51 +09:00
Dean Herbert
10a2c496e3 Merge branch 'master' into fix-unencoded-mp-room-password 2021-07-23 13:59:46 +09:00
Salman Ahmed
7bc30b46ff Use BindValueChanged with last running immediately instead 2021-07-23 07:51:58 +03:00
Salman Ahmed
0b3b9e35ba Also update colours once on DrawableHitObject 2021-07-23 07:32:56 +03:00
Salman Ahmed
8600a3bf5b Replace "offset" term in combo index documentations with "index" instead 2021-07-23 07:31:03 +03:00
Salman Ahmed
ee3791ccf2 Update colours once on TimelineHitObjectBlueprint 2021-07-23 06:25:56 +03:00
Bartłomiej Dach
6dbdfcc70c
Fix room password not being percent-encoded in join request 2021-07-22 23:11:58 +02:00
Bartłomiej Dach
b1087d14f3
Merge branch 'master' into skin-editor-button-access 2021-07-22 22:49:44 +02:00
Bartłomiej Dach
986910a7e4
Annotate dependency as possibly-null 2021-07-22 22:43:35 +02:00
Dean Herbert
a5736085a9 Ensure externally run operations on LoungeSubScreen are run after load is completed 2021-07-23 02:23:37 +09:00
Lucas A
00ec229bde Localise stat values according to the current locale. 2021-07-22 19:20:20 +02:00
Dean Herbert
3392086d1c
Merge pull request #13984 from ekrctb/catch-editor-reverse 
Implement "reverse pattern" in catch editor
 2021-07-23 01:12:13 +09:00
Salman Ahmed
523c154f15 Add ComboIndexWithOffsetsBindable and bind similar to ComboIndexBindable 2021-07-22 16:40:33 +03:00
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
ekrctb
cc01b9e639 Extract SliderPath reverse logic to be used in other rulesets 2021-07-22 16:14:43 +09:00
Dean Herbert
21053381c7 Fix skin editor potentially eating GlobalAction.Back when not displayed 2021-07-22 15:59:00 +09:00
Dean Herbert
3fd8de3b91 Fix skin editor's fake overlay potentially getting into a bad state 2021-07-22 15:57:47 +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
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
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
ec3ce57bb9 Fix song select background not showing in multiplayer/playlists 
The screen was now being loaded against incorrect dependencies. I'm not
sure why I thought it wasn't possible to just do the `Push` in
`LoadComplete` as it seems to work without issue this time...

Closes #13974.
 2021-07-22 14:33:08 +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
Henry Lin
aab7678a69 Truncate beatmap text 2021-07-22 12:18:37 +08: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
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
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
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
399c3b0be8 Rename property, reword xmldoc and improve readability of update code 2021-07-21 17:32:56 +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
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
Dean Herbert
396ad79d50 Remove unnecessary UnbindAll call 2021-07-21 16:43:08 +09:00
Dean Herbert
a63065dbe9 Tidy up ModDisplay 2021-07-21 16:38:25 +09:00
ekrctb
1bac471b49 Adapt to PlatformAction type change 2021-07-21 16:12:53 +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
Anton Kovalyov
bfad044b00
Remove unused imports. 2021-07-20 21:57:55 -07:00
Anton Kovalyov
2b0d530075
Eliminate Overlay.KeyBinding namespace and move everything to Settings.Section.Input 2021-07-20 21:18:24 -07: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
Bartłomiej Dach
db9cf443c7
Allow confirming room password by pressing Enter 2021-07-21 00:04:51 +02:00
Derrick Timmermans
a8cf6a6854
Fix slight Y position offset in HandleDrag 2021-07-20 23:00:58 +02:00
Derrick Timmermans
bfec87b082
Let TimelineBlueprintContainer only accept positional input within timeline quad 2021-07-20 22:30:50 +02:00
Bartłomiej Dach
1e634d9db0
Adjust user beatmap sections on profile overlay to match web 2021-07-20 21:55:17 +02:00
emu1337
84fd59777c Merge branch 'master' into diffspike-balance 2021-07-20 19:39:41 +02:00
Derrick Timmermans
8b09ddbcd6
Merge branch 'ppy:master' into timeline-object-interactions 2021-07-20 16:36:39 +02:00
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
Salman Ahmed
51b056bf66 Fix WikiHeader setting string.Empty rather than null on breadcrumb 
That's supposed to be fixed already in the base PR, but somehow it
continued to exist here.
 2021-07-20 02:37:11 +03:00
Salman Ahmed
456f4e6f1f Move RankingsScope to own file and fix mapper strings 2021-07-20 02:37:11 +03:00
Salman Ahmed
944bf2c4f9 Fix incorrect property xmldoc inherited 2021-07-20 02:25:38 +03:00
Salman Ahmed
ccc782ea7e Add description to key names of description strings 2021-07-20 02:24:02 +03: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
kj415j45
fe7aa73aad Add localisation for BeatmapSetHeader 2021-07-19 20:45:03 +08:00
smoogipoo
0a43e54dfc Fix request failing due to parameters 2021-07-19 21:24:22 +09:00
kj415j45
3a4da6b867 use same code style 
Co-authored-by: frenzibyte <frenzibyte@gmail.com>
 2021-07-19 20:02:39 +08:00