1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 06:19:38 +08:00
Commit Graph

28532 Commits

Author SHA1 Message Date
smoogipoo
69c2b7dc59 Merge branch 'master' into rename-beatmap-info-beatmap-fields 2021-10-04 16:03:22 +09:00
Dan Balasescu
fd002da469
Merge pull request #14948 from peppy/fix-drawable-channel-ci-failures
Ensure a `DrawableChannel` is not attempted to be added after disposal
2021-10-04 16:03:13 +09:00
smoogipoo
4e1322effa Fix typo 2021-10-04 16:02:45 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Dan Balasescu
d82829fad3
Merge pull request #14909 from peppy/realm-context-factory-safer-blocking
Ensure realm blocks until all threaded usages are completed
2021-10-04 15:52:45 +09:00
Dean Herbert
266b4c7124 Expose login errors from IAPIProvider and show on the login form 2021-10-04 15:40:24 +09:00
Dean Herbert
5aaafce597 Make AuthenticateWithLogin throw instead of return a bool success status 2021-10-04 15:40:00 +09:00
smoogipoo
bc984dff4f Fix typo 2021-10-04 15:35:28 +09:00
Dean Herbert
c19c2335ec Remove added schedule due to changing flow 2021-10-04 14:58:54 +09:00
Dean Herbert
c6aba3e78b Ensure a DrawableChannel is not attempted to be added after disposal 2021-10-04 14:44:16 +09:00
Dean Herbert
3d71576fbe
Merge pull request #14920 from smoogipoo/guard-skin-exception
Guard against exception in skin deserialisation
2021-10-04 14:07:49 +09:00
Dean Herbert
c8419ebedb
Merge pull request #14946 from bdach/torus-alternate
Add alternate Torus font
2021-10-04 11:47:11 +09:00
Dean Herbert
11e9c16b92 Update resources 2021-10-04 11:13:46 +09:00
Bartłomiej Dach
017756cbca
Use Torus alternates on online play screens as per design 2021-10-04 00:26:41 +02:00
Bartłomiej Dach
86240cc8ec
Add alternate Torus font 2021-10-03 23:36:39 +02:00
Bartłomiej Dach
83fa1be713
Merge branch 'master' into fix-keybinds-reset-search 2021-10-03 13:54:57 +02:00
Susko3
3e403cfe03 Add comment explaining the purpose of the empty FilterTerms 2021-10-02 19:16:46 +02:00
Bartłomiej Dach
f03cf87872
Merge branch 'master' into storyboard-fixes 2021-10-02 18:41:01 +02:00
Dean Herbert
ec61c3c5ee Rename all remaining cases 2021-10-03 00:55:29 +09:00
Susko3
d55836c0b2 Make ResetButton no longer part of search filtering
The button will now appear if and only if all the bindings in its section are visible (not filtered out by the search)
2021-10-02 15:10:30 +02:00
Dean Herbert
20e3f7fec4 Merge branch 'new-interfaces' into beatmap-difficulty-more-interface-usage 2021-10-02 13:08:02 +09:00
Dean Herbert
973c31132b Rename BeatmapInfo variables which were named beatmap for clarity 2021-10-02 12:45:34 +09:00
Dean Herbert
1be96b4292 Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson-5.0.10' 2021-10-02 11:04:00 +09:00
Dean Herbert
fb6426d68d Merge remote-tracking branch 'upstream/dependabot/nuget/Microsoft.AspNetCore.SignalR.Protocols.MessagePack-5.0.10' 2021-10-02 11:03:30 +09:00
dependabot[bot]
cb8165ca50
Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 5.0.9 to 5.0.10.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.9...v5.0.10)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-02 00:59:32 +00:00
dependabot[bot]
f60f712bcc
Bump Microsoft.AspNetCore.SignalR.Protocols.MessagePack
Bumps [Microsoft.AspNetCore.SignalR.Protocols.MessagePack](https://github.com/dotnet/aspnetcore) from 5.0.9 to 5.0.10.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.9...v5.0.10)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Protocols.MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-02 00:59:32 +00:00
dependabot[bot]
9517d69f21
Bump MessagePack from 2.3.75 to 2.3.85
Bumps [MessagePack](https://github.com/neuecc/MessagePack-CSharp) from 2.3.75 to 2.3.85.
- [Release notes](https://github.com/neuecc/MessagePack-CSharp/releases)
- [Changelog](https://github.com/neuecc/MessagePack-CSharp/blob/master/prepare_release.ps1)
- [Commits](https://github.com/neuecc/MessagePack-CSharp/compare/v2.3.75...v2.3.85)

---
updated-dependencies:
- dependency-name: MessagePack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-02 00:59:31 +00:00
dependabot[bot]
5ea51f4a9f
Bump Sentry from 3.9.0 to 3.9.4
Bumps [Sentry](https://github.com/getsentry/sentry-dotnet) from 3.9.0 to 3.9.4.
- [Release notes](https://github.com/getsentry/sentry-dotnet/releases)
- [Changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-dotnet/compare/3.9.0...3.9.4)

---
updated-dependencies:
- dependency-name: Sentry
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 18:15:07 +00:00
Dean Herbert
bea310007f
Merge pull request #14922 from ppy/dependabot/nuget/Microsoft.AspNetCore.SignalR.Client-5.0.10
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.9 to 5.0.10
2021-10-02 03:12:14 +09:00
Dean Herbert
ea1e09837e
Merge pull request #14923 from ppy/dependabot/nuget/HtmlAgilityPack-1.11.37
Bump HtmlAgilityPack from 1.11.36 to 1.11.37
2021-10-02 03:11:52 +09:00
Dean Herbert
dcd7d7a709 Add JsonIgnore rule for StoryboardFile
Not sure why this is required, doesn't make much sense.
2021-10-02 03:05:06 +09:00
Dean Herbert
7e009f6168 Add full xmldoc 2021-10-02 02:31:41 +09:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
Dean Herbert
05ca3aec4f Rename GameplayState to SpectatorGameplayState 2021-10-02 02:10:11 +09:00
dependabot[bot]
6de4e981dd
Bump Realm from 10.5.0 to 10.6.0
Bumps [Realm](https://github.com/realm/realm-dotnet) from 10.5.0 to 10.6.0.
- [Release notes](https://github.com/realm/realm-dotnet/releases)
- [Changelog](https://github.com/realm/realm-dotnet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-dotnet/compare/10.5.0...10.6.0)

---
updated-dependencies:
- dependency-name: Realm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 17:01:37 +00:00
dependabot[bot]
323a9a748d
Bump HtmlAgilityPack from 1.11.36 to 1.11.37
Bumps [HtmlAgilityPack](https://github.com/zzzprojects/html-agility-pack) from 1.11.36 to 1.11.37.
- [Release notes](https://github.com/zzzprojects/html-agility-pack/releases)
- [Commits](https://github.com/zzzprojects/html-agility-pack/compare/v1.11.36...v1.11.37)

---
updated-dependencies:
- dependency-name: HtmlAgilityPack
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 17:01:32 +00:00
dependabot[bot]
1eb67dc594
Bump Microsoft.AspNetCore.SignalR.Client from 5.0.9 to 5.0.10
Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) from 5.0.9 to 5.0.10.
- [Release notes](https://github.com/dotnet/aspnetcore/releases)
- [Commits](https://github.com/dotnet/aspnetcore/compare/v5.0.9...v5.0.10)

---
updated-dependencies:
- dependency-name: Microsoft.AspNetCore.SignalR.Client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 17:01:28 +00:00
Jamie Taylor
2a4a376b87
Refactor Filter to behave closer to a Transformable 2021-10-02 01:32:47 +09:00
Dean Herbert
d6dbdc911f
Merge branch 'master' into storyboard-fixes 2021-10-02 00:35:51 +09:00
Dean Herbert
682fe5be78
Merge branch 'master' into realm-context-factory-safer-blocking 2021-10-02 00:30:09 +09:00
Dean Herbert
b1f9bbdc69
Merge branch 'master' into model-importer-split 2021-10-02 00:29:29 +09:00
Dan Balasescu
a620b55d55
Merge pull request #14900 from peppy/model-downloader-split
Split `ArchiveModelManager` into two pieces
2021-10-01 23:16:09 +09:00
Dan Balasescu
d24f89fead
Merge pull request #14906 from peppy/update-realm-context-factory
Refine `RealmContext` implementation
2021-10-01 22:57:03 +09:00
Dan Balasescu
6a172d54d5
Merge branch 'master' into model-downloader-split 2021-10-01 22:34:39 +09:00
Dean Herbert
a32f5d44e2
Improve clarity of xmldoc
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-10-01 22:23:51 +09:00
smoogipoo
adff418fd2 Guard against exception in skin deserialisation 2021-10-01 22:17:38 +09:00
Dan Balasescu
154c412f34
Merge branch 'master' into beatmap-manager-split 2021-10-01 21:46:27 +09:00
smoogipoo
0ee148b53f Extra guard against no attributes 2021-10-01 21:31:26 +09:00
smoogipoo
a1f880a36a Split classes 2021-10-01 21:00:39 +09:00
smoogipoo
d0081908c5 Make Score internal 2021-10-01 20:52:48 +09:00
smoogipoo
98badd644f Add xmldocs 2021-10-01 20:09:39 +09:00
smoogipoo
5820a71652 Fix mania difficulty calculator crashing 2021-10-01 19:57:45 +09:00
Dean Herbert
4c28749d73 Fix incorrect legacy decoder usage 2021-10-01 19:05:08 +09:00
Dean Herbert
3faafd7200 Rename parameter to repeatCount and add guards 2021-10-01 18:26:29 +09:00
Dean Herbert
0daf8937e3 Add missing xmldoc 2021-10-01 17:36:44 +09:00
Dean Herbert
d6618a99a3 Redirect more methods to interface implementations 2021-10-01 17:36:44 +09:00
Dean Herbert
9dae92e78c Add missing backlink to BeatmapSet from Beatmap and fix non-explicit implementations 2021-10-01 17:22:25 +09:00
Dean Herbert
00e33a1da7 Fix incorrect OnlineID mappings 2021-10-01 17:06:09 +09:00
Dean Herbert
05996cc2e9 Add changes that got forgotted in branch surgery 2021-10-01 17:04:53 +09:00
Dean Herbert
a92d499d7a Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo 2021-10-01 16:55:50 +09:00
Dean Herbert
8595eb2d11 Switch BeatmapDifficulty usages to use interface type 2021-10-01 16:55:50 +09:00
Dean Herbert
d309636460 Update all EF based models to implement new read only interfaces 2021-10-01 16:55:50 +09:00
Dean Herbert
619dfe0690 Add new interface base types for models 2021-10-01 16:55:47 +09:00
smoogipoo
36be041846 Merge branch 'master' into realtime-pp-display 2021-10-01 13:28:38 +09:00
Dean Herbert
74841cf1a9 Merge branch 'update-realm-context-factory' into realm-context-factory-safer-blocking 2021-10-01 03:54:31 +09:00
Dean Herbert
b51fd00ba3 Guard against disposal in all context retrievals 2021-10-01 03:46:53 +09:00
Dean Herbert
8557530cd5 Add back main context locking 2021-10-01 03:45:00 +09:00
Dean Herbert
c71cf1e220 Fix incomplete xmldoc 2021-10-01 01:51:31 +09:00
Dean Herbert
3ddb348252 Merge branch 'online-lookup-cache-separation' into beatmap-manager-split 2021-10-01 01:49:31 +09:00
Dean Herbert
2ed28f625a Pass whole queue in rather than function 2021-10-01 01:46:37 +09:00
Dean Herbert
428c7830d9 Pass online lookup queue in as a whole, rather than function 2021-10-01 01:45:21 +09:00
Dean Herbert
27c4f2b06e Add missing disposal 2021-10-01 01:38:50 +09:00
Dean Herbert
dde19f2e81
Fix unbalanced brackets
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-01 01:37:51 +09:00
Dean Herbert
cfd3bdf888 Ensure realm blocks until all threaded usages are completed 2021-10-01 01:34:35 +09:00
Dean Herbert
38cd383aaf Remove local handling of realm when switching thread modes 2021-10-01 00:27:54 +09:00
Dean Herbert
9fa901f6aa Refine RealmContext implementation API 2021-09-30 23:56:38 +09:00
Dean Herbert
a2e61883e3 Initial push to use ILive in import process 2021-09-30 22:55:25 +09:00
Dean Herbert
66409147dc Remove duplicate interface specification 2021-09-30 19:25:08 +09:00
Dean Herbert
c05a8fc4a2 Split importer interface out of IModelManager 2021-09-30 18:52:09 +09:00
Dean Herbert
3e3b9bc963 Split out IModelDownloader and also split apart ScoreManager 2021-09-30 18:25:20 +09:00
Dean Herbert
0a00bc7795 Split out IPostNotifications into an interface 2021-09-30 18:21:34 +09:00
Dean Herbert
fd13142a15 Add missing interface to BeatmapManager 2021-09-30 18:21:24 +09:00
smoogipoo
fab0d531be Add counter to HUD 2021-09-30 17:55:00 +09:00
smoogipoo
4d8418e072 Fix possible nullrefs 2021-09-30 17:54:56 +09:00
smoogipoo
d2a8f35b4c Update styling 2021-09-30 17:54:52 +09:00
Dean Herbert
7a72747d88 Add back optional online lookups 2021-09-30 17:18:39 +09:00
Dean Herbert
90225f2082 Hook up all required interfaces to new BeatmapManager 2021-09-30 17:18:39 +09:00
smoogipoo
84bddf0885 Initial PP counter implementation 2021-09-30 17:00:24 +09:00
Dean Herbert
5618c9933b Expose more pieces of ArchiveModelManager via interfaces 2021-09-30 16:44:39 +09:00
Dean Herbert
d21139b03e Split out database portion from BeatmapManager 2021-09-30 15:43:49 +09:00
Dean Herbert
e7e0473323 Split out WorkingBeatmapCache from BeatmapManager 2021-09-30 15:40:41 +09:00
Jamie Taylor
968826c9e7
Fix typo 2021-09-30 15:17:39 +09:00
Dean Herbert
8a6501fa58 Add basic component level xmldoc 2021-09-30 14:46:07 +09:00
Dean Herbert
6ffd9fdcfa Split out BeatmapOnlineLookupQueue from BeatmapManager 2021-09-30 14:46:01 +09:00
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
Jamie Taylor
f55c4ac640
IsLoaded check no longer required 2021-09-29 21:05:46 +09:00
smoogipoo
c83dd7d2b6 Merge OnlinePlayComposite and RoomSubScreenComposite 2021-09-29 20:55:20 +09:00
Jamie Taylor
4d91204faf
Pause Editor sample playback while popup dialog is shown 2021-09-29 20:46:41 +09:00
smoogipoo
c9c2d20544 Limit max size 2021-09-29 20:44:38 +09:00
Jamie Taylor
2608d193a9
Refactor Filter component to be more re-usable 2021-09-29 20:30:01 +09:00
Jamie Taylor
94e2dbd7e7
Add a low-pass filter effect to music when certain popup dialogs are shown 2021-09-29 20:30:00 +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 06ff4838fb, reversing
changes made to 5453ea0ce9.
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