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

23668 Commits

Author SHA1 Message Date
Dean Herbert
a0c6c4da35 Rename and refactor token request process to be easier to understand 2021-03-24 13:17:29 +09:00
Dean Herbert
e372e355ef Reorder overrides in SoloPlayer to better follow chronological request order 2021-03-24 13:12:51 +09:00
Dean Herbert
8bed7748d6 Rename token request method to avoid double Request terminology 2021-03-24 13:02:37 +09:00
Dean Herbert
a1c35677ef Add more xmldoc 2021-03-24 13:02:17 +09:00
Owen Young
c8542d2434
Merge branch 'master' into default-fullscreen 2021-03-23 19:44:22 -05:00
Owen Young
437dadc85f Changed comment on GetFrameworkConfigDefaults() to be more accurate 2021-03-23 19:37:55 -05:00
Owen Young
67a03ebc23 Fixed formatting issues to be in line with osu coding standards 2021-03-23 19:31:16 -05:00
Owen Young
fbb992fc7e Added a comment to new method 2021-03-23 19:18:32 -05:00
Dean Herbert
e649a330a4 Implement SoloPlayer's request construction 2021-03-23 18:23:25 +09:00
Dean Herbert
242b847516 Add flow for allowing gameplay to continue even when an error occurs with token retrieval 2021-03-23 18:23:25 +09:00
Dean Herbert
3cd8bf2d7f Move token request construction to LoadAsyncComplete to better allow DI usage 2021-03-23 18:20:55 +09:00
Dean Herbert
571124669d Remove all references to "score submission" from Player 2021-03-23 18:20:55 +09:00
Dean Herbert
194b2d05d3 Update SoloPlayer to derive SubmittingPlayer 2021-03-23 18:20:55 +09:00
Dean Herbert
12f050264a Further split out a player class which submits to "rooms" 2021-03-23 18:20:55 +09:00
Dean Herbert
7045fce555 Move score submission logic in general out to its own Player type 2021-03-23 18:20:55 +09:00
Dean Herbert
6cb14e91c9 Make Player abstract and introduce SoloPlayer 2021-03-23 18:18:49 +09:00
Dean Herbert
5267fb74c4 Add submission requests 2021-03-23 18:18:49 +09:00
Dean Herbert
aeff9bd853 Add return bool to HandleRequest to better trigger failures 2021-03-23 18:17:29 +09:00
Dean Herbert
ce452565f4 Avoid firing any kind of failures after success 2021-03-23 17:50:31 +09:00
Dean Herbert
f5ba746ae5 Fail all API requests sent to DummyAPIAccess
Until now, API requests sent to dummy API were just lost in the void. In most cases this somehow worked as expected, but any logic which is waiting on a request to finish will potentially never get a response.

