1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00
Commit Graph

25873 Commits

Author SHA1 Message Date
Dean Herbert
a74fc70627
Merge branch 'master' into allow-loading-layer-scrolling 2020-01-08 21:19:37 +08:00
Huo Yaoyuan
1b9f8d2737 Add benchmark runner. 2020-01-08 20:36:00 +08:00
Huo Yaoyuan
c2fc7d5cbd Add empty benchmark project. 2020-01-08 20:18:20 +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
Andrei Zavatski
351aaf41d9 Fix parameter naming 2020-01-08 00:54:02 +03:00
Andrei Zavatski
eb828154ee Allow any type to be used to create TabControl 2020-01-08 00:41:52 +03:00
Andrei Zavatski
6d8f457161 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-08 00:21:36 +03: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
Andrei Zavatski
7dc03a1335 resetComments -> refetchComments 2020-01-07 12:30:06 +03:00
Andrei Zavatski
6adf5ba381 Use nullable long type for id value 2020-01-07 12:29:21 +03:00
Andrei Zavatski
fa0d9f8e9d Merge remote-tracking branch 'refs/remotes/ppy/master' into view-comments-via-propery 2020-01-07 12:20:56 +03: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
smoogipoo
4a68c79137 Make tests safer against async loads / transforms 2020-01-07 13:21:25 +09:00
Sebastian Krajewski
21468eb070 Remove settings related to reverse arrow 2020-01-07 04:55:05 +01: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
e0f66928e6 Allow CommentsContainer refetch comments using a method 2020-01-07 01:07:50 +03: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