Daniel Kirschten
6c9a90d1ec
Merge branch 'master' into master
2023-04-22 19:23:52 +02:00
Haspamelodica
e90660c1a4
Switched to lowercase
2023-04-21 02:35:28 +02:00
Haspamelodica
b62de5514c
Fixed video importing bug #23259
2023-04-21 02:10:24 +02:00
Dean Herbert
1066dfcbf6
Change default beat divisor to 4
...
This matches stable, and is a much saner default value.
Will apply to new beatmaps and also beatmaps which don't specify a snap
value in the `.osu` file.
2023-04-20 14:35:13 +09:00
Bartłomiej Dach
e72f103c17
Do not look up metadata for locally-modified beatmaps on save
2023-04-11 23:14:35 +02:00
cdwcgt
ce6a87b4a3
Merge remote-tracking branch 'upstream/master' into export
2023-04-09 15:02:47 +09:00
cdwcgt
de21b4a2f7
use Live<TModel>
...
Use RealmAccess only when needed
2023-04-09 22:21:15 +09:00
Dean Herbert
da947d8661
Gracefully handle beatmaps specifying images using the video storyboard type
2023-03-13 18:24:16 +09:00
Bartłomiej Dach
72695f7c90
Merge branch 'master' into omit-barline-in-timing-control-point
2023-03-07 22:46:24 +01:00
OliBomby
1fcf41379d
Added maintainability patch by bdach
2023-03-06 16:20:36 +01:00
OliBomby
b0cd801405
fix code quality
2023-03-04 19:34:22 +01:00
OliBomby
5146f7c978
using array again in GetSearchableTerms
2023-03-04 16:49:46 +01:00
OliBomby
b90c389ff0
using List instead of Span in GetSearchableTerms
2023-03-04 15:42:35 +01:00
OliBomby
91d206e8d2
Optimised GetSearchableTerms
...
Reduced memory allocations to 1
2023-03-03 19:21:50 +01:00
Dean Herbert
044b0604b2
Move OmitFirstBarLine to TimingControlPoint
2023-02-28 19:29:31 +09:00
cdwcgt
e84e011d5d
Merge branch 'master' into export
2023-02-17 22:15:19 +09:00
Dean Herbert
7cc4fd4efc
Use the exact method stable uses for generating storyboard filenames
2023-01-26 15:09:36 +09:00
Dean Herbert
d15f8c2f3a
Fix beatmaps with multiple osb files potentially reading the storyboard from the wrong one
...
In stable, the storyboard filename is fixed. In lazer, we were always
looking for the first `.osb` in the database. In the case a beatmap
archive housed more than one `.osb` files, this may load the incorrect
one.
Using `GetDisplayString` here feels like it could potentially go wrong
in the future, so I'm open to hard-coding this locally (or using string
manipulation to remove the ` [creator_name]` portion of the beatmap's
filename). Open to opinions on that.
Fixes storyboard playback in https://osu.ppy.sh/beatmapsets/1913687#osu/3947758
2023-01-25 17:11:15 +09:00
Dean Herbert
392ff2ffea
Reword comment regarding hash transfer to make more sense
2023-01-25 14:11:02 +09:00
Dean Herbert
741ca96853
Make transferCollections argument to private method explicitly required
2023-01-25 14:09:13 +09:00
Dean Herbert
739ec8d81d
Add argument hint for nondescript bool
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-25 14:04:30 +09:00
naoey
e6de167adb
Revert split and make collections boolean internal to BeatmapManager
2023-01-24 07:27:26 +09:00
naoey
1c1c9915bb
Split saving new and existing beatmaps into separate flows
2023-01-22 10:27:33 +09:00
naoey
a1b5c9d910
Don't transfer MD5 hashes in collections when copying beatmaps
...
Fixes #22306 .
Changes beatmap saving so that by default it does not transfer
the hashes in collections, and only transfers them when saving the same
difficulty in the editor.
Issue seems to have been introduced in https://github.com/ppy/osu/pull/20641 .
2023-01-22 01:14:18 +09:00
Dean Herbert
a1152fa0db
Merge pull request #22147 from Feodor0090/forbid-negative-snap
...
Forbid negative time snap in editor
2023-01-17 17:35:45 +09:00
Bartłomiej Dach
a9facc076f
Fix difficulty creation flow failing for some ruleset combinations
...
In current `master`, the difficulty creation flow would retrieve a
"reference beatmap" to copy metadata and timing points from using
`GetPlayableBeatmap()`. But, importantly, it was calling that method
using *the ruleset of the new difficulty* rather than the ruleset of the
existing one. This would make the difficulty creation flow fail if the
beatmap couldn't be converted between rulesets (like taiko to catch).
Fixing to use the reference beatmap's actual ruleset would be trivial,
but there's no real reason to do all of that work anyway when a
`WorkingBeatmap` is available. Because getting a playable beatmap is not
required to copy across metadata and timing points, remove the
`GetPlayableBeatmap()` step entirely to fix the bug.
Closes #22145 .
2023-01-14 19:46:55 +01:00
ansel
51e21ee6f0
Make snapped time always positive
2023-01-12 03:38:57 +03:00
Salman Ahmed
5ee0665eac
Merge branch 'master' into pause-imports-during-gameplay
2023-01-09 20:09:17 +03:00
Dean Herbert
811a562608
Don't use bindables to avoid potential cross-usage contamination
2023-01-10 01:10:20 +09:00
Dean Herbert
07dae7dc21
Merge branch 'master' into overlay-panels-context-menu
2023-01-09 19:04:56 +09:00
Dean Herbert
62ffb4fe78
Pause imports during active gameplay
2023-01-09 18:54:11 +09:00
Joseph Madamba
0f6735564e
Move and rename nomination response model to singular
2023-01-07 10:54:48 -08:00
Dean Herbert
f908b25dab
Merge pull request #22033 from frenzibyte/decrease-difficulty-list-fadeout
...
Decrease transition duration of extended difficulty list during hide
2023-01-06 20:13:30 +08:00
Dean Herbert
c0cfa66510
Merge pull request #21754 from Feodor0090/waveform-invalidate
...
Reload waveform on track replacement in editor
2023-01-06 19:57:27 +08:00
Salman Ahmed
8da7667b0b
Decrease transition duration of extended difficulty list during hide
2023-01-05 14:22:17 +03:00
Salman Ahmed
4491a5ba9f
Fix editor exporting beatmap combo colours in wrong order
2023-01-03 13:41:08 +03:00
Berkan Diler
182f36c434
Use StringSplitOptions.TrimEntries for string.Split() when possible
2022-12-27 09:41:58 +01:00
Joseph Madamba
bb58976838
Merge remote-tracking branch 'upstream/master' into overlay-panels-context-menu
2022-12-26 17:54:15 -08:00
Bartłomiej Dach
cb2b0d4178
Remove redundant type specs
2022-12-26 23:12:53 +01:00
Berkan Diler
fcbb21c75e
Fix typo
2022-12-26 20:38:35 +01:00
Berkan Diler
c7ca4bbba5
Use generic Enum methods
2022-12-26 20:36:39 +01:00
Joseph Madamba
b9dfb8b602
Add localisation for context menu strings
2022-12-25 10:12:02 -08:00
Joseph Madamba
2c2f347e25
Add context menus to overlay panels/cards
2022-12-25 09:57:42 -08:00
Salman Ahmed
30de9ba795
Dispose previous waveform on track reload
2022-12-23 00:35:59 +03:00
Berkan Diler
08d2fbeb8e
Use new ArgumentNullException.ThrowIfNull throw-helper API
2022-12-22 21:27:59 +01:00
ansel
20370bd5ae
Invalidate waveform on track load
2022-12-22 20:49:09 +03:00
ansel
d0645ce151
Rewrite waveform invalidation
2022-12-22 15:59:51 +03:00
ansel
66a02374da
Clear cached waveform on track change in editor
2022-12-22 01:23:24 +03:00
Dean Herbert
4a7d7c6ed9
Use MaxBy in all locations that can and update inspection level to match dotnet-build
2022-12-19 16:47:10 +09:00
Dean Herbert
192536643c
Fix some more inspections
2022-12-16 20:21:19 +09:00
Dean Herbert
de079e08dc
Fix incorrect ConfigureAwait call in ImportAsUpdate
2022-12-16 18:54:56 +09:00
Dean Herbert
ba54551313
Merge branch 'master' into guard-url-protocols
2022-12-16 18:23:16 +09:00
Dean Herbert
27c497145f
Fix the MOTHERLOAD of undetected issues that are now visible thanks to net6.0
2022-12-16 18:16:26 +09:00
cdwcgt
3d6d3b4025
fix weird async logic
2022-12-15 20:59:11 +09:00
Dean Herbert
b8904fe747
Move ImportParameters to better home
2022-12-13 21:41:26 +09:00
Dean Herbert
cb16d62700
Hook up ImportParameter flow with IModelImporter caller methods
2022-12-13 21:29:32 +09:00
Dean Herbert
cf2719d4c0
Convert batchImport parameter to parameters class to allow further import configuration
2022-12-13 19:55:18 +09:00
Dean Herbert
902dff15e3
Add todo regarding validity check
2022-12-12 13:44:09 +09:00
cdwcgt
e02b8cb199
Group export methods into their respective managers
2022-12-11 18:30:24 +09:00
Andrei Zavatski
94cfcdb338
Remove SmoothCircularProgress usage in BeatmapCardThumbnail
2022-12-03 16:16:21 +03:00
Dean Herbert
809d02cda0
Fix two implementation oversights
2022-12-02 16:05:14 +09:00
Dean Herbert
896f2d8f74
Fix multiple instances of last hitobject time being calculated incorrectly
2022-12-01 18:04:06 +09:00
Dan Balasescu
7bc8908ca9
Partial everything
2022-11-27 00:00:27 +09:00
Dan Balasescu
985781bc3b
Merge pull request #21356 from peppy/standardise-broken-storyboard-paths
...
Add support for storyboards with incorrect path specifications (`\\` instead of `\`)
2022-11-22 14:33:51 +09:00
Dean Herbert
2774c1ea49
Merge pull request #21215 from jai-x/triangles-bundled-beatmap
...
Add winner of Triangles mapping competition as a bundled beatmap
2022-11-21 16:22:23 +09:00
Dean Herbert
3da21e596a
Add support for storyboards with incorrect path specifications (\\ instead of \)
...
Closes https://github.com/ppy/osu/issues/21204 .
2022-11-21 16:12:01 +09:00
Joseph Madamba
4578a96813
Fix beatmap card expanded content not blocking clicks from behind
2022-11-13 08:18:44 -08:00
Jai Sharma
c5cb4e4e7d
Add winner of Triangles mapping competition as a bundled beatmap
...
https://osu.ppy.sh/home/news/2022-10-06-results-triangles
2022-11-12 17:48:40 +00:00
Dean Herbert
064a245c50
Don't trim whitespace from variable keys / values
2022-11-08 13:30:11 +09:00
Dean Herbert
b764d1bd04
Decode variables earlier in flow in case they include indent logic
...
Without this change, the `depth` calculation could be incorrect.
2022-11-08 13:29:42 +09:00
Salman Ahmed
bd512c4937
Remove equality comparison implementation from BeatmapCard
...
This turned out to be a hurdle instead as it disallows adding two
beatmap cards of equal beatmap, which, while being a good behaviour in
client, makes tests more complicated to work.
2022-11-04 19:27:20 +03:00
Dean Herbert
07bfac40fa
Adjust padding to avoid overlap with card border when expanded
2022-11-03 14:03:28 +09:00
Dean Herbert
66a6084d3f
Scale in the background fill alongside the icon
2022-11-03 14:03:19 +09:00
Dean Herbert
df9f49eef2
Move hover layer behind icon
...
Looked bad on the "already downloaded" state where the icon becomes
black.
2022-11-03 13:56:07 +09:00
Dean Herbert
fb0bc597a0
Merge branch 'master' into improve-beatmap-card-buttons
2022-11-03 13:53:29 +09:00
Dean Herbert
978d15955c
Fix control points not being cloned when running beatmap conversion
...
Closes #20994 .
I haven't considered how this affects performance of difficulty
calculation or otherwise. Seems like a sane initial fix which we can
iterate on going forward.
I've tested using the scenario in the linked issue.
I'm not going to add test coverage because
[BeatmapConversionTest](https://github.com/ppy/osu/blob/master/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs )
should correctly cover this scenario once we are serialising control
points as well.
2022-11-01 17:42:09 +09:00
Bartłomiej Dach
f775741d65
Merge branch 'master' into fix-filename-char-filtering
2022-10-29 12:42:10 +02:00
Dean Herbert
66ed77ac91
Rename and add documentation to function
2022-10-28 18:04:28 +09:00
Dean Herbert
42eafe318c
Remove various simple obsoletions
2022-10-28 13:20:58 +09:00
Dan Balasescu
6177df2a24
Merge branch 'master' into fix-17143
2022-10-25 13:44:58 +09:00
Dan Balasescu
703a8afb11
Merge pull request #20809 from peppy/fix-taiko-broken-drum-roll-ticks
...
Fix taiko drum roll ticks sometimes overflowing outside the drum roll itself
2022-10-21 12:56:14 +09:00
Dean Herbert
5c13c443ff
Fix incorrect fallback logic
...
Regressed when attempting to share implementation of binary search.
2022-10-20 23:08:44 +09:00
Dean Herbert
a754dc6d3b
Expose binary search methods publicly
...
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2022-10-20 14:34:07 +09:00
Dean Herbert
78943a21d8
Update osu.Game/Beatmaps/ControlPoints/IControlPoint.cs
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-10-20 08:06:05 +09:00
Dean Herbert
677b8d09f8
Fix huge oversight causing test failures
2022-10-19 23:54:12 +09:00
Dean Herbert
579d5b51eb
Add and consume sample bank constants
2022-10-19 20:47:58 +09:00
Dean Herbert
59e2478b0e
Fix some older beatmaps having missing backgrounds
...
Closes https://github.com/ppy/osu/issues/20824 .
Note that this will require a reimport of beatmaps as it is baked into the database. Probably not worth making a migration for at this point in time.
2022-10-19 16:01:10 +09:00
Dean Herbert
ec3761ced9
Standardise control point search logic in OverlappingScrollAlgorithm
...
Was using a very local algorithm which I cannot guarantee is correct.
I'd rather it just use the one used everywhere else.
2022-10-18 16:01:05 +09:00
Salman Ahmed
ef72b66dad
Remove beatmap card background workaround to fix broken corners
2022-10-13 16:09:54 +03:00
Salman Ahmed
6c316bcc9e
Make beatmap card icon buttons fill up to the area
2022-10-13 16:09:54 +03:00
Salman Ahmed
aa8040d696
Add hover box to beatmap card icon button
2022-10-13 16:09:54 +03:00
Dan Balasescu
338115ff6a
Move check to LegacyDifficultyControlPoint
2022-10-13 15:05:15 +09:00
Dean Herbert
3da54814f8
Merge pull request #20641 from pfgithub/patch-fix-save-collections
...
Preserve collections when saving a beatmap
2022-10-12 18:36:45 +09:00
sw1tchbl4d3
df0501235d
Introduce BpmMultiplierMania, remove after the fact clamps
2022-10-12 11:14:01 +02:00
Dean Herbert
db148d145b
Fix incorrect offset logic for beatmaps without a preview point specified
2022-10-12 14:47:37 +09:00
Dean Herbert
721bfb5369
Rename parameter to read better
2022-10-12 14:46:35 +09:00
Dean Herbert
9bab02fab4
Remove unused using statement
2022-10-11 16:23:05 +09:00
Dean Herbert
eba3d37a11
Add xmldoc and simplify calling
2022-10-11 15:50:02 +09:00
pfg
e619c9c1e6
fix style
2022-10-10 21:48:41 -04:00
pfg
de8d485305
Move 'transferCollections' to a shared location
2022-10-10 21:45:33 -04:00
NotGumballer91
3cd6ce8e3f
Update WorkingBeatmap.cs
2022-10-11 01:48:55 +08:00
NotGumballer91
749dc40062
Update WorkingBeatmap.cs
2022-10-10 21:03:11 +08:00
NotGumballer91
e3b405cc23
Update IWorkingBeatmap.cs
2022-10-10 21:02:23 +08:00
sw1tchbl4d3
f8036658c7
Move clamps directly to the usages in the conversion algorithm
2022-10-10 09:36:18 +02:00
sw1tchbl4d3
e0904e263f
Fix legacy BpmMultiplier clamp value
2022-10-09 11:25:47 +02:00
pfg
edec613724
Remove unnecessary '?'
2022-10-08 13:58:42 -04:00
pfg
ff14453c2b
Preserve collections when saving a beatmap
2022-10-08 12:42:29 -04:00
o-dasher
feadac1f79
Cleanup all other leftover binding instantiation
2022-09-25 16:02:40 -04:00
Dean Herbert
992441b9de
Disable alpha component parsing in beatmap / skin colour sections
2022-09-21 16:11:41 +09:00
Dean Herbert
5ce67345ae
Catch against sqlite initialisation failures
2022-09-16 01:02:38 +09:00
Dean Herbert
28b15e232d
Remove all EF models
2022-09-15 16:59:36 +09:00
Dean Herbert
0aa92c78ec
Add local sqlite initialisation to BeatmapUpdaterMetadataLookup for now
2022-09-15 16:58:58 +09:00
Dean Herbert
40a60f7145
Remove all entity framework code and migrations
2022-09-15 16:58:58 +09:00
Salman Ahmed
07f577a0c6
Fix beatmap listing potentially showing duplicate beatmap cards
2022-09-13 01:39:21 +03:00
andy840119
e62999fb16
Merge branch 'master' of https://github.com/ppy/osu into remove-the-nullable-disable-in-the-ruleset
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Osu/OsuRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
# osu.Game/Rulesets/Ruleset.cs
2022-09-10 10:40:12 +08:00
Dean Herbert
e9ce968ae3
Merge branch 'master' into fix-play-button-touch
2022-09-09 18:08:18 +09:00
Dean Herbert
d6748d6921
Avoid double call to ProcessFrame
2022-09-09 14:35:47 +09:00
Dean Herbert
64cf6b9014
Compare with decoupled clock directly to avoid including offsets
2022-09-09 14:35:35 +09:00
Dean Herbert
20ffbc4676
Fix beat sync stopping after returning to menu from a failed play
...
Closes #20193 .
Explanation is inline comment.
2022-09-09 14:13:03 +09:00
Dean Herbert
ed81297611
Fix playlist items showing download button briefly during initial local presence checks
2022-09-08 17:10:45 +09:00
Dean Herbert
db15bd56e8
Invalidate working beatmap cache when calling DeleteDifficultyImmediately rather than in editor code
2022-09-06 18:12:47 +09:00
Dean Herbert
579e7e1f17
Fix deleting a difficulty not updating the beatmap set hash
2022-09-06 18:12:47 +09:00
Dean Herbert
605108c938
Refactor/rename deletion method to read better
2022-09-02 16:59:01 +09:00
Dean Herbert
b388428e1c
Merge branch 'master' into feature/EditorDeleteDiff
2022-09-02 16:48:38 +09:00
Dean Herbert
d3ae60ec6d
Fix tournament population failure when beatmap is not found on server
2022-09-01 22:03:01 +09:00
Dan Balasescu
837b19ab24
Merge pull request #19919 from khang06/nan-sv
...
Emulate osu!stable's NaN slider velocity behavior
2022-08-31 19:06:49 +09:00
Dan Balasescu
0491addbbd
Merge pull request #19974 from peppy/no-gameplay-clock-editor-offset
...
Fix editor not applying offsets
2022-08-29 21:10:29 +09:00
Dean Herbert
3eda284b03
Always reprocess beatmaps after a user update request
...
This covers the rare case where metadata may have changed server-side but not
the beatmap itself.
Tested with the provided user database to resolve the issue.
Closes #19976 .
2022-08-29 18:17:42 +09:00
Dean Herbert
2dafa041a7
Account for offset being applied to editor clock time in TestSceneEditorClock
2022-08-29 16:42:50 +09:00
Dan Balasescu
cf6bb3b030
Merge pull request #19958 from peppy/fix-fail-freq-stuck
...
Ensure fail animation sequence isn't run after the player exit sequence has started
2022-08-27 00:58:41 +09:00
Dean Herbert
ad3dd1c700
Fix a couple of oversights regarding track nullability
2022-08-25 14:45:00 +09:00
Khang
adea29c106
Fix test failures
2022-08-24 03:37:33 -04:00
Khang
c9f364d6a0
Document why beatLength can be NaN
2022-08-24 02:10:19 -04:00
Khang
c1ced85b5e
Move GenerateTicks to LegacyDifficultyControlPoint and remove support for NaN slider velocity support for other rulesets (at least for now)
2022-08-23 14:07:18 -04:00
Dean Herbert
29fed0c4a3
Avoid setting the source clock until gameplay is ready to start
...
Without this change, the audio track may audibly seek during load
proceedings.
2022-08-23 18:34:17 +09:00
Khang
fbe8de2757
Disable the GetHashCode warning instead of using bindables
2022-08-23 00:57:25 -04:00
Khang
8f708c1dcf
Turn GenerateTicks into a bindable to pass code quality tests
2022-08-22 22:43:44 -04:00
Khang
9f08c474ca
Treat NaN slider velocity timing points as 1.0x but without slider ticks
2022-08-22 21:58:38 -04:00
Khang
e8d4bc4497
Allow NaN during beatmap parsing if desired
2022-08-22 21:04:26 -04:00
Dean Herbert
17a1df281c
Fix incorrect implicit null specification for user audio offset bindable
2022-08-22 14:03:51 +09:00
Dean Herbert
ba23ce75c2
Make FramedBeatmapClock.Track non-null
2022-08-22 14:02:41 +09:00
Dean Herbert
85d0b7fc57
Reword class xmldoc to better explain that offset application is optional
2022-08-22 14:02:20 +09:00
Dean Herbert
bcc153f738
Add xmldoc and reorganise FramedBeatmapClock
2022-08-18 18:54:10 +09:00
Dean Herbert
6003afafc7
Use FramedBeatmapClock in GameplayClockContainer
2022-08-18 18:54:10 +09:00
Dean Herbert
32e127a6fa
Add FramedBeatmapClock
...
Expose `IsCoupled` in `FramedBeatmapClock` for now to provide editor compatibility
2022-08-18 18:54:10 +09:00
Dean Herbert
37799e3b31
Allow preparing preview point without looping
2022-08-17 13:20:24 +09:00
Dean Herbert
11f38e539f
Rename property to LastLocalUpdate
2022-08-16 16:01:19 +09:00
Dean Herbert
c7db4a532c
Merge branch 'master' into store-modified-time
2022-08-16 15:53:51 +09:00
Dan Balasescu
69cbf4185b
Match class name to file
2022-08-10 19:53:40 +09:00
Dean Herbert
ac99c1ad69
Migrate the majority of existing file lookups to use new extension methods
2022-08-10 16:01:16 +09:00
