1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 21:53:21 +08:00
Commit Graph

34811 Commits

Author SHA1 Message Date
its5Q
231c331690
Rename keys to match enum members
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2022-08-10 18:31:57 +10:00
Dan Balasescu
c151cb4443
Merge pull request #19677 from peppy/fix-mobile-import-crash
Fix crash when attempting to import on mobile platforms
2022-08-10 16:11:38 +09:00
Dean Herbert
ef10d074e8 Update framework 2022-08-10 16:07:47 +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
Dean Herbert
5f10ec1955 Add extension methods for case insensitive file lookups 2022-08-10 15:48:25 +09:00
Dean Herbert
ddffa9b1bd Fix crash when attempting to import on mobile platforms
Regressed with NRT application to this file. It's probably the first
time we've actually hit this due to an optional DI that is actually not
available outside of tests.
2022-08-10 15:32:43 +09:00
Andrew Hong
6f1fdd4c34
Merge branch 'master' into open-profile-hotkey 2022-08-10 01:31:37 -04:00
Dan Balasescu
87133b9cc5
Merge pull request #19669 from peppy/abort-load-player-more
Handle cancellation at more points during `Player` initialisation
2022-08-10 13:53:27 +09:00
Dan Balasescu
888c4c8e08
Merge pull request #19662 from peppy/startup-correct-username
Use a placeholder user with the correct username during login process
2022-08-10 13:09:37 +09:00
Andrew Hong
8c7ede6111 Add proper toggling 2022-08-09 14:43:37 -04:00
Andrew Hong
7ed489b56d Add hotkey to Toolbar 2022-08-09 14:10:38 -04:00
Andrew Hong
b4fc2a0fc8
Merge branch 'master' into open-profile-hotkey 2022-08-09 13:41:21 -04:00
Dean Herbert
ad410fc88b Update resources 2022-08-10 01:50:23 +09:00
Dean Herbert
e8fef6e05c Update framework 2022-08-10 01:36:39 +09:00
its5Q
abca3d1b2a Prefix common strings for context 2022-08-10 00:35:19 +10:00
Dean Herbert
a5081826b7 Handle cancellation at more points during Player initialisation
As discussed in discord, this will help avoid null references during
cancellation which can otherwise be quite confusing to debug.
2022-08-09 23:25:19 +09:00
Dan Balasescu
4107049b08 Fix host room status showing ended after playing 2022-08-09 21:43:10 +09:00
Dan Balasescu
41af03dec5
Merge pull request #19597 from frenzibyte/hotfix-multi-spectator-results-screen
Fix multi-spectator potentially getting stuck for passed players (hotfix)
2022-08-09 21:11:10 +09:00
Dean Herbert
551e1cf7ff Revert ordering and reword comment 2022-08-09 19:26:24 +09:00
Dean Herbert
940629f2f1 Fix database storing order being changed by previous changes 2022-08-09 18:18:03 +09:00
Dean Herbert
106932b906 Add null check in TestPlayer's disposal code to avoid cascading test failure 2022-08-09 18:15:50 +09:00
Dan Balasescu
efc4a129d9
Merge pull request #19658 from peppy/user-button-better-display
Display connecting / failing states on toolbar user display
2022-08-09 17:59:28 +09:00
Dean Herbert
4a312d5658 Use a placeholder user with the correct username during connecting process
This allows for various components (like gameplay) to obtain a correct
username even if the API is not yet in a connected state. The most
common case is during startup, where a connection may not have been
established yet, but the user's username was restored from their config
file.

By making the change, local scores will now have the correct username
(although avatar etc. will be missing, which I think it fine) even if
the API is not yet connected. Previously, they would show up as "Guest".
2022-08-09 17:13:09 +09:00
Dean Herbert
f9d0cc3c4e Change APIAccess.IsLoggedIn to also return true when connecting
All usages of this are made with the intention of showing data when an
api is going to eventually become available. In the case of a login
failure, components are also able to display a correct state.

