1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 10:47:24 +08:00
Commit Graph

18744 Commits

Author SHA1 Message Date
EVAST9919
923f9fb6cd Naming adjustments 2019-06-07 01:43:26 +03:00
EVAST9919
2a303748e3 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-07 01:23:10 +03:00
Dean Herbert
b93446688c
Fix sizing of OsuAnimatedButton and OsuClickableContainer (#4898)
Fix sizing of OsuAnimatedButton and OsuClickableContainer
2019-06-07 00:17:39 +09:00
Dean Herbert
60731c132d
Merge pull request #4936 from peppy/update-framework
Update framework
2019-06-06 21:13:21 +09:00
Dean Herbert
8c1a62536c Update framework 2019-06-06 21:13:01 +09:00
Dean Herbert
a228763cf1
Update with framework-side front-to-back changes (#4577)
Update with framework-side front-to-back changes
2019-06-06 21:00:11 +09:00
smoogipoo
6bf6e22149 Update framework 2019-06-06 20:33:03 +09:00
smoogipoo
90966b113b Merge remote-tracking branch 'origin/master' into ftb-prepass 2019-06-06 20:32:38 +09:00
Dan Balasescu
104268cc52
Merge pull request #4935 from peppy/update-readme
Update readme with direct download links
2019-06-06 19:56:47 +09:00
Dean Herbert
2a90af1d4e Update readme with direct download links 2019-06-06 19:15:51 +09:00
Dean Herbert
4633aa83f4
Allow beatmapsets to be sorted by date added (#4914)
Allow beatmapsets to be sorted by date added

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-06 18:39:16 +09:00
Dean Herbert
483049703e
Merge branch 'master' into beatmap-dateadded-sort 2019-06-06 18:26:55 +09:00
smoogipoo
4d035afcc6 Add setting to bypass front-to-back 2019-06-06 16:49:42 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
smoogipoo
ae438213a5 Remove secondary buffered container from slider body 2019-06-06 16:32:43 +09:00
Dean Herbert
fc22b8584a
Dim music volume when holding to confirm (#4907)
Dim music volume when holding to confirm

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-06 16:26:18 +09:00
Dan Balasescu
032ed033d0
Merge branch 'master' into hold-to-confirm-dim-volume 2019-06-06 15:41:49 +09:00
Dan Balasescu
85ea650643
Merge pull request #4926 from peppy/databased-sin-setting
Add skin settings to database
2019-06-06 15:33:27 +09:00
Dean Herbert
02283380c4 Use manual migration 2019-06-06 13:33:30 +09:00
Dean Herbert
8607f3b765 Merge remote-tracking branch 'upstream/master' into databased-sin-setting 2019-06-05 19:03:57 +09:00
smoogipoo
a6dc5606bc Allow beatmapsets to be sorted by date added 2019-06-05 18:17:43 +09:00
EVAST9919
e20a899265 remove excessive null check 2019-06-04 21:46:43 +03:00
EVAST9919
05aeb66973 Fix possible crash due to null user or playmode 2019-06-04 20:20:07 +03:00
EVAST9919
54800aa4df make the variable local 2019-06-04 19:45:46 +03:00
EVAST9919
e9403bf2f7 Move GamemodeControl to UserProfileOverlay 2019-06-04 19:33:55 +03:00
EVAST9919
8260b61db5 Fix CI issues 2019-06-04 19:02:09 +03:00
EVAST9919
8dea191998 Add a testcase 2019-06-04 18:37:41 +03:00
EVAST9919
0c48aec265 Split SetDefaultGamemode into two functions 2019-06-04 18:37:31 +03:00
EVAST9919
d0d846469a Move GamemodeTabItem to a distinct class 2019-06-04 18:14:03 +03:00
EVAST9919
367fdcf519 Make GamemodeControl depend on rulesets 2019-06-04 18:07:52 +03:00
EVAST9919
c1b04746f8 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-04 17:52:26 +03:00
EVAST9919
a0f7f69f46 retrieve user's default playmode 2019-06-04 17:51:56 +03:00
Dean Herbert
e9c4b521af
Test github "funding" button 2019-06-04 22:26:11 +09:00
Dan Balasescu
9d6df33204
Merge pull request #4909 from peppy/abstract-osu-button
Mark OsuButton as abstract
2019-06-04 22:23:53 +09:00
EVAST9919
0abb48882c Implement GamemodeControl 2019-06-04 16:22:54 +03:00
Dean Herbert
2e3d392a9f Mark OsuButton as abstract
Not being used directly, so we probably shouldn't support it for now.
2019-06-04 22:12:55 +09:00
Dean Herbert
1d9274427b
Merge branch 'master' into osu-clickable-container 2019-06-04 21:55:14 +09:00
Dean Herbert
6ba4dde983
Fix incorrect testcase assertion (#4908)
Fix incorrect testcase assertion
2019-06-04 21:54:08 +09:00
smoogipoo
ff647940ca Fix incorrect assertion 2019-06-04 19:25:34 +09:00
Dean Herbert
7d2a75b350 Dim music volume when holding to confirm 2019-06-04 18:37:26 +09:00
Dean Herbert
4e7f2b8f47
Merge branch 'master' into osu-clickable-container 2019-06-04 17:42:17 +09:00
Dan Balasescu
76474987ef
Merge pull request #4873 from peppy/audio-refactor-update
Update osu! in line with audio subsystem refactor
2019-06-04 12:18:58 +09:00
Dean Herbert
b8fc535124 Fix blueprint tests crashing due to out-of-order operations 2019-06-04 12:08:23 +09:00
Dean Herbert
80a66b8b3a Merge remote-tracking branch 'upstream/master' into audio-refactor-update 2019-06-04 12:08:21 +09:00
smoogipoo
4763a41c7e Cleanups 2019-06-04 11:25:18 +09:00
Dean Herbert
3a187c2d5e
Fix tests potentially loading tracks upon disposal (#4899)
Fix tests potentially loading tracks upon disposal

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-04 11:17:54 +09:00
smoogipoo
474191fcec Update framework 2019-06-04 11:13:21 +09:00
Dan Balasescu
6e79e374e2
Merge branch 'master' into fix-endless-tests 2019-06-04 11:07:50 +09:00
smoogipoo
cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
Dean Herbert
5096aaa6f4
Update 'ShowMore' button in line with the web version (#4875)
Update 'ShowMore' button in line with the web version

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-04 10:51:01 +09:00