h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 09:22:58 +08:00
Code Issues Releases Wiki Activity
25,032 Commits 3 Branches 661 Tags 369 MiB
351aaf41d9
Commit Graph

25032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
mcendu
a897f497a2
remove LaneGlowPiece and GlowPiece 2020-01-04 18:35:37 +08:00
Dean Herbert
a756d5d95d Fix new account registration attempting to login with email 2020-01-04 14:52:07 +09:00
Andrei Zavatski
53c8592cb9 Add test scene 2020-01-03 23:54:56 +03:00
Andrei Zavatski
264523bc8b Split ControllableOverlayHeader from base class 2020-01-03 23:22:19 +03: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
Albie Spriddell
23ed64c5fd Merge branch 'rpc' of https://github.com/aspriddell/osu into rpc 2020-01-03 13:08:06 +00:00
Albie Spriddell
71a3db7cd6 remove from rulesetinfo 2020-01-03 13:08:01 +00:00
Albie
b500ee44fb
Update osu.Game/Rulesets/Ruleset.cs 
Co-Authored-By: Salman Ahmed <email@iisalman.me>
 2020-01-03 13:00:57 +00:00
Albie Spriddell
5940851519 remove database dependency 2020-01-03 12:17:01 +00:00
Albie Spriddell
3a903339d6 add playingverb and database migrations 2020-01-03 11:39:15 +00:00
Dan Balasescu
7ce12d0aed
Merge pull request #7383 from huoyaoyuan/resource-assembly 
Construct DllResourceStore with assemblies
 2020-01-03 18:12:46 +09:00
Dan Balasescu
77fb632d44
Remove now unnecessary using 2020-01-03 17:57:01 +09:00