1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 23:27:34 +08:00
Commit Graph

25066 Commits

Author SHA1 Message Date
Dean Herbert
dca4b350fd Merge remote-tracking branch 'upstream/master' into allow-loading-layer-scrolling 2020-01-09 17:29:02 +08:00
Dean Herbert
ffa0cf2d44 Add comment detailing why this is requried 2020-01-09 17:28:48 +08:00
Dean Herbert
7c3b04c0a7
Show replay mods instead of current selection during replay load (#7485)
Show replay mods instead of current selection during replay load
2020-01-09 14:13:10 +08:00
Bartłomiej Dach
f0fe3bc804 Pass bindable to BeatmapMetadataDisplay
It was reported that mods selected in song select would show up during
loading of replays which were recorded under a different set of mods.
This was caused by BeatmapMetadataDisplay accepting a plain read-only
value of the Mods bindable in PlayerLoader.load(), therefore making the
mod value assignment in ReplayPlayerLoader.OnEntering() have no effect
on that component.

To resolve this issue, make BeatmapMetadataDisplay accept the
higher-level bindable, bind to it locally and pass it down the hierarchy
to ModDisplay.
2020-01-08 20:10:43 +01:00
Bartłomiej Dach
a3f7d3c445 Add failing test
Add test case demonstrating the lack of update of the metadata display's
mods upon setting the Mods property in PlayerLoader.
2020-01-08 19:55:35 +01:00
Dean Herbert
a74fc70627
Merge branch 'master' into allow-loading-layer-scrolling 2020-01-08 21:19:37 +08:00
Dean Herbert
d33a507d96
Implement a login placeholder (#7438)
Implement a login placeholder
2020-01-08 16:55:41 +08:00
Dean Herbert
6dd45e52ef Move text definition inside class 2020-01-08 17:22:51 +09:00
Dan Balasescu
2e5af9adda
Merge pull request #7464 from GSculerlor/difficulty-tooltip-unused-var
Remove unused variable on DifficultyIcon
2020-01-08 14:57:14 +09:00
Dean Herbert
b12d7b9ce5
Downgrade NUnit adapter to fix discovery issues (#7472)
Downgrade NUnit adapter to fix discovery issues
2020-01-08 13:51:31 +08:00
Dan Balasescu
48502eba7f
Merge branch 'master' into difficulty-tooltip-unused-var 2020-01-08 14:40:40 +09:00
smoogipoo
2688a855a0 Downgrade NUnit to fix discovery issues 2020-01-08 14:14:46 +09:00
Dan Balasescu
7156e1e817
Merge pull request #6464 from GSculerlor/prev-button-revamp
Make previous track button restart current track on first click
2020-01-08 13:27:11 +09:00
Bartłomiej Dach
e0cfc2f405
Merge branch 'master' into prev-button-revamp 2020-01-07 21:49:53 +01:00
Lucas A
7f92cefe10 Apply review suggestions 2020-01-07 19:06:47 +01:00
Ganendra Afrasya
0fb27ef153 Merge remote-tracking branch 'upstream/master' into difficulty-tooltip-unused-var 2020-01-07 17:59:10 +07:00
Dean Herbert
c3024e68f5
Set UserAgent for API requests (#7384)
Set UserAgent for API requests

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-07 17:31:25 +09:00
Dean Herbert
e33de0c2e4 Fix ScrollContainer crashes 2020-01-07 15:14:09 +08:00
Dean Herbert
be19bb8a27 Merge remote-tracking branch 'upstream/master' into set_user_agent_on_web_request_level 2020-01-07 15:01:09 +08:00
Dean Herbert
09550283d0
Adjust catch + mania hp increase values (#7462)
Adjust catch + mania hp increase values
2020-01-07 15:57:51 +09:00
smoogipoo
dfa6575f75 Adjust mania HP increase values 2020-01-07 15:24:33 +09:00
smoogipoo
97b5d71ee4 Adjust catch HP increase values 2020-01-07 15:09:30 +09:00
Dean Herbert
8dceaa6e8b
Fix crashing TestSceneMedalOverlay (#7388)
Fix crashing TestSceneMedalOverlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-07 14:07:36 +09:00
Dean Herbert
fadd53106c Merge remote-tracking branch 'upstream/master' into medals-fix 2020-01-07 13:39:42 +09:00
Dean Herbert
fd925526e2 Fix medal overlay display 2020-01-07 13:39:30 +09:00
Dean Herbert
6a3b8145b0
Fix download manager potentially not handling cancel requests p… (#7351)
Fix download manager potentially not handling cancel requests properly

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-07 12:11:33 +09:00
Dean Herbert
3ca4d1a28c Split out tests 2020-01-07 11:47:00 +09:00
Dean Herbert
b3a7b02e3b Merge remote-tracking branch 'upstream/master' into fix-cancelling-request-not-correct 2020-01-07 11:43:01 +09:00
Dean Herbert
63d0b09f96
Update visible triangles colour when dark or light colour is ch… (#7449)
Update visible triangles colour when dark or light colour is changed

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-07 10:48:45 +09:00
Dean Herbert
cb43020118 Merge remote-tracking branch 'upstream/master' into triangles-color 2020-01-07 10:00:10 +09:00
Sebastian Krajewski
0b9cc8ed1b Revert "Move colour generation to TriangleParticle"
This reverts commit de4c62788c.
2020-01-07 09:58:37 +09:00
Andrei Zavatski
7716a96b28 Allow scrolling through DimmedLoadingLayer 2020-01-06 23:07:58 +03:00
Dean Herbert
a614e33405
Merge pull request #7457 from EVAST9919/async-comments
Fix CommentsContainer async loading wasn't really async
2020-01-07 03:22:45 +09:00
Andrei Zavatski
031bed15da Fix comments async loading wasn't really async 2020-01-06 20:56:32 +03:00
Sebastian Krajewski
de4c62788c Move colour generation to TriangleParticle 2020-01-06 12:51:38 +01:00
Ganendra Afrasya
e433e8b78f Remove unused variable 2020-01-06 17:12:10 +07:00
Dan Balasescu
7fa3b95286
Merge pull request #7454 from ppy/dependabot/nuget/NUnit3TestAdapter-3.16.0
Bump NUnit3TestAdapter from 3.15.1 to 3.16.0
2020-01-06 17:27:04 +09:00
Dan Balasescu
cb93e30646
Merge pull request #7451 from bdach/mark-storyboard-test-headless
Mark storyboard sample retrieval test headless
2020-01-06 17:09:30 +09:00
dependabot-preview[bot]
f91637e7b6
Bump NUnit3TestAdapter from 3.15.1 to 3.16.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.15.1 to 3.16.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.15.1...V3.16)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-06 07:41:37 +00:00
Dan Balasescu
641a633f42
Merge branch 'master' into mark-storyboard-test-headless 2020-01-06 16:23:21 +09:00
Dan Balasescu
b76e61a122
Merge pull request #7435 from mcendu/glow-piece
Remove unused LaneGlowPiece and GlowPiece
2020-01-06 16:10:14 +09:00
Dan Balasescu
bb7de0114f
Merge branch 'master' into glow-piece 2020-01-06 15:52:09 +09:00
Bartłomiej Dach
49c252ec78 Mark storyboard sample retrieval test headless 2020-01-06 07:33:59 +01:00
Dean Herbert
eab2a5acae
Merge pull request #7450 from Joehuu/fix-direct-global-action
Fix osu!direct global action not being bound to a key
2020-01-06 12:51:18 +09:00
Joehu
d188d33f18 Fix osu!direct global action not being bound to a key 2020-01-05 18:59:06 -08:00
Sebastian Krajewski
d1f3cb3dbd Premature checks to avoid unnecessary updates 2020-01-06 01:53:29 +01:00
Sebastian Krajewski
f70f25098b Change visible triangles colour when dark or light colour is changed 2020-01-06 00:32:13 +01:00
Lucas A
21e6351c53 Allow DI for LoginOverlay to resolve to null in non-graphical environments (fix tests) 2020-01-05 14:33:44 +01:00
Lucas A
3d747835dc Fix CI issues 2020-01-04 21:09:40 +01:00
Lucas A
5fd5665467 Use implementation on song select leaderboards. 2020-01-04 19:59:25 +01:00