With this change, it makes online components display in a more correct
state during startup or initial logging in phase.
2022-08-09 17:11:44 +09:00
Dean Herbert
beb3d41f0c Fix unsafe usage of APIAccess.LocalUser in BeatmapListingOverlay 2022-08-09 17:11:44 +09:00
Andrew Hong
ce67820d87
Merge branch 'master' into open-profile-hotkey 2022-08-09 04:10:27 -04:00
Andrew Hong
aee18135a9 Switch to toggle 2022-08-09 04:09:22 -04:00
Dean Herbert
961f5d4acc Reorganise global bindings section to be easier to find things 2022-08-09 17:08:31 +09:00
Dan Balasescu
d80db2aee7
Merge pull request #19639 from peppy/fix-fps-damping
Fix incorrect FPS damping implementation
2022-08-09 17:03:55 +09:00
Dean Herbert
a71c2bbe28 Split overlay toggles into own section in key bindings
Things were getting hard to find..
2022-08-09 17:01:38 +09:00
Andrew Hong
6903ce1bcc
Merge branch 'master' into open-profile-hotkey 2022-08-09 03:25:41 -04:00
Andrew Hong
a705c4f5d2 Moved ShowProfile to the bottom of the enum 2022-08-09 03:17:55 -04:00
Andrew Hong
04108a749e Rename translation key 2022-08-09 03:03:14 -04:00
Dean Herbert
47ca812faf
Merge pull request #19656 from smoogipoo/fix-gameplay-test-rerun
Fix gameplay tests crashing when run multiple times
2022-08-09 16:01:39 +09:00
Dean Herbert
32852e5b21 Fix potentially thread-unsafe LocalUser usage 2022-08-09 16:01:04 +09:00
Andrew Hong
ededaed5ef Remove unused import 2022-08-09 02:58:28 -04:00
Dean Herbert
5d8bd1de28 Share localised strings with expanded display message 2022-08-09 15:57:16 +09:00
Andrew Hong
3473347f35 Lowercase "p" 2022-08-09 02:56:12 -04:00
Dean Herbert
3f8cedff3a Add tooltips showing current connecting status 2022-08-09 15:51:27 +09:00
Dean Herbert
4da9482a3e Add ability for loading layer to not block input 2022-08-09 15:51:11 +09:00
Dean Herbert
c35b4ef914 Display connecting / failing states on toolbar user display 2022-08-09 15:51:10 +09:00
Andrew Hong
f65b7ef058 Add keybind for showing profile 2022-08-09 02:49:53 -04:00
Dean Herbert
c7313ac371 Allow LoadingLayer's spinning circle to scale smaller than before 2022-08-09 15:34:11 +09:00
Dan Balasescu
00bdd52cff Move to TestPlayer and add null check 2022-08-09 15:05:40 +09:00
Dan Balasescu
e79052c8a0
Merge pull request #19651 from bdach/mod-select/mod-preset-buggy-sounds
Fix spurious sample playbacks from already-removed mod preset panels
2022-08-09 15:00:47 +09:00
Dan Balasescu
6c671434ec Fix gameplay tests crashing when run multiple times 2022-08-09 14:41:36 +09:00
Ryuki
b52a07c16a
Use DI to provide dependencies for KPS Calculator and improve input
gathering