Going forward, I'm not 100% sure that every `Wait` on a web response will have local timeout logic (I think there is a certain amount of assumption that this is being managed for us by `APIAccess`), so I've made this change to better handle such cases going forward. Now, rather than nothing happening, requests will trigger a failure via the existing exception logic rather than silently pretending the request never arrived.
2021-03-23 17:37:45 +09:00
Dan Balasescu
17a28f4f65
Merge pull request #12136 from peppy/remove-skin-sample-workarounds
Remove local workarounds to attempt to avoid crashes on skin change
2021-03-23 16:44:29 +09:00
Dan Balasescu
d758343a45
Merge pull request #12149 from peppy/fix-score-token-data-type
Fix APIScoreToken's data type not matching server side
2021-03-23 14:54:02 +09:00
Dean Herbert
1171214541 Update framework 2021-03-23 14:51:22 +09:00
Owen Young
254b0f5dc3 removed line (?) - tried doing testing to see if it launched in fullscreen (i.e., overriding the method ppy mentioned), but to no avail :( 2021-03-23 00:24:33 -05:00
Dean Herbert
9c690f9545 Fix second usage 2021-03-23 14:08:00 +09:00
Dean Herbert
58c60100b4 Fix APIScoreToken's data type not matching server side 2021-03-23 14:04:47 +09:00
Owen Young
d9e2c44a34 implemented GetFrameworkConfigDefaults for overriding framework default, removed previous code that added a new OsuSetting and modified settings layout. 2021-03-22 23:36:55 -05:00
Owen Young
9f788f5854 removed code from OsuGameBase for fullscreen.....OsuSetting still exists but cannot figure out a way to set it to a default and have it actually work 2021-03-22 22:52:16 -05:00
Joehu
16b3f22caf Fix incorrect trash icon being used on deleted comments counter 2021-03-22 19:32:17 -07:00
Owen Young
bdcb9451f7 added code to OsuGameBase to default to fullscreen, but that might not be a good place to put it. 2021-03-22 20:17:05 -05:00
Owen Young
8ea7271d5c moved windowmode code to LoadComplete (?) 2021-03-22 19:48:52 -05:00
Owen Young
fc632fd48a Added WindowSetting setting to OsuSetting enum so that it can be set by default at startup. Modified LayoutSettings.cs so that when it is changed in the settings, it is written to the local settings as well. 2021-03-22 01:30:20 -05:00
Dean Herbert
073dba5330 Remove local workarounds to attempt to avoid crashes on skin change 2021-03-22 14:05:37 +09:00
owen-young
f7bf23dbe9 first attempt at changing windowMode to be fullscreen on default 2021-03-21 21:50:19 -05:00
Joehu
9bc6cdf042 Fix singular format regression on forum post text 2021-03-21 11:19:07 -07:00
Joehu
e31d583a7f Add comments count to user profile overlay 2021-03-21 11:16:59 -07:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
2021-03-21 11:05:15 +01:00
Bartłomiej Dach
86b569f5f7 Fix typo in identifier 2021-03-20 12:37:51 +01:00
Bartłomiej Dach
d28bed6ed2 Schedule adding transforms on tablet changes
Fixes `InvalidThreadForMutationException`s that pop up when
disconnecting/reconnecting tablets during the game's operation. In those
cases the value change callback executes from  an OpenTabletDriver
thread.
2021-03-20 12:37:48 +01:00
Dean Herbert
b9b351311a
Merge pull request #11824 from peppy/fix-unsafe-skinnable-sample-play
Fix playing skinned samples being unsafe during skin changes
2021-03-20 11:29:34 +09:00
Dean Herbert
ca943a897a Fix back to front initialisation order 2021-03-20 10:51:58 +09:00
Bartłomiej Dach
dd48b68f8a Ensure selected blueprints are given selection priority 2021-03-19 22:44:33 +01:00
Dean Herbert
71a361337d
Add comment regarding usage of Reverse()
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-03-19 21:57:48 +09:00
Dan Balasescu
d54e9ab481
Merge pull request #12077 from peppy/tablet-configuration
Add tablet configuration section
2021-03-19 21:49:32 +09:00
Dan Balasescu
5a6ff53837
Merge pull request #12073 from peppy/fix-crash-toggle-overlay-before-loaded
Avoid potential crash if an overlay is toggled before it has been loaded
2021-03-19 21:38:47 +09:00
Dan Balasescu
e72205eea2
Merge pull request #12080 from peppy/add-25-playback-editor
Change editor speed adjust to adjust frequency (and restore 25% option)
2021-03-19 21:04:12 +09:00
Dean Herbert
68aaf90702 Fix disposal rather than performing some weird hack 2021-03-19 20:30:52 +09:00
Dean Herbert
f59327cc3e Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-19 20:29:44 +09:00
Dean Herbert
b2d8db3a92 Rename incorrect variable 2021-03-19 20:25:21 +09:00
Dean Herbert
63cbac3bd0 Ensure aspect ratio slider gets an initial value 2021-03-19 20:15:29 +09:00
Dean Herbert
6f32c302eb Add checkbox to optionally disable tablet handling 2021-03-19 20:13:51 +09:00
Dan Balasescu
4da9089b00
Merge branch 'master' into tablet-configuration 2021-03-19 20:09:25 +09:00
Dean Herbert
095b7f8668 Rewrite code to account for non-loaded edge case 2021-03-19 20:09:12 +09:00
Dean Herbert
4795170c60 Add back the default json converter locally to ensure it's actually used 2021-03-19 20:07:13 +09:00
Dean Herbert
86b229b1c9 Increase maximum usable aspect ratio to account for ultrawide monitors 2021-03-19 20:05:18 +09:00
Dean Herbert
8955071703 Change editor speed adjust to adjust frequency 2021-03-19 20:01:45 +09:00
Dean Herbert
9be7981e0d Adjust timeline ticks to be more visible 2021-03-19 19:45:00 +09:00
Dean Herbert
c0c8b3e46c Fix regression meaning SkinnableSound initialisation may never happen 2021-03-19 19:22:50 +09:00
Dean Herbert
bd1e2da1c2 Always hide other overlays, even if the new one is not loaded 2021-03-19 19:09:39 +09:00
Dan Balasescu
0736679016
Merge pull request #12072 from peppy/include-default-skin-in-random-rotation
Include the bundled skins when selecting a random skin
2021-03-19 19:08:42 +09:00
Dean Herbert
baf4e4e8f6
Merge branch 'master' into tablet-configuration 2021-03-19 19:06:58 +09:00
Dean Herbert
fefb007805 Remove no longer relevant comment 2021-03-19 19:01:32 +09:00
Dean Herbert
1e82033c84 Move bindings to LoadComplete to avoid cross-thread issues 2021-03-19 19:01:32 +09:00
Dean Herbert
b1c4ac9f42 Remove local implementation of Vector2Converter
This has been moved to framework in
https://github.com/ppy/osu-framework/pull/4285.
2021-03-19 19:01:32 +09:00
Dean Herbert
c624aa9397 Only update tablet values on commit 2021-03-19 19:01:32 +09:00
Dean Herbert
6285dcd1a1 Add arbitrary value to fix FP contains check failures 2021-03-19 19:01:32 +09:00
Dean Herbert
e8c20bdcb1 Add centre crosshair 2021-03-19 19:01:32 +09:00
Dean Herbert
fb7d095e4a Show aspect ratio for current usable area 2021-03-19 19:01:32 +09:00
Dean Herbert
196f95ae54 Update to use new bindables and centered area offset 2021-03-19 19:01:32 +09:00
Dean Herbert
9d0c8902a6 Fix margins and spacing between sub flowed items 2021-03-19 19:01:32 +09:00
Dean Herbert
d422a65900 Fix initial tablet size not being initialised 2021-03-19 19:01:32 +09:00
Dean Herbert
9a6a0f3df5 Add test coverage and better UI handling of no tablet connected scenario 2021-03-19 19:01:32 +09:00
Dean Herbert
bba25a0182 Tidy up draw hierarchy and bindable logic 2021-03-19 19:01:31 +09:00
Dean Herbert
932745e5c4 Fix remaining feedback loops 2021-03-19 19:01:31 +09:00
Dean Herbert
e3bed4c97d Simplify aspect ratio application, add window conforming and direct adjustment 2021-03-19 19:01:31 +09:00
Dean Herbert
43359553c1 Add aspect ratio display and limiting 2021-03-19 19:01:31 +09:00
Dean Herbert
9b70f0ee1f Tidy up visual appearance of settings and add a reset button 2021-03-19 19:01:31 +09:00
Dean Herbert
2dc2cb04c3 Fix bounds check becoming false when using full area 2021-03-19 19:01:31 +09:00
Dean Herbert
382109c7a2 Make test scene feel more like settings (width-wise) 2021-03-19 19:01:31 +09:00
Dean Herbert
464702182d Consume device name 2021-03-19 19:01:31 +09:00
Dean Herbert
94f184d113 Add feedback when area extends beyond tablet size 2021-03-19 19:01:31 +09:00
Dean Herbert
0a6525baee Fix slider bars reloading each time the tablet size is changed 2021-03-19 19:01:31 +09:00
Dean Herbert
926e40925e Add exclude rule to fix dynamic compilations issues with settings sections 2021-03-19 19:01:31 +09:00
Dean Herbert
3b7edf1333 Make tablet display always fit to size of settings area 2021-03-19 19:01:31 +09:00
Dean Herbert
d026c8da85 Initial pass of configuration interface 2021-03-19 19:01:31 +09:00
Dean Herbert
563a0584d5 Implement editor timeline stacking support 2021-03-19 18:48:51 +09:00
Dean Herbert
32c571fc94 Adjust keyboard step to be something sensible 2021-03-19 17:13:30 +09:00
Dean Herbert
0195d654ca Increase the precision of speed multiplier to match osu-stable 2021-03-19 17:09:49 +09:00
Dean Herbert
a9c4fa442a Avoid potential crash if an overlay is toggled before it has been loaded 2021-03-19 16:49:09 +09:00
Dean Herbert
711d895a04
Merge pull request #8238 from voidedWarranties/editor-song-end 2021-03-19 16:32:23 +09:00
Dean Herbert
9491e6394a Include the bundled skins when selecting a random skin 2021-03-19 15:46:43 +09:00
Dean Herbert
bf4317d3f0 Ensure looping is disabled on old samples when switching skins 2021-03-19 15:34:21 +09:00
Dean Herbert
0e821e857e Remove unnecessary duplicated skin changed handling
For some reason we were handling this both in `DrawableSkinnableSound`
and `PoolableSkinnableSample` in very similar ways. Only one seems
required.
2021-03-19 15:23:32 +09:00
voidedWarranties
b9761c8196 Further simplify logic 2021-03-18 16:20:31 -07:00
Bartłomiej Dach
b419d2c2e2 Fix invalid xmldoc indent 2021-03-18 19:52:38 +01:00
Bartłomiej Dach
aec859b4d1 Merge branch 'master' into fix-unsafe-skinnable-sample-play 2021-03-18 19:51:46 +01:00
Dan Balasescu
d9ec3c327e
Merge branch 'master' into input-handler-configuration 2021-03-18 22:17:48 +09:00
Dean Herbert
a8cc3a3b44 Implement enable state changes locally for InputHandlers which should be toggleable 2021-03-18 21:17:04 +09:00
Dean Herbert
c694deb7d6 Revert changes to SettingsSourceAttribute class 2021-03-18 21:16:50 +09:00
smoogipoo
917717686a Expand explanatory comment 2021-03-18 19:26:29 +09:00