1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 00:07:24 +08:00
Commit Graph

38103 Commits

Author SHA1 Message Date
Dean Herbert
bcd41417b3 Update framework 2021-04-13 19:36:29 +09:00
Dean Herbert
2c1f20a38f Merge branch 'master' into fix-editor-alt-scroll 2021-04-13 19:36:25 +09:00
Dean Herbert
0cf13dab8d
Merge pull request #12391 from frenzibyte/replays-tooltip-graph
Display separate "replays watched" tooltip for replays subsection
2021-04-13 19:25:50 +09:00
Dean Herbert
2884ed3ab9
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid
Add the multiplayer spectator player grid
2021-04-13 19:25:32 +09:00
Dan Balasescu
d41e3690fc
Merge pull request #12390 from peppy/fix-import-multiple-file-types
Fix import multiple file types via drag potentially reaching the wrong importer
2021-04-13 18:21:54 +09:00
Dan Balasescu
a0513f64f9
Merge branch 'master' into replays-tooltip-graph 2021-04-13 18:21:10 +09:00
Dan Balasescu
fd32c7d7df
Merge pull request #12393 from peppy/update-timeline-design-a-bit
Update timeline tick display to differentiate tick type using width
2021-04-13 18:14:58 +09:00
Dan Balasescu
130bd0bee1
Merge pull request #12394 from peppy/change-default-waveform-opacity
Change default waveform opacity
2021-04-13 18:14:51 +09:00
Dean Herbert
b41e3a2e7a Remove unused using statement 2021-04-13 17:38:32 +09:00
Dean Herbert
0932daeaa8 Force the new default on update 2021-04-13 16:50:03 +09:00
Dean Herbert
5a06db8a11 Change default editor waveform opacity to 25%
The previous setting felt way too high.
2021-04-13 16:48:06 +09:00
Dean Herbert
27e851c2ee Also adjust height 2021-04-13 16:43:29 +09:00
Dean Herbert
ebf97ff48f Update timeline ticks to use width as a differentiation method, rather than height 2021-04-13 16:29:35 +09:00
Dean Herbert
a9652b7b25 Start TimelineTestScene in a more visible place 2021-04-13 16:05:12 +09:00
Dan Balasescu
20a432c083
Merge pull request #12392 from peppy/avoid-score-online-id-conflicts
Don't store online IDs from score submission responses for now
2021-04-13 15:40:03 +09:00
Dan Balasescu
20e84f14e6
Merge pull request #11328 from frenzibyte/mod-using-reference-equality
Fix mods using reference equality unless cast to `IMod`
2021-04-13 15:36:22 +09:00
Salman Ahmed
9f8af03a70 Remove irrelevant change 2021-04-13 09:28:58 +03:00
Dean Herbert
273099d53c Don't store online IDs from score submission responses for now
Closes remaining portion of https://github.com/ppy/osu/issues/12372.
2021-04-13 14:31:44 +09:00
Dean Herbert
4852630c93 Fix import multiple file types via drag potentially reaching the wrong importer 2021-04-13 14:03:42 +09:00
Salman Ahmed
a664efe12b Fix history graph tooltips leaking to others
Since there was no check about which tooltip content came from which graph, all history graphs use the "Replays Watched" tooltip, as it is the latest created one.
2021-04-13 07:59:14 +03:00
Salman Ahmed
17c2c4e885 Fix test case filename not matching 2021-04-13 05:31:56 +03:00
Salman Ahmed
8f84abf348 Display "replays watched" tooltip for replays subsection 2021-04-12 21:51:06 +03:00
Salman Ahmed
9679bdfed2 Merge branch 'master' into mod-using-reference-equality 2021-04-12 20:56:24 +03:00
Salman Ahmed
589e1a2a47 Add mod settings equality test 2021-04-12 20:51:24 +03:00
Salman Ahmed
92fab653e1 Take current mod settings value into account on equality comparsion 2021-04-12 20:51:13 +03:00
Dean Herbert
84e1ff79a0
Merge pull request #12352 from smoogipoo/multiplayer-spectator-leaderboard
Implement the multiplayer spectator leaderboard
2021-04-13 01:51:14 +09:00
smoogipoo
1e002841cf Add test for scoring mode changes 2021-04-12 22:03:45 +09:00
smoogipoo
c531e38a36 Rework to create a derived tracked user data instead 2021-04-12 22:00:27 +09:00
Dean Herbert
3fd3f36895
Merge pull request #12378 from smoogipoo/fix-score-serialisation
Fix mods not being serialised correctly in ScoreInfo
2021-04-12 21:54:24 +09:00
smoogipoo
27660265b5 Merge branch 'master' into multiplayer-spectator-leaderboard 2021-04-12 21:02:18 +09:00
smoogipoo
e9a114a15c Rename property back 2021-04-12 20:50:18 +09:00
smoogipoo
8413b0a5d3 Don't map api mods to DB 2021-04-12 20:49:44 +09:00
smoogipoo
625484468e Fix DB serialisation 2021-04-12 20:49:37 +09:00
smoogipoo
982d8fa8b1 Fix incorrect reference 2021-04-12 20:49:26 +09:00
Dan Balasescu
32868d0d45
Merge pull request #12217 from frenzibyte/legacy-spm-counter
Add support for legacy spinner SPM counter
2021-04-12 20:19:05 +09:00
smoogipoo
d2d7f77430 Fix mods not being serialised correctly in ScoreInfo 2021-04-12 20:09:01 +09:00
Dean Herbert
905cd7c8eb Update resources 2021-04-12 19:22:07 +09:00
Dean Herbert
f139f61837 Merge branch 'master' into legacy-spm-counter 2021-04-12 19:22:03 +09:00
Dan Balasescu
e8c248f2b2
Merge pull request #12377 from peppy/remove-empty-returns-xmldoc
Remove empty <returns> xmldoc
2021-04-12 18:25:46 +09:00
Dean Herbert
b5954a55ad Remove empty <returns> xmldoc 2021-04-12 17:46:14 +09:00
Dean Herbert
0eab9daf13 Update existing overlay containers to not block scroll input 2021-04-12 16:41:36 +09:00
Dean Herbert
5d942e92f3
Merge pull request #12374 from smoogipoo/fix-multi-test-failures
Fix multiplayer test failure
2021-04-12 14:39:41 +09:00
Dean Herbert
dd1925aaed Remove temporary input ignore 2021-04-12 14:29:27 +09:00
Dean Herbert
9be3163592 Merge branch 'master' into multiplayer-spectator-player-grid 2021-04-12 14:14:13 +09:00
Dean Herbert
995c244cee Remove alt-mousewheel bindings for volume adjustment
With the recent changes to the order of processing key bindings
(`GlobalAction`s are handled first), having the alt-wheel bindings in here causes a
regression as they are handled before `OnScroll` events.

Specifically, this means editor alt-scroll functionality no longer works
with the default bindings.

Removing the bindings fixes this, while also still allowing alt-wheel
adjustment of the volume via `VolumeControlReceptor`:

a2f50af424/osu.Game/Overlays/Volume/VolumeControlReceptor.cs (L21-L26)

In conjunction with the special case in `OsuScrollContainer`:

02d5b1352b/osu.Game/Graphics/Containers/OsuScrollContainer.cs (L103-L105)
2021-04-12 14:00:32 +09:00
smoogipoo
4fcddfb44b Fix multiplayer test failure 2021-04-12 13:42:14 +09:00
Dean Herbert
e2470d757e
Merge branch 'master' into legacy-spm-counter 2021-04-12 12:52:52 +09:00
Salman Ahmed
fbd5195738 Extract mod setting value handling to utils class 2021-04-12 03:37:03 +03:00
Salman Ahmed
18fb9f5ac9
Merge branch 'master' into mod-using-reference-equality 2021-04-11 19:48:55 +03:00
Dean Herbert
4853ac802c
Merge pull request #12367 from Joehuu/lazy-flashlight
Add follow delay setting to osu! flashlight mod
2021-04-11 19:07:06 +09:00