1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 06:02:56 +08:00
Commit Graph

25311 Commits

Author SHA1 Message Date
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
smoogipoo
28510674ac Shorten body text 2020-01-06 17:48:29 +09:00
smoogipoo
61c269b17b Leaderboard should not change the model 2020-01-06 17:32:24 +09: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
smoogipoo
4a7f5f98df Cleanup methods/events 2020-01-06 17:20:09 +09:00
smoogipoo
ee15967c4a Rewrite test scene to be automated 2020-01-06 17:15:59 +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
Lucas A
474b8fc8fd Add LoginPlaceholder 2020-01-04 19:56:42 +01:00
Lucas A
3bd3ebad49 Move placeholders to a dedicated namespace 2020-01-04 19:56:34 +01:00
Andrei Zavatski
9fb29cc7a7 Move medal loading to LoadComplete 2020-01-04 18:45:34 +03:00
Andrei Zavatski
0a9d14826c Merge remote-tracking branch 'refs/remotes/ppy/master' into medals-fix 2020-01-04 18:28:17 +03:00
Sebastian Krajewski
3194658998 Fix repeat point pulsing when it is in fade out state 2020-01-04 13:12:37 +01:00
Dan Balasescu
62a780a065
Merge pull request #7433 from peppy/fix-new-user-reg
Fix new account registration attempting to login with email
2020-01-04 21:10:23 +09:00
Sebastian Krajewski
46271ccbc8 Add slider reverse arrow pulse settings 2020-01-04 13:01:42 +01:00
mcendu
a897f497a2
remove LaneGlowPiece and GlowPiece 2020-01-04 18:35:37 +08:00
Sebastian Krajewski
fc0b622a69 Change reverse arrow pulse easing to OutQuad 2020-01-04 10:35:10 +01:00
Sebastian Krajewski
9da7eec0d9 Add pulse to slider reverse arrows 2020-01-04 08:21:48 +01:00
Dean Herbert
a756d5d95d Fix new account registration attempting to login with email 2020-01-04 14:52:07 +09:00
Craftplacer
cd91cc860d Resolve "Redundant lambda signature parentheses" 2020-01-04 01:06:38 +01:00
Craftplacer
7cc388b5ab Mark channel up to last message as read when switching channels 2020-01-04 00:50:12 +01:00
Craftplacer
4f36bc0fd3 Add error log message for debugging 2020-01-04 00:49:35 +01:00
Craftplacer
8dbddfab55 Add HTTP method 2020-01-04 00:45:51 +01:00
Craftplacer
9b95ce1045 Change wrong values used to form target URL
Dumb mistake by me, C# used ToString() on these objects.
2020-01-04 00:45:02 +01:00
Willy Tu
5846accb6a Merge branch '#7146' of github.com:wltu/osu into #7146 2020-01-03 11:35:13 -08:00
Willy Tu
e23c71be80 Update Resolved and Cached attribute issues 2020-01-03 11:34:26 -08:00
Willy Tu
0a4e180ce7 Merge branch 'master' of github.com:ppy/osu into #7146 2020-01-03 11:32:06 -08:00
Dan Balasescu
c73512a51c
Merge pull request #7430 from aspriddell/rpc
Add playing verb to Ruleset and use it for Discord RPC
2020-01-04 00:38:57 +09:00
Albie Spriddell
ac04c5cc05 Merge branch 'rpc' of https://github.com/aspriddell/osu into rpc 2020-01-03 15:22:46 +00:00
Albie Spriddell
d4888c39de cleanup 2020-01-03 15:22:33 +00:00
Albie
960bbae87f
Update osu.Game/Users/UserActivity.cs
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-01-03 15:07:47 +00:00