1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:17:31 +08:00
Commit Graph

50855 Commits

Author SHA1 Message Date
Bartłomiej Dach
dcda43eb48
Merge branch 'master' into signalr-proxy 2022-04-21 23:36:09 +02:00
Bartłomiej Dach
8fe4443029
Update screen method signatures to match framework API changes 2022-04-21 22:29:23 +02:00
Bartłomiej Dach
8c6864727e
Merge branch 'master' into first-run-setup 2022-04-21 22:14:57 +02:00
63411
574007c07a Optimise holdAddition calculation 2022-04-22 02:02:23 +08:00
Dean Herbert
000c152715
Merge pull request #17860 from frenzibyte/sample-positional-playback-screen-space
Calculate sample playback position using screen-space drawable rectangles
2022-04-22 02:48:00 +09:00
Salman Ahmed
f4992d7792
Merge branch 'master' into sample-positional-playback-screen-space 2022-04-21 20:10:35 +03:00
Salman Ahmed
295558b24d
Merge branch 'master' into settings-filter-fixes 2022-04-21 20:06:14 +03:00
Salman Ahmed
4dd1ed13e4
Merge pull request #17914 from peppy/update-framework 2022-04-21 20:04:58 +03:00
Salman Ahmed
6ad10672ee
Merge branch 'master' into update-framework 2022-04-21 19:30:57 +03:00
Dean Herbert
05bca4c4f9
Merge pull request #17907 from peppy/fix-skinnable-sound-interactive-testing
Fix `TestSceneSkinnableSound` not working under visual tests
2022-04-22 01:15:49 +09:00
Dean Herbert
749b86f0f4 Use new framework exposed event instead of schedule 2022-04-22 00:55:17 +09:00
Dean Herbert
119a81849c Merge branch 'update-framework' into settings-filter-fixes 2022-04-22 00:55:15 +09:00
Dean Herbert
832d37b2c2 Update screen transition events to use new event args 2022-04-22 00:52:44 +09:00
Dean Herbert
4d3044b841 Update framework 2022-04-22 00:49:15 +09:00
63411
e7a149af6c Use curve for holdAddition validity cutoff 2022-04-21 23:05:20 +08:00
63411
a0a83fb51f Use closest endTime for holdAddition validity 2022-04-21 23:03:28 +08:00
Dean Herbert
ed6481f708 Also rename Welcome to WelcomeTitle to match other usages 2022-04-21 19:55:51 +09:00
Dean Herbert
1f967ecba3 Update string keys and change "setup" to "set up" to fix grammar 2022-04-21 19:52:28 +09:00
Dean Herbert
d17c16d904 Merge branch 'master' into first-run-setup 2022-04-21 19:50:26 +09:00
Dean Herbert
5ae3d0eb27
Fix wording of ui scale screen description
Co-authored-by: Walavouchey <36758269+Walavouchey@users.noreply.github.com>
2022-04-21 19:36:19 +09:00
Dean Herbert
882c310e2a
Merge pull request #17904 from EVAST9919/smooth-anchor-vis
Visually improve AnchorOriginVisualiser
2022-04-21 17:00:12 +09:00
Dean Herbert
d43c66a3dd Merge branch 'master' into sample-positional-playback-screen-space 2022-04-21 16:57:20 +09:00
Dean Herbert
f5d24add58 Fix TestSceneSkinnableSound not working under visual tests
oops
2022-04-21 16:49:21 +09:00
Dean Herbert
55270df6fc
Merge pull request #17833 from jai-x/new-chat-channel-list
Implement `ChannelList` for new chat design
2022-04-21 16:34:35 +09:00
Dean Herbert
0b81ae9de2 Convert to using sheared overlay container
Add better click-to-dismiss logic for sheader overlays
2022-04-21 16:28:44 +09:00
Dean Herbert
5c21a55e00 Merge branch 'sheared-overlay-container-click-away' into first-run-setup-sheared-overlay 2022-04-21 16:28:33 +09:00
Dean Herbert
0f4b40ab15 Add better click-to-dismiss logic for sheared overlays 2022-04-21 16:27:27 +09:00
Dean Herbert
2769d8e8cf Add test coverage of ShearedOverlayContainer 2022-04-21 16:27:27 +09:00
Dean Herbert
bb03dab83d
Merge pull request #17903 from smoogipoo/move-cq-check
Move Code Quality check to top of list + fix inspection
2022-04-21 16:27:24 +09:00
Andrei Zavatski
414408140e Improve AnchorOriginVisualiser 2022-04-21 10:16:52 +03:00
Dean Herbert
7d8cf1bbb6 Merge branch 'master' into first-run-setup 2022-04-21 15:49:39 +09:00
Dan Balasescu
54ca4b9d36 Remove unused using 2022-04-21 15:34:14 +09:00
Dan Balasescu
b4c208be63 Move Code Quality check to top of checks list 2022-04-21 15:34:01 +09:00
Dean Herbert
e54d3702a6 Specify web proxy in SignalR connection building
Might solve https://github.com/ppy/osu/discussions/17897 (depends on how
adeptly signalr falls back to long polling if/when is fails to websocket
via the proxy, or maybe succeed).

