1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 09:52:55 +08:00
Commit Graph

26093 Commits

Author SHA1 Message Date
Willy Tu
0a4e180ce7 Merge branch 'master' of github.com:ppy/osu into #7146 2020-01-03 11:32:06 -08:00
Andrei Zavatski
bd5140c3fa Add missing line breaks 2020-01-03 21:20:31 +03:00
Andrei Zavatski
79a6655e1f Use bindables for colour updates 2020-01-03 21:02:56 +03:00
Andrei Zavatski
55777c24ce Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-03 20:25:28 +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
Dan Balasescu
c07cfce3b3
Merge branch 'master' into resource-assembly 2020-01-03 17:56:25 +09:00
Dean Herbert
e9b57de76f Update framework 2020-01-03 17:23:17 +09:00
Dean Herbert
78e9ab912d Merge remote-tracking branch 'upstream/master' into set_user_agent_on_web_request_level 2020-01-03 17:23:11 +09:00
Dean Herbert
a989f82f13
Fix taiko autoplay sometimes missing (#7427)
Fix taiko autoplay sometimes missing
2020-01-03 16:51:24 +09:00
Willy Tu
9d4542b1c8
Merge branch 'master' into #7146 2020-01-02 23:35:06 -08:00
smoogipoo
9c49da8942 Remove unnecessary extra "wait" frame 2020-01-03 16:24:39 +09:00
smoogipoo
97b4c65554 Fix taiko replay frames being mis-ordered 2020-01-03 16:24:29 +09:00
Dean Herbert
04d4059103
Update overlay headers controls in line with the web design (#7380)
Update overlay headers controls in line with the web design

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-03 16:11:21 +09:00
Dean Herbert
7d79edf335 Merge remote-tracking branch 'upstream/master' into overlay-headers-update-three 2020-01-03 15:35:33 +09:00
Dean Herbert
fe581bf27e Remove unnecessarily exposed value 2020-01-03 15:35:18 +09:00
Dean Herbert
e8567414c6 Refactor into some kind of sanity 2020-01-03 15:01:42 +09:00
Dan Balasescu
0fd87ced0e
Merge pull request #7424 from peppy/fix-changelog-overlay-nullref
Fix changelog overlay hard crashing on no internet connection
2020-01-03 14:32:30 +09:00
Dean Herbert
b80c421a29
Merge branch 'master' into overlay-headers-update-three 2020-01-03 14:24:09 +09:00
smoogipoo
b54491cc82 Make sure an exception is thrown 2020-01-03 14:16:38 +09:00
Willy Tu
942a04e82b
Merge branch 'master' into #7146 2020-01-02 12:07:45 -08:00
Craftplacer
51556a809d Fix variables not being used inside target string 2020-01-02 17:20:33 +01:00
Craftplacer
7b71e56817 Initial commit 2020-01-02 17:07:28 +01:00
Dean Herbert
132b420aaa Fix changelog overlay hard crashing on no internet connection 2020-01-02 19:19:42 +09:00
Andrei Zavatski
904b068a15 Simplify colour setting for additional elements in OverlayRulesetTabItem 2020-01-02 13:18:18 +03:00
Andrei Zavatski
7cab181c12 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-02 13:17:22 +03:00
Dean Herbert
d8d12cbbdd wip: Move more functionality into ComposeBlueprintContainer 2020-01-02 19:09:37 +09:00
Dean Herbert
ee332e0d42 Split out BlueprintContainer functionality further 2020-01-02 18:21:16 +09:00
Dean Herbert
9f5f78e443
Fix File Sharing on iOS 13 (#7414)
Fix File Sharing on iOS 13
2020-01-02 17:22:13 +09:00
Andrei Zavatski
a5c23e7cf7 Remove underline from breadcrumb display 2020-01-02 11:09:47 +03:00
Andrei Zavatski
35fad4c262 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-headers-update-three 2020-01-02 11:09:07 +03:00
Andrei Zavatski
0f331e81f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-headers-update-three 2020-01-02 10:59:31 +03:00
Dean Herbert
467fb0c3be
Add archive resources for testing (#7421)
Add archive resources for testing
2020-01-02 16:59:25 +09:00
smoogipoo
911816c282 Add archive test resources 2020-01-02 16:43:32 +09:00
Dean Herbert
3627b4cbba
Fix storyboard samples not loading from subfolders (#7419)
Fix storyboard samples not loading from subfolders
2020-01-02 16:39:16 +09:00
smoogipoo
cba6d9f7e6 Fix taiko samples not being loaded 2020-01-02 15:58:11 +09:00
smoogipoo
878e9f182e Add storyboard sample test scene 2020-01-02 15:23:41 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00
Dean Herbert
d1d19c2cd9 Move chevron size implementation 2020-01-02 14:26:40 +09:00
Dean Herbert
43903b2fea Make test scene usable 2020-01-02 14:24:58 +09:00
Dean Herbert
546f64f951 Method to property 2020-01-02 14:19:31 +09:00