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

28292 Commits

Author SHA1 Message Date
Dean Herbert
df786afb24
Merge pull request #14763 from kj415j45/localisation-settings-GlobalAction
Add localisation for Settings-KeyBindings-GlobalActions
2021-09-16 21:08:00 +09:00
kj415j45
a18fed0da4
Remove unused using 2021-09-16 17:38:33 +08:00
smoogipoo
4b5857c876 Merge branch 'baseline-changes-update' into update-framework 2021-09-16 18:34:22 +09:00
smoogipoo
e8dea0138c Fix one more issue 2021-09-16 18:34:13 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
kj415j45
e323f10cd5
Remove unused [Description] 2021-09-16 17:10:29 +08:00
kj415j45
51997fa533
Add localisation for GlobalActions 2021-09-16 16:02:04 +08:00
Dean Herbert
9127a706ac Use private for internally used property 2021-09-16 16:54:56 +09:00
Dean Herbert
2df4073946 SpawnParticle -> CreateParticle (and set time outside of virtual call)
Allows easier overriding (no need to call the `base.CreateParticle` call
and worry about overwriting the time value.
2021-09-16 16:52:46 +09:00
Dean Herbert
da0667365b
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-16 16:35:11 +09:00
Dean Herbert
6f2d818b64
Merge pull request #14740 from smoogipoo/mania-note-animations
Add animation support for mania notes
2021-09-16 16:34:53 +09:00
Dean Herbert
3495fae519 Handle potential for OnResuming call without an OnSuspending first 2021-09-16 16:31:41 +09:00
Dean Herbert
b58415fe19 Make suspend stored state nullable to ensure we don't break it 2021-09-16 16:12:14 +09:00
Dean Herbert
fa693bb8a8 Move MusicController adjustment set to inside OsuScreen itself (and result nullable) 2021-09-16 16:08:09 +09:00
Dan Balasescu
43379a2eaa
Merge pull request #14752 from peppy/realm-settings
Move (ruleset) settings to realm
2021-09-16 14:05:41 +09:00
Dean Herbert
4d4a9b86c1 Merge branch 'master' into mania-note-animations 2021-09-16 11:12:07 +09:00
AbstractQbit
318f0941ca Move all the "inherit previous AllowTrackAdjustments" logic into OsuScreen 2021-09-15 21:25:39 +03:00
Dean Herbert
931e873a7e
Merge branch 'master' into inheritable-allow-track-adjust 2021-09-15 22:26:13 +09:00
AbstractQbit
f0439ef50b Remove unnecessary AllowTrackAdjustments overrides, add true to SongSelect 2021-09-15 13:12:57 +03:00
Dean Herbert
8acfefed1b
Merge pull request #14741 from smoogipoo/fix-lounge-beatmaps-counter
Fix incorrect beatmap count and SR range in multi lounge
2021-09-15 18:51:52 +09:00
Dean Herbert
07fec268c0 Limit maximum triangles to avoid GL buffer overflow 2021-09-15 18:32:59 +09:00
AbstractQbit
1181317c72 Fix issues found by code quality ci 2021-09-15 12:01:56 +03:00
Dean Herbert
4f1db5af40 Attach migration memo to DatabasedSetting class for visibility 2021-09-15 17:25:07 +09:00
Dean Herbert
a1d325cb22 Mark key and value non-nullable (at realm end) and simplify Value logic 2021-09-15 17:16:05 +09:00
Dean Herbert
a150fb2996 Add nullability directive and make variant non-nullable 2021-09-15 17:16:05 +09:00
Dean Herbert
15e3f95c87 Remove remnants of DatabasedSetting from SkinInfo
This was never used
2021-09-15 17:12:04 +09:00
Dean Herbert
dcfe9c67e3 Make ruleset id non-nullable 2021-09-15 17:12:04 +09:00
Dean Herbert
80ecf81be3 Rename all databased setting classes to be specific to rulesets for now 2021-09-15 17:12:04 +09:00
Dean Herbert
520e550764 Bring back SettingsStore to avoid changing ruleset API for now
Also fixes some remaining test failures due to locally constructed
rulesets that are not being tracked by the game.
2021-09-15 17:12:02 +09:00
Dean Herbert
c36a67d06e Fix some tests failing due to using a locally constructed ruleset 2021-09-15 17:04:38 +09:00
Dean Herbert
5bb741b4e8 Remove migration of key bindings 2021-09-15 17:04:38 +09:00
smoogipoo
f54d554d30 Extract removal to method 2021-09-15 17:03:28 +09:00
AbstractQbit
48cf98ef93 Rephrase null meaning in IOsuScreen.AllowTrackAdjustments
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-09-15 11:00:49 +03:00
AbstractQbit
b87af3dd68 Move the inherited AllowTrackAdjustments into OsuScreen 2021-09-15 10:55:16 +03:00
Dean Herbert
2bcb3fd304 Add migration of existing settings 2021-09-15 16:31:13 +09:00
Dean Herbert
ac377a2e3c Remove unused SettingsStore 2021-09-15 16:31:13 +09:00
Dean Herbert
a2f1752344 Make settings works with current caching structure
Will likely pull out that `RulesetConfigCache` next, but this is an
"everything works" state.
2021-09-15 16:31:13 +09:00
Dean Herbert
14314476f0 Update realm to latest version 2021-09-15 16:22:14 +09:00
Dean Herbert
187c557ea8 Begin migrating settings implementation across to realm 2021-09-15 16:22:14 +09:00
Salman Ahmed
8217b90b1c Consider legacy glyph texture heights as the baselines for simplicity
Mixing `LegacySpriteText` with legitment fonts should never be the case,
so it's fine to consuder the height as the baseline, since there's
really no other way around it.
2021-09-15 09:14:47 +03:00
Dean Herbert
623377772c
Merge branch 'master' into fix-spectator-random-mod 2021-09-15 13:55:28 +09:00
Dean Herbert
1ba716d9f1
Merge pull request #14737 from bdach/editor-difficulty-switch-shared-state
Preserve current time and clipboard contents when switching between difficulties
2021-09-15 12:38:56 +09:00
Dan Balasescu
5ea1924c30
Merge branch 'master' into display-sr-changes 2021-09-15 10:22:11 +09:00
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling 2021-09-14 22:58:20 +02:00
Bartłomiej Dach
baf9961934
Amend xmldoc of shake extension method 2021-09-14 22:50:45 +02:00
AbstractQbit
bd18c581c1 Replace allowTrackAdjustmentsStack with a Dictionary 2021-09-14 21:14:24 +03:00
AbstractQbit
01d2f4f17a Make allowTrackAdjustmentsStack readonly 2021-09-14 18:04:43 +03:00
AbstractQbit
b9193aae6d Make IOsuScreen.AllowTrackAdjustments nullable
Allows for inheriting value from the previous screen if undefined
2021-09-14 17:37:57 +03:00
Dean Herbert
57f8ccca16 Remove nullability from EditorState properties
Also update the xmldoc to not be specific to difficulty switching
2021-09-14 23:36:28 +09:00
Dean Herbert
f8bdca542d Make restoring state a public call on Editor 2021-09-14 23:36:17 +09:00
Dean Herbert
2a894e7a3f Make EditorLoader state private 2021-09-14 23:26:02 +09:00
smoogipoo
a775915338 Fix incorrect beatmap count and SR range in multi lounge 2021-09-14 18:20:28 +09:00
smoogipoo
63aa3ddcba Add animation support for mania notes 2021-09-14 17:45:23 +09:00
smoogipoo
b807c161b4 Remove now-unused DI params 2021-09-14 17:25:57 +09:00
smoogipoo
6cffbee592 Fix random/target mods not working in spectator 2021-09-14 17:22:58 +09:00
Dean Herbert
5058f28504 Remove breaking padding 2021-09-14 14:52:50 +09:00
Dean Herbert
8865e3cab8 Add back shake and tweak transform of text 2021-09-14 14:44:32 +09:00
Dean Herbert
e17b800470 Move shake logic into extension method 2021-09-14 14:44:23 +09:00
Dean Herbert
7bd749d0eb Remove weird shaking 2021-09-14 14:19:55 +09:00
Dean Herbert
e3c56f9ebd Show error message in popover 2021-09-14 14:14:06 +09:00
Dean Herbert
eaac2bad3d Fix incorrect child margin specifications 2021-09-14 13:49:02 +09:00
smoogipoo
3df4cbca2c Reduce precision of difficulty calculator tests 2021-09-14 13:45:10 +09:00
Opelkuh
9fd616c578 Tiny refactor 2021-09-14 00:16:42 +02:00
Opelkuh
224244801f Remove Particles namespace 2021-09-13 21:44:27 +02:00
Opelkuh
cfcb46034c Remove ParticleJet 2021-09-13 21:44:23 +02:00
Opelkuh
99eff4f41f Move cursor particles under OsuCursorContainer 2021-09-13 21:44:22 +02:00
Opelkuh
c2f7b01ca4 Change particle AngularVelocity into StartAngle and EndAngle 2021-09-13 21:44:21 +02:00
Opelkuh
6d68da8ff0 Remove StartScale from ParticleSpewer particles 2021-09-13 21:44:20 +02:00
Opelkuh
db662f8c5c Add ParticleParent option to ParticleSpewer 2021-09-13 21:44:20 +02:00
Opelkuh
328c9a5dd0 Change ParticleSpewer.Active to a Bindable 2021-09-13 21:44:18 +02:00
Opelkuh
4c753420d3 Fix ParticleSpewer gravity calculation 2021-09-13 21:44:17 +02:00
Opelkuh
714cf33aac Change ParticleSpewer to use screen space 2021-09-13 21:44:17 +02:00
Opelkuh
1a60ce164e Add ParticleJet 2021-09-13 21:44:16 +02:00
Bartłomiej Dach
35ee889e5b
Restore clipboard content after difficulty switch 2021-09-13 21:04:27 +02:00
Bartłomiej Dach
79d0f4835e
Add failing tests for preserving clipboard content 2021-09-13 21:03:30 +02:00
Bartłomiej Dach
3fc72271f1
Restore editor clock time after difficulty switch 2021-09-13 20:59:31 +02:00
AbstractQbit
3c75094f43 Move BarHitErrorMeter's icon reorintation to Update() 2021-09-13 19:41:55 +03:00
AbstractQbit
7267602b95 Fix icon orientation for horizontal bar hit error meter 2021-09-13 17:14:39 +03:00
Dean Herbert
1e09f558d1
Merge pull request #14687 from Emil8250/master
Make "Reset bindings" button wider to accommodate to localisations better
2021-09-13 22:46:06 +09:00
AbstractQbit
9c1fc2ec65 Tweak filled nub border width value 2021-09-13 14:19:33 +03:00
Dean Herbert
4d2373ffb9 Combine similar value changed calls 2021-09-13 20:08:46 +09:00
Dean Herbert
d999c29d3a Remove unused GameHost DI in OsuGameTestScene 2021-09-13 19:38:43 +09:00
AbstractQbit
0f5ed81a7a Fix dimmed checked nub artifact
This adds transition that extends nub's border to fill it.
Fill fade can be removed, but combined effect looks nicer imo,
and the fill is still needed because if removed, border
becomes invisible for some reason.
2021-09-13 13:31:13 +03:00
Dean Herbert
aa71e3f3d4 Update nested game tests in line with framework changes 2021-09-13 19:04:13 +09:00
Dan Balasescu
f6c4bbe2c9
Merge pull request #14730 from peppy/add-missing-track-adjustment-defaults
Add missing screen level mod application settings for some screens
2021-09-13 15:22:22 +09:00
Dean Herbert
0c646f6dbd
Merge pull request #14694 from nekodex/no-avatar-click-sound
Don't play hover/select sounds for UpdatableAvatar unless it's clickable
2021-09-13 15:14:43 +09:00
Dean Herbert
f9c82a9098
Merge pull request #14676 from nekodex/lobby-team-swap
Add sound for multiplayer team swaps
2021-09-13 15:01:58 +09:00
Dean Herbert
caf7ef6519 Add missing screen level mod application settings for some screens
Closes #7480. But based on discussion in there this solution may change.
2021-09-13 15:00:34 +09:00
Dean Herbert
52c69d2f22 Adjust value to not be full width (but allow for more accommodations with localised versions) 2021-09-13 14:17:45 +09:00
Dean Herbert
684c39dad0 Update resources 2021-09-13 14:12:37 +09:00
Dean Herbert
7fe0eefb78 Add inline comment regarding team switch sample logic
Feels a bit convoluted without this. Don't really have a better
suggestion for now so a comment will do.
2021-09-13 14:12:19 +09:00
Dean Herbert
65fdceee79
Merge branch 'master' into editor-test-scenes-through-loader 2021-09-13 14:02:55 +09:00
Dan Balasescu
d9b4fae4e5
Merge branch 'master' into chat-command 2021-09-13 13:32:44 +09:00
Bartłomiej Dach
5969e2b852
Add TODO comment about lack of in-gameplay support 2021-09-13 00:13:07 +02:00
sh0ckR6
447001931c
Resolve LoungeSubScreen from PasswordEntryPopover
This is preferred over passing down the already-resolved LoungeSubScreen
2021-09-12 14:36:11 -04:00
Bartłomiej Dach
1be8cb452f
Make new beatmaps' samples match playback rate by default 2021-09-12 16:57:21 +02:00
Bartłomiej Dach
345cde251d
Add "samples match playback rate" to editor setup screen 2021-09-12 16:54:17 +02:00
Bartłomiej Dach
af7c2b93e6
Add encoding support for SamplesMatchPlaybackRate 2021-09-12 16:47:38 +02:00
Bartłomiej Dach
cd181452be
Add decoding support for SamplesMatchPlaybackRate 2021-09-12 16:45:27 +02:00
Bartłomiej Dach
925b455330
Add "samples match playback rate" setting to beatmap info 2021-09-12 16:40:52 +02:00
Bartłomiej Dach
22fa9a303e
Expose test helper for switching between difficulties 2021-09-12 13:55:48 +02:00
Bartłomiej Dach
f8a681d810
Delegate Editor{Beatmap,Clock} to Editor directly 2021-09-12 13:40:06 +02:00
Bartłomiej Dach
8357efc74f
Make EditorTestScene go through EditorLoader 2021-09-12 13:26:04 +02:00
Bartłomiej Dach
c4627bed6d
Print username in case of generic network failure too 2021-09-12 12:56:36 +02:00
rednir
e511c2ef2b
add comment 2021-09-12 08:50:53 +01:00
sh0ckR6
e018071be4
Remove OnShakeFinish event 2021-09-11 19:50:41 -04:00
sh0ckR6
6cdc842452
Remove placeholder text response
Weird UX, doesn't feel right compared to the rest of lazer
2021-09-11 17:42:49 -04:00
sh0ckR6
b8a6925175
Use already-resolved LoungeSubScreen instead of nested delegates 2021-09-11 17:41:07 -04:00
Bartłomiej Dach
b9c127c07e
Improve content transitions in beatmap listing 2021-09-11 22:37:36 +02:00
Davran Dilshat
1b264a2dd0 make user lookup string public 2021-09-11 16:22:29 +01:00
Davran Dilshat
c166f1a06a change error message based on exception message 2021-09-11 14:18:09 +01:00
Bartłomiej Dach
addba43e7d
Merge branch 'master' into fix-password-popover-back-button 2021-09-11 14:18:25 +02:00
Bartłomiej Dach
0e5659acb2
Remove leftover exception throw 2021-09-11 14:10:29 +02:00
Dean Herbert
94702ee7e3 Fix triangles intro attempting to restart track after it is disposed 2021-09-10 18:23:00 +09:00
Dan Balasescu
f4b1d8b9d1
Merge pull request #14704 from peppy/modicon-imod-support
Update `LeaderboardModSelector` to avoid creating mod instances
2021-09-10 16:43:32 +09:00
Davran Dilshat
acb181ff2b rename alreadyJoinedChannel -> privateChannel 2021-09-10 08:15:43 +01:00
rednir
5ec615c783
display user in error message
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-09-10 08:02:15 +01:00
rednir
84c152e7b6
break when already found user
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-09-10 08:01:38 +01:00
Dean Herbert
309460e505
Merge pull request #14675 from ekrctb/featured-artist-markers
Add featured artist markers to beatmap listing and overlay
2021-09-10 14:30:33 +09:00
Jamie Taylor
8d1e43423e
Update calls to use new variable name 2021-09-10 14:18:40 +09:00
Dean Herbert
63116a8889
Merge pull request #14703 from gagahpangeran/supporter-bg
Fix supporter promo background colour
2021-09-10 14:11:01 +09:00
Dan Balasescu
2d2c63dde7
Merge branch 'master' into modicon-imod-support 2021-09-10 13:30:05 +09:00
Dan Balasescu
78a83e0903
Merge pull request #14698 from peppy/fix-beatmap-overlay-hide
Fix beatmap listing overlay not hiding via keyboard control when scrolled
2021-09-10 13:18:37 +09:00
Dan Balasescu
1d9ad9478e
Merge pull request #14683 from peppy/use-decoupled-clock-triangles-intro
Use a decoupled clock for triangles intro to avoid startup freezes on broken audio device
2021-09-10 13:15:58 +09:00
Gagah Pangeran Rosfatiputra
110f495345
move internal children to bdl 2021-09-10 11:11:55 +07:00
Jamie Taylor
85b699182e
Rename variable to be more descriptive 2021-09-10 13:01:54 +09:00
Gagah Pangeran Rosfatiputra
e636692596
change background to background 5 2021-09-10 11:00:55 +07:00
Dean Herbert
212c3c699c Reword xmldoc slightly 2021-09-10 12:58:12 +09:00
Dan Balasescu
80f49ec5fd
Merge branch 'master' into cached-all-mods 2021-09-10 12:47:22 +09:00
Dean Herbert
28e9329136 Update LeaderboardModSelector to avoid creating mod instances 2021-09-10 12:43:21 +09:00
Dean Herbert
464797fecf Allow ModIcon to be constructed using an IMod 2021-09-10 12:43:12 +09:00
Dean Herbert
c3531e1361 Move more specification from Mod to IMod 2021-09-10 12:42:53 +09:00
Jamie Taylor
2838a3a961
Rewrite conditional to be more 'balanced' 2021-09-10 12:25:41 +09:00
Gagah Pangeran Rosfatiputra
8acf82944f
use hex colour directly instead of transparency 2021-09-10 10:17:10 +07:00
Dean Herbert
719392de39 Change CreateInstance to use Activator.CreateInstance instead of clone 2021-09-10 12:05:10 +09:00
Gagah Pangeran Rosfatiputra
f329973798
fix supporter promo background colour 2021-09-10 09:37:27 +07:00
Dean Herbert
76e877f160 Disable APIMod/Mod cross equality support 2021-09-10 11:24:56 +09:00
Dean Herbert
cf633973a9 Refactor exposed mod retrieval methods for better safety 2021-09-10 11:09:13 +09:00
Dean Herbert
ce6b022a90 Remove unused IMod specification from APIMod 2021-09-10 10:59:30 +09:00
sh0ckR6
bde092f816
Clear UR bar display on seek with mouse 2021-09-09 20:08:16 -04:00
sh0ckR6
bf0150bab4
Clear UR bar display on keyboard input 2021-09-09 16:21:51 -04:00
Dean Herbert
344bf2ab7c Allow popovers to be closed via back button press
Closes https://github.com/ppy/osu/issues/14669.
2021-09-10 02:15:37 +09:00
Dean Herbert
46599540b6
Merge pull request #14666 from bdach/fix-score-panel-list-keyboard-nav
Fix incorrect keyboard navigation order in score panel list
2021-09-10 02:07:06 +09:00
Dean Herbert
c101d1f205 Fix beatmap listing overlay not hiding via keyboard control when scrolled
Closes https://github.com/ppy/osu/issues/14684.
2021-09-10 01:57:57 +09:00
Dean Herbert
6c18df24ec Change how UsingThemedIntro is set to improve clarity 2021-09-09 22:04:16 +09:00
Dean Herbert
99b6f0352c Always start decoupled clock regardless of track source 2021-09-09 22:04:00 +09:00
ekrctb
29f947fa07 Revert ExplicitContentBeatmapPill, don't try to reuse common code 2021-09-09 19:25:30 +09:00
Dean Herbert
9b34ffc302 Undo big oopsie 2021-09-09 17:12:38 +09:00
Dean Herbert
2edb851008 Add ability to lookup mod from a type specification 2021-09-09 16:50:59 +09:00
Dean Herbert
4d0530ca9d Add new methods to ruleset for quicker mod lookups 2021-09-09 16:46:14 +09:00