As with the framework side change, I've tested this to not break a
zero-proxy flow. Intending to have the user test this after next
release.

Reference:
https://stackoverflow.com/questions/59343807/get-system-default-web-proxy-in-net-core
/
https://stackoverflow.com/questions/13515058/using-signalr-client-through-a-web-proxy
2022-04-21 15:16:41 +09:00
Dean Herbert
5c0e5eb6f4
Merge pull request #17899 from Joehuu/localise-most-strings
Use existing web localisation for most hardcoded strings
2022-04-21 14:48:12 +09:00
Dean Herbert
848366416e Revert string type changes in MetadataLineInfo 2022-04-21 14:10:58 +09:00
Dean Herbert
9f525ee267 Revert localisation of spectate/watch button 2022-04-21 14:09:51 +09:00
Dean Herbert
a9163727db Mark selected channel null in test when selector is activated 2022-04-21 13:44:14 +09:00
Dean Herbert
fa590c1df1
Merge pull request #17853 from bdach/mod-overlay/extension-points
Add extension points to new mod select screen required to replace old design
2022-04-21 13:07:18 +09:00
Dean Herbert
56d8de23e2
Replace horse with "more suitable" icon
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-04-21 12:18:54 +09:00
Joseph Madamba
0146949ad6 Fix failing string comparison tests 2022-04-20 16:52:24 -07:00
Joseph Madamba
5e5c8e78a6 Use existing web localisation for most hardcoded strings 2022-04-20 16:31:11 -07:00
Jai Sharma
5319bce772 Revert DI usage of ChannelSelectorState in favour of directly binding BindableBool SelectorActive 2022-04-20 21:05:33 +01:00
Jai Sharma
e596c9d171 Use Bindable<ChannelSelectorState> to control selector active visibility 2022-04-20 19:12:43 +01:00
Dean Herbert
4466e15bfc Rename AllowConfiguration to AllowCustomisation and simplify drawable addition 2022-04-20 23:17:29 +09:00
Dean Herbert
b722ff8dc5 Merge branch 'master' into mod-overlay/extension-points 2022-04-20 23:17:04 +09:00
Dean Herbert
fb5fcdd083
Merge pull request #17878 from frenzibyte/legacy-hitcircle-sprite-priority
Improve legacy hitcircle texture lookup to match 1:1 with stable
2022-04-20 23:00:23 +09:00
Dan Balasescu
0ad3fcb39d
Merge pull request #17894 from peppy/sheared-overlay-container
Split out the base design of sheared overlay into its own abstract class
2022-04-20 18:54:33 +09:00
Dean Herbert
2906af323a Fix incorrectly written string equality logic 2022-04-20 17:51:08 +09:00
Dean Herbert
8c2d70e93f Disable forward button when already at end 2022-04-20 17:50:31 +09:00