Dean Herbert
b8b61a196f
Merge pull request #14891 from smoogipoo/mp-currently-playing-map
...
Add currently playing map to multiplayer lounge
2021-09-30 14:22:07 +09:00
smoogipoo
816018edb7
Move hosted by text into nullcheck
2021-09-30 12:04:30 +09:00
smoogipoo
202a602d2f
Change default status to "ready to play"
2021-09-30 12:03:44 +09:00
smoogipoo
ea30445efc
Remove verbatim string
2021-09-30 12:03:34 +09:00
smoogipoo
619a907c47
Fix zero height grid
2021-09-30 12:01:26 +09:00
smoogipoo
56b3c8aa9a
Remove forgotten text
2021-09-30 11:52:14 +09:00
smoogipoo
c83dd7d2b6
Merge OnlinePlayComposite and RoomSubScreenComposite
2021-09-29 20:55:20 +09:00
smoogipoo
c9c2d20544
Limit max size
2021-09-29 20:44:38 +09:00
smoogipoo
67d847fbd3
Add room status text to DrawableRoom
2021-09-29 20:24:49 +09:00
smoogipoo
5f921c7836
Change SelectedItem to show the last item by default
2021-09-29 20:24:32 +09:00
smoogipoo
d89577b2e7
Add host to DrawableRoomParticipantsList
2021-09-29 19:34:40 +09:00
smoogipoo
73ee82ee2b
Rename RecentParticipantsList -> DrawableRoomParticipantsList
2021-09-29 19:15:58 +09:00
Dean Herbert
7914daaef0
Remove unused using
2021-09-29 19:09:48 +09:00
Dean Herbert
4fd19cbb0d
Use null check instead of assert in Hide() due to public exposure
2021-09-29 18:58:43 +09:00
Dean Herbert
c5b7e97bd9
Fix skin editor potentially crashing during close process
...
As reported at
https://github.com/ppy/osu/discussions/14850#discussioncomment-1399382 .
2021-09-29 18:53:49 +09:00
Dan Balasescu
754c56d7ae
Merge branch 'master' into move-startup-concurrency-check
2021-09-29 17:20:20 +09:00
Dan Balasescu
ce3cf72a77
Merge pull request #14888 from peppy/rename-json-key-resolver
...
Rename JSON key resolver to better expose what it's doing
2021-09-29 16:58:42 +09:00
Dean Herbert
dcf87e97c2
Update framework
2021-09-29 14:03:41 +09:00
Dean Herbert
117d47bf7f
Rename JSON key resolver to better expose what it's doing
2021-09-29 11:26:37 +09:00
Sebastian Krajewski
f148fbcc94
Cap LoopCount to at least 1
2021-09-29 00:59:08 +02:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
...
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Bartłomiej Dach
ca6cbca04a
Fix range selection crashing after non-mouse selection
2021-09-27 20:54:29 +02:00
Dean Herbert
bcdbffbca0
Update framework
2021-09-27 20:56:54 +09:00
Dean Herbert
d4310f5d9a
Move database connection string operations local
...
In line with framework changes in
https://github.com/ppy/osu-framework/pull/4793 .
2021-09-27 17:32:41 +09:00
Dean Herbert
df85092426
Resolve inner items early in process and rename variable
2021-09-27 14:24:17 +09:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting
2021-09-27 14:12:09 +09:00
Dean Herbert
5466fb08fd
Merge branch 'master' into timeline-shift-click-selection
2021-09-27 13:40:39 +09:00
Bartłomiej Dach
d3203f83dd
Add implementation of range selection
2021-09-26 20:12:26 +02:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection
2021-09-26 19:27:47 +02:00
Bartłomiej Dach
6dc3e66c93
Include combo information when determining ordering if available
2021-09-26 15:52:25 +02:00
Bartłomiej Dach
a86b9893ac
Always re-sort blueprints before adding/removing one
2021-09-26 15:48:56 +02:00
Bartłomiej Dach
a66d48dbad
Merge branch 'master' into diffcalc-optimisations
2021-09-26 14:46:50 +02:00
Joseph Madamba
9b9c30c8a1
Fix text overflowing on dropdown headers
2021-09-24 22:04:45 -07:00
Dean Herbert
ad6c4e3878
Update framework
2021-09-24 12:46:46 +09:00
Dean Herbert
6b698047ab
Fix DialogOverlay potentially not expiring dialogs as soon as it should
2021-09-23 19:19:03 +09:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
...
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dean Herbert
3b174a71a3
Move startup concurrency check to higher level
...
Makes more sense to perform this check outside of the game itself now
that we can.
2021-09-21 18:00:55 +09:00
Dan Balasescu
ffdaf23329
Merge pull request #14814 from peppy/fix-key-counter-masking
...
Fix `KeyCounterDisplay` potentially getting stuck invisible due to autosize masking
2021-09-21 16:21:38 +09:00
smoogipoo
6246bbc262
Also add to ParticleExplosion
2021-09-21 14:37:09 +09:00
smoogipoo
bad3f0b1e9
Disable FtB pass for particle spewer
2021-09-21 14:25:44 +09:00
Dean Herbert
8584c0b6da
Merge branch 'master' into diffcalc-optimisations
2021-09-21 14:22:42 +09:00
Dean Herbert
add8aac6d5
Merge pull request #14815 from ppy/dependabot/nuget/osu.Game/SharpCompress-0.29.0
...
Bump SharpCompress from 0.28.3 to 0.29.0 in /osu.Game
2021-09-21 14:05:21 +09:00
Bartłomiej Dach
761548e533
Merge branch 'master' into 14470-ur-not-updating
2021-09-20 22:07:33 +02:00
dependabot[bot]
b715b89edc
Bump SharpCompress from 0.28.3 to 0.29.0 in /osu.Game
...
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress ) from 0.28.3 to 0.29.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases )
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.28.3...0.29 )
---
updated-dependencies:
- dependency-name: SharpCompress
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-20 19:54:05 +00:00
sh0ckR6
fb416c79e9
Fully revert Player
2021-09-20 15:01:03 -04:00
Dean Herbert
a3464c98a7
Fix KeyCounterDisplay potentially getting stuck invisible due to autosize masking
...
Closes #14793 .
2021-09-20 23:52:01 +09:00
sh0ckR6
9a1db04920
Resolve GameplayClockContainer instead of Player
2021-09-20 10:28:58 -04:00
sh0ckR6
36a20ab0b3
Resolve failed test compilation
2021-09-20 10:26:07 -04:00
sh0ckR6
10fe2382b0
Address most issues
2021-09-20 10:07:42 -04:00
Dean Herbert
7812c33ddd
Merge branch 'master' into add-legacy-star-particles
2021-09-20 18:15:12 +09:00
Dean Herbert
cdef6d0cf5
Add key binding support for grid mode cycle
2021-09-20 16:43:15 +09:00
Dean Herbert
d96d1b3e47
Update framework
2021-09-20 15:09:27 +09:00
Dean Herbert
16e60eed56
Reduce NestedHitObject enumerator overhead
...
This was especially bad due to it allocating on any and every start time
change, even the first (see usage in `HitObject.ctor`).
2021-09-20 15:09:27 +09:00
Bartłomiej Dach
ab213e2010
Add missing licence headers
2021-09-19 21:09:03 +02:00
Bartłomiej Dach
4e094b2127
Implement grid size toggling matching stable
2021-09-19 20:26:02 +02:00
Bartłomiej Dach
56e80a0706
Add rectangular position snap grid
2021-09-19 18:07:19 +02:00
Opelkuh
9c90dd539f
Use Interpolation.Lerp
2021-09-19 15:06:15 +02:00
Opelkuh
0b593fac5c
Scope down DrawNode's source parameter
2021-09-19 14:49:09 +02:00
Opelkuh
d5a10e9221
Fix particles not spawning if Time.Current is negative
2021-09-19 14:47:20 +02:00
Opelkuh
761da45f6a
Revert af4c3727d77a16e2534df9bbf452336b5c544342
2021-09-19 14:00:56 +02:00
Opelkuh
1d7d779f66
Merge branch 'master' into add-legacy-star-particles
2021-09-19 04:34:35 +02:00
Opelkuh
3f8454cb76
Remove abstract from ParticleSpewer
2021-09-19 03:19:16 +02:00
Opelkuh
ef530ed87c
Normalize particle velocity based on max duration
2021-09-18 23:45:58 +02:00
Opelkuh
846cde53b3
Add RelativePositionAxes support
2021-09-18 22:54:12 +02:00
sh0ckR6
04715a5471
Add null-check when invoking OnSeek
2021-09-18 12:20:36 -04:00
sh0ckR6
f6e279baa1
Add xmldoc to HitErrorMeter.Clear
...
Explains how the method is called and what inheritors should do when implementing it.
2021-09-18 12:18:11 -04:00
sh0ckR6
12cc16c598
Remove unused property in SongProgress
2021-09-18 12:05:06 -04:00
Dean Herbert
801bee7c47
Merge pull request #14785 from nekodex/wrong-password
...
Add audio feedback for incorrect multiplayer room password
2021-09-18 12:02:33 +09:00
sh0ckR6
b2b3108afa
Resolve addressed issues
...
+ Stopped using testing methods in non-testing classes
+ Resolve Player and add OnSeek event
+ Take bindings away from BarHitErrorMeter
+ Add support for ColourHitErrorMeter
2021-09-17 16:19:41 -04:00
Dean Herbert
cc11532d9b
Update resources
2021-09-18 03:08:42 +09:00
Jamie Taylor
f868feae44
Remove unnecessary Schedule
2021-09-17 21:12:39 +09:00
Jamie Taylor
9485323a13
Add audio feedback for incorrect MP room password
2021-09-17 20:52:13 +09:00
Dean Herbert
7ea55b2cee
Merge branch 'master' into fix-taiko-fl
2021-09-17 19:15:20 +09:00
Dean Herbert
a743a3f306
Change combo bind logic to be non-weird
2021-09-17 19:15:14 +09:00
Dan Balasescu
90f1592d15
Merge pull request #14783 from peppy/login-feedback
...
Move login panel related files to own namespace and tidy up class nesting
2021-09-17 19:02:23 +09:00
Dan Balasescu
a591fffdbd
Merge pull request #14782 from peppy/refocus-textbox-on-failed-password
...
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:59:09 +09:00
smoogipoo
2d39131202
Refactor taiko flashlight a bit
2021-09-17 18:41:03 +09:00
Dean Herbert
50f155e4b9
Move login panel related files to own namespace and tidy up class nesting
2021-09-17 18:34:16 +09:00
Dean Herbert
027912d4f6
Refocus the multiplayer password entry textbox on failed join
2021-09-17 18:25:25 +09:00
Dean Herbert
1c8e17cf11
Fix the default background parallax being set incorrectly when no screen is present
2021-09-17 18:14:39 +09:00
Dean Herbert
5f27f1c099
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
...
Bit of an unfortunate one. Because we are applying the pitch adjustment
to the lowest level (`Track`), it's hard to filter out in parent clock
calculations.
Tried a few solutions but this feels the best. Note that we can't just
undo the `pauseFreqAdjust` adjustment as it will div-by-zero.
Closes https://github.com/ppy/osu/issues/14773 .
2021-09-17 15:43:38 +09:00
Dan Balasescu
24105debce
Merge branch 'master' into fix-skin-editor-masking
2021-09-17 13:54:24 +09:00
Dean Herbert
1b13b74740
Fix skin editor potentially leaving game-wide masking in the wrong state
...
Just going with the simplest way to solve this.
Closes https://github.com/ppy/osu/issues/14769 .
2021-09-17 13:48:20 +09:00
Dean Herbert
f524e913e1
Move AllowTrackAdjustments specification to RoomSubScreen
2021-09-17 13:24:01 +09:00
Dean Herbert
cd4ba71a6b
Revert "Merge pull request #14772 from Joehuu/lounge-disallow-track-adj"
...
This reverts commit 06ff4838fb5453ea0ce9
2021-09-17 13:22:39 +09:00
Joseph Madamba
55feb47e61
Disallow track adjustments on playlists / multi lounge
2021-09-16 20:17:21 -07:00
Joseph Madamba
2983d54682
Fix wiki main page blurb overflowing at higher ui scale
2021-09-16 17:32:23 -07:00
Dean Herbert
6b43e955be
Merge branch 'limit-max-triangles' into update-framework
2021-09-16 22:49:50 +09:00
Dean Herbert
fde7c88999
Merge branch 'master' into update-framework
2021-09-16 22:49:02 +09:00
Dean Herbert
edb1230111
Fix potential nullref throw on failed startup
2021-09-16 22:48:09 +09:00
Dean Herbert
b399f910e4
Merge branch 'fix-osu-game-test-scene' into update-framework
2021-09-16 22:46:52 +09:00
Dean Herbert
a1d33c1a46
Update framework
2021-09-16 22:38:19 +09:00
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