KPS Calculator now uses DI to retrieve the clocks. Using `HUDOverlay` it
is now cached for `KeysPerSecondCounter`s to resolve it. This also
allows to make an "Attach" flow like `KeyCounter`.
2022-08-08 21:54:06 +02:00
BlauFx
0afa3a5ec8
Fix xml doc 2022-08-08 21:20:09 +02:00
Bartłomiej Dach
f74fb3491e
Use alternative implementation of preset panel cleanup 2022-08-08 21:08:54 +02:00
Bartłomiej Dach
e77f47e489
Merge branch 'master' into fix-collection-import-notification 2022-08-08 21:05:48 +02:00
BlauFx
f6e65cf1af
Improve implementation 2022-08-08 20:53:05 +02:00
Bartłomiej Dach
a0a6e1faee
Fix spurious sample playbacks from already-removed panels 2022-08-08 20:30:55 +02:00
Bartłomiej Dach
f21a51aa24
Simplify mirror copy of task logic in ModColumn 2022-08-08 19:20:50 +02:00
Bartłomiej Dach
00333fb0d2
Change ?? false test to == true for legibility 2022-08-08 19:19:13 +02:00
its5Q
9f043e725f Fix CI code quality 2022-08-08 22:06:23 +10:00
its5Q
5080d62e77 Add missing localisation for settings enums 2022-08-08 21:51:23 +10:00
BlauFx
fac2596eee
Change type from BindableBool to IBindable<bool> 2022-08-08 13:38:52 +02:00
BlauFx
cd68134565
Call skip method directly 2022-08-08 13:10:28 +02:00
Dean Herbert
070d156e89 Simplify task logic in ModPresetColumn 2022-08-08 16:13:52 +09:00
Dean Herbert
4f7d63be29 Ignore very long periods of no frame drawing when showing FPS counter ms value 2022-08-08 15:21:49 +09:00
Dean Herbert
81c079c937 Fix incorrect damping implementation
I'm not sure what I was thinking with the weighting stuff. It wasn't
correct. Can most easily be noticed if suspending the app on iOS for a
considerable period, or pausing debugger.
2022-08-08 15:21:49 +09:00
Dean Herbert
6459dbd9e5 Fix collection import not showing progress notification 2022-08-08 14:56:16 +09:00
its5Q
68e7000620 Fix FPS counter disappearing when hovered over 2022-08-08 15:52:47 +10:00
Dean Herbert
237f72efbc Add missing null check on AudioManager 2022-08-08 13:31:57 +09:00
Dean Herbert
a8dee17513 Fix missing DummyRenderer in skin resources tests 2022-08-08 13:06:01 +09:00
Dean Herbert
f1691882e2 Fix incorrect argument passing to ToMod 2022-08-08 12:56:18 +09:00
Dean Herbert
8b990ef3c9 Update framework 2022-08-08 12:31:55 +09:00
Dean Herbert
e1189da824 Merge branch 'master' into irenderer-glwrapper 2022-08-08 12:31:53 +09:00
Dean Herbert
0537c471dc
Merge pull request #19582 from smoogipoo/apimod-json-cleanup
Don't serialise empty mod settings
2022-08-08 11:49:08 +09:00
Bartłomiej Dach
7d6efaebbe
Add maintenance settings section for mod presets 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
839409d7ac
Add preset column to solo mod select overlay 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
b318bbd5e6
Allow non-homogenous column types in mod select overlay 2022-08-07 16:20:31 +02:00
Bartłomiej Dach
0287c49ca8
Implement user selection logic for mod presets 2022-08-07 16:20:20 +02:00
Bartłomiej Dach
b1dcd7821c
Automatically toggle preset panels if selected mods match 2022-08-07 15:30:20 +02:00
BlauFx
bb344e064f
Add xml docs 2022-08-07 13:31:26 +02:00
BlauFx
09230304a4
Improve implementation 2022-08-07 13:20:29 +02:00
Dean Herbert
c31e257a1f Clean up pending deletion presets on startup 2022-08-07 15:16:33 +09:00
Dean Herbert
4a95638756
Merge branch 'master' into mod-overlay/delete-preset 2022-08-07 12:34:25 +09:00
Dean Herbert
5946124278
Merge pull request #19612 from bdach/mod-overlay/common-delete-dialog
Unify implementations of deletion dialogs
2022-08-07 12:18:03 +09:00
Ryuki
b2557a8d2d
Refactor KPS
- Remove '#nullable disable' in KeysPerSecondCalculator and
  KeysPerSecondCounter
- Remove KeysPerSecondCalculator IDisposable implementation
- Make KeysPerSecondCalculator static instance initialized once by
  KeysPerSecondCounters
- Auto transfer dependencies from KeysPerSecondCounter to
  KeysPerSecondCalculator using Resolved properties
- Add internal reset logic to KeysPerSecondCalculator and make it
  independent from Player
- Use GameplayClock.TrueGameplayRate to get real-time rate. If 0 then it
  defaults to the last non 0 rate if no such mod is enabled
