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
AbstractQbit
1181317c72
Fix issues found by code quality ci
2021-09-15 12:01:56 +03: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
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
Bartłomiej Dach
7b9e501fa0
Merge branch 'master' into 14421-multi-password-error-handling
2021-09-14 22:58:20 +02: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
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
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
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
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
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
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
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
345cde251d
Add "samples match playback rate" to editor setup screen
2021-09-12 16:54:17 +02:00
Bartłomiej Dach
22fa9a303e
Expose test helper for switching between difficulties
2021-09-12 13:55:48 +02:00
Bartłomiej Dach
8357efc74f
Make EditorTestScene
go through EditorLoader
2021-09-12 13:26:04 +02: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
Dean Herbert
94702ee7e3
Fix triangles intro attempting to restart track after it is disposed
2021-09-10 18:23:00 +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
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
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
Dean Herbert
199f5235a3
Merge branch 'master' into fix-score-panel-list-keyboard-nav
2021-09-09 12:12:16 +09:00
Dean Herbert
ba99a808af
Use a decoupled clock for triangles intro to avoid startup freezes on broken audio device
2021-09-09 01:21:19 +09:00
Dean Herbert
6fc46792d3
Fix test regressions
2021-09-09 00:39:54 +09:00
Dean Herbert
136573982c
Add fade in and fix incorrect wrapper bounds
2021-09-08 20:52:14 +09:00
Dean Herbert
7941240a00
Revert "Load DrawableLoungRoom
s asynchronously"
...
This reverts commit 0b55bb6913fbf05ebb8ecadfe711084d6797efe0.
2021-09-08 20:52:14 +09:00
Dean Herbert
3e41d8b32e
Reduce initial fade transforms
2021-09-08 20:52:14 +09:00
Dean Herbert
bebb9d7e67
Wrap main content of DrawableRoom
2021-09-08 20:52:14 +09:00
Dean Herbert
037b9cfb59
Load DrawableLoungRoom
s asynchronously
2021-09-08 20:52:14 +09:00
Jamie Taylor
217ca754ae
Add sound for team swaps
2021-09-08 13:45:05 +09:00
sh0ckR6
b1f91596a7
Give user feedback on password attempt fail
...
Shake the popover
Set the input box's color to red and set the placeholder text to "incorrect password"
2021-09-07 20:05:24 -04:00
sh0ckR6
b8a1ebb786
Hide Popover after failed password attempt
...
Instead of throwing an error, just close the popover and let the user continue
2021-09-07 16:54:21 -04:00
Bartłomiej Dach
8cc444df5f
Fix incorrect keyboard navigation order in score panel list
2021-09-07 21:14:38 +02:00
Dean Herbert
fa62c846c5
Merge pull request #14603 from smoogipoo/score-ordering
...
Fix scores not being ordered correctly on leaderboards
2021-09-07 19:18:37 +09:00
Dean Herbert
1aa95de530
Merge branch 'master' into score-ordering
2021-09-07 17:45:38 +09:00
smoogipoo
4658577b1d
Factor in total score calculation time in results screen load
2021-09-07 15:19:09 +09:00
Dean Herbert
93da531d13
Improve code around background screen handling to read better
2021-09-07 14:35:33 +09:00
Dean Herbert
9edd010b1d
Fix unnecessary background screen transition
2021-09-07 14:34:54 +09:00
Dean Herbert
7921ad4516
Add loading spinner in case load takes longer than expected
2021-09-07 14:34:47 +09:00
Dean Herbert
ddaa95a1ca
Fix pushEditor
function running twice on returning to loader
2021-09-07 14:34:18 +09:00
Dean Herbert
59aa4dabfd
Improve code around background screen handling to read better
2021-09-07 14:33:58 +09:00
smoogipoo
c9325cc419
Fix results screen test scene
2021-09-07 14:15:23 +09:00
Bartłomiej Dach
5b9f37702b
Remove unnecessary delay before pushing editor from loader
2021-09-06 21:32:23 +02:00
Bartłomiej Dach
2d59008f52
Move screen management logic to EditorLoader
2021-09-06 21:30:50 +02:00
Bartłomiej Dach
bd7d6dd35d
Rename method
2021-09-06 21:27:17 +02:00
smoogipoo
20100b8894
Fix a few test failures
2021-09-06 20:20:52 +09:00
smoogipoo
401d38fc05
Fix possible nullref
2021-09-06 19:07:37 +09:00
Bartłomiej Dach
d6a47fd99c
Sort difficulties by ruleset and star rating in menu
2021-09-05 21:48:11 +02:00
Bartłomiej Dach
7012a1d934
Fix issues with main menu -> editor loader transition
2021-09-05 21:48:11 +02:00
Bartłomiej Dach
382269b362
Test staying on same difficulty due to unsaved changes
2021-09-05 21:48:10 +02:00
Bartłomiej Dach
c72523bc14
Add basic test for difficulty switching
2021-09-05 21:48:10 +02:00
Bartłomiej Dach
a9403b65b3
Eliminate dependency on OsuGame
2021-09-05 21:48:10 +02:00
Bartłomiej Dach
c397cc2027
Restructure proof of concept
2021-09-05 21:48:09 +02:00
Bartłomiej Dach
fe2520c599
Add intermediary screen to avoid going back to menus
2021-09-05 21:48:09 +02:00
Bartłomiej Dach
7befd030df
Minimal working example of switching difficulties
2021-09-05 21:48:09 +02:00
Bartłomiej Dach
90f0b6874f
Highlight current difficulty in switcher
2021-09-05 21:48:08 +02:00
Bartłomiej Dach
e8fb5d2e66
Add non-functional difficulty switcher to menu
2021-09-05 21:48:08 +02:00
Dean Herbert
e0ee2a5533
Change section title to read better
2021-09-05 13:34:57 +09:00
Dean Herbert
25420af078
Rename method to drop redundant ruleset suffix
2021-09-05 13:34:23 +09:00
Bartłomiej Dach
1a90fb1ef3
Fix cached property being assigned twice
2021-09-04 19:52:42 +02:00
Bartłomiej Dach
ce1912781e
Add extension point for ruleset-specific beatmap setup sections
2021-09-02 23:29:14 +02:00
Dean Herbert
7688ea7057
Merge branch 'master' into score-ordering
2021-09-02 19:19:52 +09:00
Dan Balasescu
6c649b7bbe
Merge branch 'master' into no-more-sample-control-points-info
2021-09-02 18:09:05 +09:00
Dean Herbert
f223be0760
Merge branch 'master' into score-ordering
2021-09-02 14:45:59 +09:00
Dan Balasescu
aadef41182
Merge pull request #14601 from peppy/fix-editor-setup-screen-pixel-leakage
...
Fix pixels poking out of the top edge of editor setup screen
2021-09-02 14:03:37 +09:00
smoogipoo
f7c1177cc9
Fix ScorePanelList nullref when scores are added too soon
2021-09-01 20:35:06 +09:00
Dean Herbert
ef64c05af8
Merge pull request #14533 from frenzibyte/move-incompatibility-icon
...
Move mod incompatibility logic to "local player" mod select overlays
2021-09-01 18:12:27 +09:00
Dean Herbert
9e21f5a59c
Rename LocalPlayer
to User
in mod select prefixes
2021-09-01 17:22:52 +09:00
Dean Herbert
0319177c5c
Fix pixels poking out of the top edge of editor setup screen
2021-09-01 16:46:19 +09:00
smoogipoo
88fc53200e
Refactor
2021-09-01 15:41:52 +09:00
Dean Herbert
edf29e405b
Merge pull request #14581 from bdach/setup-screen-countdown-settings
...
Add countdown settings to setup screen
2021-09-01 15:35:46 +09:00
smoogipoo
2de076a74b
Merge branch 'adjust-classic-scoring' into score-ordering
2021-09-01 15:06:55 +09:00
Bartłomiej Dach
5dc938cc9f
Update tests to match expectations
2021-08-31 22:41:47 +02:00
Bartłomiej Dach
04773b51bb
Remove countdown toggle transition for now
...
Tricky to get right and the design isn't final as is anyway, so leaving
*something* functioning as a best-effort for now.
2021-08-31 22:41:40 +02:00
smoogipoo
fee94236de
Fix update-thread pauses
2021-08-31 21:36:31 +09:00
smoogipoo
bfcadcc4ac
Revert some changes
2021-08-31 19:18:01 +09:00
Dean Herbert
ce0d7cce2d
Merge branch 'remove-ijsonserializable' into no-more-sample-control-points-info
2021-08-31 14:40:54 +09:00
Dean Herbert
c25ab6835c
Remove IJsonSerializable interface
...
Was pretty pointless and made it hard to use the custom serialisation
terms arbitrarily in tests.
2021-08-31 14:39:20 +09:00
Bartłomiej Dach
ddf9d2aa6c
Add test coverage
2021-08-30 22:55:58 +02:00
Bartłomiej Dach
eec9f6d191
Add countdown settings to design section
2021-08-30 22:51:41 +02:00
Salman Ahmed
6154642075
Merge branch 'master' into local-popover-containers
2021-08-30 15:44:29 +03:00
Dan Balasescu
b95da3ca27
Merge pull request #14576 from peppy/update-framework
...
Update framework
2021-08-30 21:09:58 +09:00
smoogipoo
caa797cbf4
Attempt to reorder score panel list
2021-08-30 19:58:35 +09:00
smoogipoo
e19d81c88c
Fix potential incorrect ordering
2021-08-30 19:41:44 +09:00
smoogipoo
4ebb11472d
Update Leaderboard to reorder scores based on scoring mode
2021-08-30 19:34:34 +09:00
Henry Lin
8137eee527
Reuse value
to save enum name
...
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-08-30 18:05:47 +08:00
Henry Lin
04bf667d0d
Parse partially typed enum names in filter query
2021-08-30 17:49:18 +08:00
Dean Herbert
ccacf56dd8
Move to legacy namespace
2021-08-30 17:14:53 +09:00
Dean Herbert
7257aae7f2
Move samples to LegacyControlPointInfo
2021-08-30 17:14:53 +09:00
Dean Herbert
f64efdc4a9
Merge branch 'update-extension-usages' into update-framework
2021-08-30 16:00:09 +09:00
Dan Balasescu
7be825f470
Merge pull request #14488 from frenzibyte/multi-spectator-player-leaving
...
Gray out and stop player instances who quit during multi-spectator sessions
2021-08-30 12:04:19 +09:00
Salman Ahmed
e374ef163d
Update localisable formattable extensions usages inline with framework change
2021-08-29 15:00:28 +03:00
Bartłomiej Dach
fcc3e57d5d
Move overlay colour provider up to editor screen
2021-08-28 20:05:58 +02:00
Bartłomiej Dach
e94d96f250
Add local popover container to editor screens
2021-08-28 20:05:58 +02:00
Bartłomiej Dach
7457480b50
Add local popover container to lounge subscreen
2021-08-28 20:05:58 +02:00
Salman Ahmed
378734a7f8
Separate solo spectator player and "exit on restart" logic to own class
2021-08-27 13:24:37 +03:00
Dean Herbert
2b06dacd0e
Change debounce back to using scheduler
...
Should better allow for adjusting in the future, as well.
2021-08-27 18:57:19 +09:00
Dean Herbert
33aa48bcf6
Merge branch 'master' into lobby-sounds
2021-08-27 18:46:12 +09:00
Bartłomiej Dach
d71dff4340
Merge branch 'master' into skip-overlay-optimisations
2021-08-26 22:38:17 +02:00
Jamie Taylor
56baecdde4
Add missing interaction sfx to MatchTypePicker
2021-08-26 15:30:20 +09:00
Jamie Taylor
e341f471b0
Add lobby sfx for join/leave/kick/ready/unready events
2021-08-26 15:29:22 +09:00
Dean Herbert
e633b2716d
Fix regression in outro skip handling logic
2021-08-26 13:58:45 +09:00
Dean Herbert
b1a261c902
Avoid using scheduled delegates at all for skip overload input handling
2021-08-26 12:25:37 +09:00
Dean Herbert
956e3c554b
Avoid skip overlay attempting to show when it is already invalid
2021-08-26 12:25:37 +09:00
Salman Ahmed
b4d6495f99
Fix editor skin providing container not providing playable beatmap
2021-08-25 17:52:36 +03:00
Salman Ahmed
3ad0b529fb
Make EditorScreen
inherit from VisibilityContainer
rather than unsafe transforms
2021-08-25 17:14:52 +03:00
Salman Ahmed
196c74fce8
Gray out and remove player clock when users stop playing
2021-08-25 11:31:02 +03:00
Salman Ahmed
599145b46a
Stop clocks when removing them from sync manager
2021-08-25 11:31:02 +03:00
Dean Herbert
e1ab3434ed
Add ability to handle user join/leave/kick events in MultiplayerComposite
s
2021-08-25 14:37:14 +09:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens
2021-08-24 18:50:55 +02:00
Dean Herbert
08f757a584
Merge pull request #14474 from smoogipoo/fix-multi-crash
...
Fix crash when entering multiplayer gameplay
2021-08-24 16:20:18 +09:00
smoogipoo
16ddbcd208
Don't bind to RoomId where it's expected to be constant
2021-08-24 14:25:40 +09:00
Salman Ahmed
847726547a
Move mod value change callback inside wedge info text component
2021-08-24 07:53:49 +03:00
smoogipoo
de0de451fe
Refactor to remove resolved dependency
2021-08-24 13:29:19 +09:00
smoogipoo
df170afbc4
Fix multiplayer crashing when entering gameplay
2021-08-24 13:22:06 +09:00
smoogipoo
956c1cc216
Merge branch 'master' into activity-on-multiplayer-screens
2021-08-24 12:33:34 +09:00
Bartłomiej Dach
ccf337bdc2
Merge branch 'master' into editor-setup-file-selector-popovers
2021-08-23 18:28:44 +02:00
Salman Ahmed
bd42d7aada
Hide popover on file selection
2021-08-23 18:01:01 +03:00
Dean Herbert
34b51100ff
Merge pull request #14448 from bdach/basic-design-settings
...
Add basic design settings to editor setup screen
2021-08-23 18:19:58 +09:00
Dean Herbert
c2c9a93e2c
Show editor file choosers in a popover rather than inline
...
Supersedes and closes #14370 .
Closes #14367 .
2021-08-23 18:12:36 +09:00
Dean Herbert
2f6b95da39
Add descriptions for the remaining settings
2021-08-23 17:41:03 +09:00
Dean Herbert
1de84e1c98
Change description to include mention of video
...
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2021-08-23 17:34:19 +09:00
Dean Herbert
eaa4d479ac
Merge pull request #14408 from smoogipoo/remove-current-room
...
Remove the global "selected room" from online screens
2021-08-23 17:29:31 +09:00
Dean Herbert
99bb3032a5
Move gradient to be part of the background for now
2021-08-23 15:27:32 +09:00
Dean Herbert
58fb0c042b
Remove background scale altogether
...
I'm not sure why this is required. Seems like something which was meant
to exist to handle parallax, but that is already handled elsewhere now.
2021-08-23 14:34:27 +09:00
smoogipoo
4f3a5fbad5
Fix test failure
2021-08-23 14:29:15 +09:00
Dan Balasescu
ead1b47e0e
Merge branch 'master' into localise-beatmap-set-overlay
2021-08-23 13:22:52 +09:00
Bartłomiej Dach
2e80e2be51
Reword epilepsy warning description text
2021-08-22 21:47:37 +02:00
Bartłomiej Dach
9538a32b5e
Explicitly update beatmap info wedge on mod change
...
This used to already be the case prior to b419ea7
, but in a very
roundabout way. Changes to the value of the star difficulty bindable -
including indirect changes via the set of active mods changing - would
trigger the wedge display to regenerate and load asynchronously.
b419ea7
accidentally broke this by moving down the bindable retrieval to
a lower level, at which point `WedgeInfoText` would only receive the set
of mods selected at the time at which a given beatmap was selected, and
not receive any further updates, breaking the BPM display updating in
real time (as `WedgeInfoText` could not be aware that rate-changing mods
were even in effect).
To resolve, explicitly reload the wedge's contents on mod changes.
2021-08-22 19:16:46 +02:00
Bartłomiej Dach
e4a8f72167
Add failing test case
2021-08-22 19:16:43 +02:00
Bartłomiej Dach
9816af688e
Add basic design settings to setup screen
2021-08-22 17:43:20 +02:00