1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:02:55 +08:00
Commit Graph

47457 Commits

Author SHA1 Message Date
Bartłomiej Dach
c6d0b5d200
Merge branch 'master' into beatmap-card/extra-wip 2021-12-17 11:11:36 +01:00
Bartłomiej Dach
869e30995b
Merge pull request #16111 from smoogipoo/test-hyper-generation
Test hyperdash generation in catch conversion tests
2021-12-17 10:35:55 +01:00
Bartłomiej Dach
84c585ec29
Merge branch 'master' into test-hyper-generation 2021-12-17 10:00:06 +01:00
Bartłomiej Dach
dff08b24d2
Merge pull request #16127 from peppy/update-framework
Update framework
2021-12-17 09:15:25 +01:00
Dean Herbert
1067e2dc00
Merge branch 'master' into update-framework 2021-12-17 16:41:47 +09:00
Dean Herbert
6bfe973fe5 Update framework 2021-12-17 13:44:52 +09:00
Bartłomiej Dach
187cd80ba9
Merge pull request #16077 from peppy/fix-realm-post-storage-migration-failure
Fix crash on accessing settings after moving game folder
2021-12-17 00:50:41 +01:00
Bartłomiej Dach
54790bb758
Merge branch 'master' into fix-realm-post-storage-migration-failure 2021-12-17 00:19:46 +01:00
Salman Ahmed
48a75dfdfd
Merge pull request #16108 from idodin/master 2021-12-16 17:28:40 +03:00
Salman Ahmed
9a22a082ca
Merge branch 'master' into master 2021-12-16 16:58:24 +03:00
Salman Ahmed
f879250cd6
Merge pull request #16030 from peppy/fix-autopilot-touch-devices 2021-12-16 16:50:51 +03:00
Salman Ahmed
6dfde11f44
Merge branch 'master' into fix-autopilot-touch-devices 2021-12-16 16:16:38 +03:00
Dan Balasescu
44485b4a86
Merge pull request #16116 from peppy/dont-animate-menu-cursor-when-not-active
Avoid applying mouse down effects to menu cursor when it isn't visible
2021-12-16 21:05:28 +09:00
Dean Herbert
eecb1ce9f5 Avoid applying mouse down effects to menu cursor when it isn't visible
Closes #16114.
2021-12-16 20:20:06 +09:00
Dean Herbert
abb617a3df Avoid blocking Active state propagation 2021-12-16 19:57:24 +09:00
Dean Herbert
c08b6cf160 Remove unnecessary StartAsync call on TcpIpcProvider 2021-12-16 19:53:22 +09:00
Dan Balasescu
8a81392d2b Fix use of incorrect variable, add test 2021-12-16 19:26:36 +09:00
Dan Balasescu
5ea081e899 Test hyperdash generation in catch conversion tests 2021-12-16 19:04:42 +09:00
Dean Herbert
434aa0367f Add back .ToLocalTime() call to DrawableDate
This is required because the class is used in many other places that
don't locally call it.
2021-12-16 18:25:29 +09:00
Dean Herbert
0eac655cff Remove local screen change logging 2021-12-16 18:21:48 +09:00
Dean Herbert
aa0813ff05
Merge pull request #16109 from smoogipoo/chat-overlay-multiplayer-removal
Don't show multiplayer channels in chat overlay
2021-12-16 17:39:45 +09:00
Dan Balasescu
3f1d747b7a
Merge pull request #16090 from peppy/fix-scroll-speed-toast-sample-spam
Fix toast popups spamming samples when adjusting osu!mania scroll speed during gameplay
2021-12-16 17:31:36 +09:00
Dan Balasescu
488374b4a2 Don't show multiplayer channels in chat overlay 2021-12-16 16:41:47 +09:00
Dean Herbert
a9dbcd92a1 Split out unmanaged implementation of RealmLive into its own class 2021-12-16 15:23:55 +09:00
Dan Balasescu
c36b753d62
Merge pull request #16106 from peppy/less-lazer
Update a few more public facing usages of "lazer"
2021-12-16 15:18:41 +09:00
Imad Dodin
b3e83a47a4 Convert to Local Time in Date Tooltip 2021-12-15 21:36:35 -08:00
Dean Herbert
e6e1366c28
Merge pull request #16094 from peppy/beatmap-card-expanded-state-fix
Fix beatmap card potentially collapsing when it shouldn't
2021-12-16 14:13:47 +09:00
Dean Herbert
c50206e25e Update a few more public facing usages of "lazer" 2021-12-16 14:11:38 +09:00
Dean Herbert
0ec1e1e2d5
Merge pull request #16091 from MyDogsEd/fix-issue-#15869
Fix the taiko scroller bar appearing during cinema mod
2021-12-16 12:05:00 +09:00
Bartłomiej Dach
cbb65e1e07
Merge branch 'master' into beatmap-card-expanded-state-fix 2021-12-15 22:20:30 +01:00
Dean Herbert
cd8dfac625
Merge pull request #16097 from smoogipoo/forego-resetting-spectate-state
Don't reset spectating state if spectator exited after gameplay finishes
2021-12-15 22:30:41 +09:00
Dean Herbert
33cf4ba7f6
Merge pull request #16075 from smoogipoo/prevent-idle-transition-during-load
Add AbortGameplay() to fix state transition race conditions during multiplayer load
2021-12-15 19:59:19 +09:00
Dan Balasescu
4c53ec12e9
Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:47:47 +09:00
Dean Herbert
2025183f5a
Merge pull request #15990 from Susko3/number-textbox-only-numbers
Fix `SettingsNumberBox` accepting non-number characters
2021-12-15 18:39:54 +09:00
Dean Herbert
9e82a3e79a Merge branch 'master' into forego-resetting-spectate-state 2021-12-15 18:05:06 +09:00
Dean Herbert
39e642371d
Merge pull request #16095 from smoogipoo/fix-playlist-exception
Fix exception when updating the room's visual playlist
2021-12-15 18:02:19 +09:00
Dan Balasescu
18d7b79207 Don't reset spectating state if gameplay is finished 2021-12-15 17:40:30 +09:00
Dean Herbert
39a0a21132 Add test coverage of same scenario without deletion 2021-12-15 17:30:09 +09:00
Susko3
643cee4f83 Merge branch 'master' into number-textbox-only-numbers 2021-12-15 09:13:19 +01:00
Dan Balasescu
d22e1b9001 Add another until step to guard against async test issues 2021-12-15 17:00:06 +09:00
Dean Herbert
694ee68725 Update resources 2021-12-15 16:59:33 +09:00
Dan Balasescu
740a6f16c7 Fix exception when updating the room's visual playlist 2021-12-15 16:53:25 +09:00
Dean Herbert
42f14667a3 Update framework 2021-12-15 16:50:55 +09:00
Dean Herbert
ad430a6277 Centralise hover state handling (and fix back-to-front conditionals) 2021-12-15 16:44:58 +09:00
Dean Herbert
6a1f535257 Refactor cancellation of expand to be more explicit 2021-12-15 16:38:19 +09:00
Dean Herbert
94d1a2aaca Remove unnecessary collapse call from BeatmapCard
This is already handled at the `BeatmapCardContent` level. This call
actually causes the buggy behaviour reported in
https://github.com/ppy/osu/discussions/16085.
2021-12-15 16:37:47 +09:00
Dean Herbert
7a9db22c52 Tidy up method naming and structure for expanded state changes 2021-12-15 16:29:12 +09:00
Dean Herbert
ef4ab74565 Also only expose Expanded state of BeatmapCard as read-only 2021-12-15 16:26:19 +09:00
Dean Herbert
41e6c24dad Expose Expanded state of BeatmapCardContent as read-only bindable
This is just to reduce complexity of these interactions by ensuring that
the expanded state can only be changed by the class itself.
2021-12-15 16:26:19 +09:00
Dean Herbert
e9187cc3cf Add failing test showing expanded state being unexpectedly lost 2021-12-15 16:26:19 +09:00