2022-08-07 00:53:00 +02:00
Bartłomiej Dach
9b3183b2b4
Implement mod preset deletion flow 2022-08-06 21:58:55 +02:00
Bartłomiej Dach
a0d093be5c
Extract common implementation of delete dialog 2022-08-06 21:04:12 +02:00
BlauFx
bd43a9e96e
Add missing type specification 2022-08-06 18:49:07 +02:00
BlauFx
fa6d55b5b5
Remove redundant lambda signature parentheses 2022-08-06 18:47:11 +02:00
Bartłomiej Dach
ab1b38242f
Reorder enum cases to match web order 2022-08-06 18:34:30 +02:00
Bartłomiej Dach
6a9c30c47a
Fix some more wrong icon colours 2022-08-06 18:34:00 +02:00
Bartłomiej Dach
2ba127b6fc
Fix wrong icon for approval event 2022-08-06 18:30:49 +02:00
Bartłomiej Dach
f1e0dd2da3
Match approval type-dependent icon appearance with web 2022-08-06 18:29:24 +02:00
Bartłomiej Dach
f3ecd73e0b
Add references to web source in recent activity icon 2022-08-06 18:23:15 +02:00
BlauFx
0d418559bc
Skip song intro only in case of a quick restart 2022-08-06 17:02:45 +02:00
BlauFx
e411a2d187
Revert reduced wait time commit 2022-08-06 15:12:36 +02:00
LukynkaCZE
3000d9b9c6 Inline everything in RecentActivityIcon 2022-08-06 07:16:34 +02:00
LukynkaCZE
bd27995c71
Merge branch 'ppy:master' into add-missing-icons-to-recent-profile-section 2022-08-06 05:55:51 +02:00
Salman Ahmed
84ef24c341 Fix multi-spectator potentially getting stuck for passed players 2022-08-06 05:41:26 +03:00
BlauFx
445f921756
Move IsSkippable event into load method 2022-08-05 23:21:03 +02:00
BlauFx
0b886a79f1
Merge branch 'ppy:master' into improve_retry_behaviour 2022-08-05 23:16:35 +02:00
BlauFx
d8d7423698
Reduce "wait time" in case restarting the map 2022-08-05 23:04:43 +02:00
BlauFx
99e07aa09a
Skip intro if the map gets restarted 2022-08-05 23:01:52 +02:00
BlauFx
6717f0606c
Add property to SkipOverlay 2022-08-05 23:00:37 +02:00
Ryuki
0886137e39
Prevent KeysPerSecondCounter from NRE when no instance is initialized 2022-08-05 21:03:00 +02:00
Ryuki
24c29b7e2f
Do not add KPS calculation when gameplay rate is 0 2022-08-05 15:51:07 +02:00
Dan Balasescu
cf362a6b4f
Merge pull request #19529 from peppy/locally-modified-pill
Show "locally modified" pill when local modifications have been made
2022-08-05 21:12:13 +09:00
Dan Balasescu
802dc90cb1 Adjust using directives for vertices 2022-08-05 20:37:33 +09:00
Dan Balasescu
c4b9b2a14b Merge branch 'master' into irenderer-glwrapper 2022-08-05 20:35:06 +09:00
Dean Herbert
4544df5978 Leave client.realm around to handle pull requests without this change merged 2022-08-05 18:27:29 +09:00
Dean Herbert
ad3d00b1dc Don't add version suffixes when running unit tests 2022-08-05 18:23:41 +09:00
Dean Herbert
3c84b1a389 Change order of application to use original client.realm last 2022-08-05 17:48:51 +09:00
Dean Herbert
84a3fbd25c Version realm files for debug executions
To make it easier for developers to test out pull requests which bump
the realm schema version, realm files are now stored with the schema
version in the filename.

