h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 10:02:55 +08:00
Code Issues Releases Wiki Activity
19,525 Commits 3 Branches 657 Tags 357 MiB
fb94cd43a4
Commit Graph

19525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
e22a5896fa Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-07 00:20:32 +09: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
David Zhao
ac9a3e54a6 Fix cursor issue with stopped gameplay clock 2019-06-06 18:12:59 +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
Welsar55
c04c6693c2 Change close action from PopOut to Hide and switched to TriangleButton.Click() 2019-06-05 13:01:21 -05:00
Lucas A
a2bc5b538e Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-05 16:59:38 +02:00
Lucas A
da20be9a4b Fetch IAPIProvider via Resolved attribute 2019-06-05 16:59:08 +02: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
Dean Herbert
2538f32fae Merge branch 'osu-clickable-container' into OsuHoverContainer 2019-06-05 10:34:20 +09:00
Arphox
900cd5c484 Restore original values in FadeColour method call 2019-06-04 21:37:10 +02:00
Arphox
5f4d7437bc Fix the issue 
When Enabled's value has been changed to true, it will now check if it is currently howered, and if yes, it will fade in correctly.
 2019-06-04 21:30:49 +02: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
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
Dean Herbert
9c214c3f0e Add animation on failing 2019-06-04 16:13:16 +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
Dean Herbert
c34de5a957
Merge branch 'master' into settings-footer-show-changelog-current-build 2019-06-04 11:04:30 +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
smoogipoo
53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
Dean Herbert
a5a025de68 Add proper tests 2019-06-04 10:26:35 +09:00
Dean Herbert
e8315085c0 Better handle OnClick 2019-06-04 10:26:21 +09:00
EVAST9919
d5a2ebf79f Fix endless loading state part 2 2019-06-04 04:04:33 +03:00