Note that this means any changes made to a newer version will not be
applied to previous ones.
2022-08-05 17:36:49 +09:00
Dean Herbert
94ec653420 Add same load-cancel safeties to ensure tracks are disposed in card PlayButton 2022-08-05 14:26:01 +09:00
Dean Herbert
6823282604 Fix PlayButton potentially not disposing an unused PreviewTrack during load 2022-08-05 14:15:27 +09:00
Dean Herbert
786af81274 Fix PreviewTrack not disposing its owned audio Track 2022-08-05 14:15:01 +09:00
Dan Balasescu
0de00e9b3f Don't serialise empty mod settings 2022-08-05 14:00:53 +09:00
Ryuki
42d1bdfc95
Move KPS calculation to a standalone class 2022-08-05 04:17:01 +02:00
Dean Herbert
0d73bfa451
Merge pull request #19575 from smoogipoo/solo-score-info-json-cleanup
Clean up SoloScoreInfo serialised output
2022-08-04 23:19:21 +09:00
Dan Balasescu
2d9da07eb6 Trim zero values from hit statistics 2022-08-04 19:27:50 +09:00
Dan Balasescu
8ff7770a71 Omit irrelevant data from SoloScoreInfo serialisation 2022-08-04 19:11:39 +09:00
Dean Herbert
094eaafd43 Split out common conditional check into local static method 2022-08-04 17:26:54 +09:00
Dan Balasescu
6632367c6d Ensure skin samples are looked up in correct order 2022-08-04 14:48:12 +09:00
Bartłomiej Dach
ca1b4689cb
Automatically focus name textbox upon add preset popover open 2022-08-03 21:26:35 +02:00
Bartłomiej Dach
159d3b032c
Rename locals for legibility 2022-08-03 21:23:31 +02:00
Bartłomiej Dach
82d3fbd51b
Split AddPresetPopover to separate file 2022-08-03 21:22:55 +02:00
Bartłomiej Dach
ac9321204c
Merge branch 'master' into mod-overlay/create-preset 2022-08-03 21:21:52 +02:00
Salman Ahmed
7c45c571a0
Merge branch 'master' into more-beat-sync-dependence 2022-08-03 20:22:42 +03:00
Salman Ahmed
844430502b Replace parantheses with nullable-bool equality operation 2022-08-03 20:11:08 +03:00
Dean Herbert
87cc2db624
Merge branch 'master' into improve-download-limit-message 2022-08-03 20:17:02 +09:00
Dean Herbert
d3954fc583 Use existing localised error message 2022-08-03 20:15:46 +09:00
Dean Herbert
a32149fda1 Convert interface methods to extension methods 2022-08-03 20:07:55 +09:00
Salman Ahmed
4063f92381
Merge branch 'master' into fix-legacy-song-progress-mouse-blocking 2022-08-03 12:12:58 +03:00
Dean Herbert
16ff8d5c38 Use different variable source 2022-08-03 17:47:32 +09:00
Dean Herbert
6ad6561e1c Fix LegacySongProgress incorrectly blocking mouse input from gameplay
Closes #19555.
2022-08-03 17:42:29 +09:00
Dean Herbert
f743dc623f Change migration logic to ignore realm pipe files regardless of database filename 2022-08-03 17:37:30 +09:00
Dan Balasescu
9306dd5e30 Apply changes from removal of GLWrapper 2022-08-03 15:02:22 +09:00
Bartłomiej Dach
add2971eb4
Implement preset creation flow with test coverage 2022-08-02 22:05:54 +02:00
Bartłomiej Dach
7251389e43
Add localisations for add preset button 2022-08-02 22:05:34 +02:00
Bartłomiej Dach
059a465fe8
Add border to popover for better visual contrast 2022-08-02 22:03:33 +02:00
Bartłomiej Dach
1b3074d098
Implement popover for creating mod presets 2022-08-02 22:03:33 +02:00
Bartłomiej Dach
085080576a
Add button for creating new mod presets 2022-08-02 22:03:32 +02:00
Dean Herbert
de186f67e0 Limit metadata updates to once per frame 2022-08-02 22:02:30 +09:00
Dan Balasescu
b4e55f7309 Apply IRenderer changes 2022-08-02 19:50:57 +09:00
Dan Balasescu
dc49862466 Merge branch 'irenderer-shaders' into irenderer-textures 2022-08-02 19:25:24 +09:00
Dan Balasescu
a2a913ab52 Merge branch 'irenderer-batches' into irenderer-textures 2022-08-02 19:25:08 +09:00
Dean Herbert
258ad7c6b9 Tidy up kiai time access 2022-08-02 18:18:40 +09:00
Dean Herbert
cc4cde2c79 Improve IBeatSyncProvider interface and reduce beatmap track dependence 2022-08-02 17:59:18 +09:00
Dean Herbert
efa3c3b757 Fix multiple cases of mutations at editor setup screen not triggering a state save 2022-08-02 16:47:37 +09:00
Dean Herbert
7022c6382d Add localisation support for local modification strings 2022-08-02 16:30:14 +09:00
Dean Herbert
8cb02f47eb Mark BeatmapSet.Status as modified when any beatmap is modified, rather than all 2022-08-02 16:08:58 +09:00
Dean Herbert
df76f9f4da Fix some additional metadata being updated when it shouldn't (with local changes) 2022-08-02 15:49:22 +09:00
Dean Herbert
34ffc51c51 Avoid clearing chat overlay textbox when pressing "back" key binding
Generally this is expected behaviour for usages of focused text boxes
(ie. to clear search content), but not so much here.

Addresses https://github.com/ppy/osu/discussions/19403#discussioncomment-3230395.
2022-08-02 13:56:03 +09:00
Dan Balasescu
fc0914bf77
Merge pull request #19536 from frenzibyte/playlists-settings-leak
Fix playlist settings reference leak due to unsafe binding
2022-08-02 13:30:55 +09:00
Dan Balasescu
4295dc3cb9
Merge pull request #19535 from naipofo/overlay-filter-rank
Hide F rank from the beatmap overlay
2022-08-02 13:06:27 +09:00