h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 10:22:56 +08:00
Code Issues Releases Wiki Activity
21,206 Commits 3 Branches 657 Tags 358 MiB
9616eedcfc
Commit Graph

21206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrei Zavatski
9616eedcfc Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-23 13:53:48 +03:00
Dean Herbert
13e60f3edb
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0 (#5814) 
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-23 19:25:20 +09:00
Dean Herbert
0f4d79b5d9
Merge branch 'master' into dependabot/nuget/ppy.osu.Game.Resources-2019.823.0 2019-08-23 19:24:58 +09:00
Dean Herbert
ae6ea841f9
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0 (#5812) 
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-23 19:23:12 +09:00
Dean Herbert
bcaf5dba31
Merge branch 'master' into dependabot/nuget/ppy.osu.Framework-2019.823.0 2019-08-23 19:22:25 +09:00
Dean Herbert
7f678f58c2
Bump ppy.osu.Framework.iOS from 2019.821.0 to 2019.823.0 (#5811) 
Bump ppy.osu.Framework.iOS from 2019.821.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-23 19:21:56 +09:00
Dean Herbert
40bfefcb06
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0 (#5810) 
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-23 19:21:43 +09:00
Andrei Zavatski
87379a42c8 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-23 13:05:19 +03:00
dependabot-preview[bot]
c836ef5721
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0 
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.809.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.809.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 10:04:00 +00:00
dependabot-preview[bot]
11a61b953b
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0 
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 09:43:34 +00:00
dependabot-preview[bot]
4bc0581871
Bump ppy.osu.Framework.iOS from 2019.821.0 to 2019.823.0 
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 09:33:38 +00:00
dependabot-preview[bot]
cb54fbee87
Bump ppy.osu.Framework.Android from 2019.821.0 to 2019.823.0 
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-23 09:29:35 +00:00
Dean Herbert
0a8c8906a9
Fix alignment and size of mute button (#5809) 
Fix alignment and size of mute button

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-23 18:04:21 +09:00
Dean Herbert
a502cd4b63 Merge remote-tracking branch 'upstream/master' into fix-mute-button-alignment-and-size 2019-08-23 17:43:12 +09:00
Dean Herbert
c55d237db6 Use BindValueChanged 2019-08-23 17:42:40 +09:00
Dan Balasescu
a4ad70fd76
Merge pull request #5808 from peppy/fix-crash-on-close 
Fix crash on closing game
 2019-08-23 14:54:19 +09:00
Joehu
c41b1e9eb4 Fix alignment and size of mute button 2019-08-22 21:36:21 -07:00
Dean Herbert
900df5d72f Fix crash on closing game 2019-08-23 13:02:50 +09:00
Dean Herbert
5325982f49
Merge pull request #5807 from smoogipoo/remove-more-margins 
Remove bottom margin from show more button
 2019-08-23 12:57:25 +09:00
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Andrei Zavatski
f4d2bb036b Expand KudosuAction list 2019-08-22 16:50:54 +03:00
Andrei Zavatski
67e0a2e35e Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-22 16:33:25 +03:00
Shane Woolcock
76d34967a4
Merge pull request #5801 from peppy/fix-decoding-loop 
Fix video decoding loop running permanently in the background
 2019-08-22 17:13:30 +09:30
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop 2019-08-22 17:02:13 +09:30
Dean Herbert
8018aba852
Merge branch 'master' into kudosu-info 2019-08-22 14:30:26 +09:00
Dan Balasescu
f9dcddd7fd
Merge pull request #5796 from peppy/fix-spacing-regressions 
Fix a few icon spacing regressions
 2019-08-22 14:24:53 +09:00
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
Dean Herbert
4f98361da3 One more offset removed 2019-08-21 22:22:03 +09:00
Dean Herbert
acc07c1d65 Remove mod icon offset 2019-08-21 22:18:29 +09:00
Dean Herbert
7bf430afd5 Add padding back to difficulty icons on carousel 2019-08-21 21:16:06 +09:00
Dean Herbert
04178058fb
Bump SharpCompress from 0.23.0 to 0.24.0 (#5790) 
Bump SharpCompress from 0.23.0 to 0.24.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-21 20:27:35 +09:00
Dean Herbert
6797f92b96
Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0 2019-08-21 20:15:23 +09:00
Dean Herbert
ae912082be
Merge pull request #5792 from EVAST9919/simplify-caching 
Simplify IPreviewTrackOwner caching in OsuFocusedOverlayContainer
 2019-08-21 18:33:03 +09:00
Andrei Zavatski
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
dependabot-preview[bot]
fb8d8f9438
Bump SharpCompress from 0.23.0 to 0.24.0 
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 08:27:56 +00:00
Dean Herbert
5f0df7ba21
Update framework (#5783) 
Update framework

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-21 15:32:23 +09:00
Dean Herbert
28dfe072a5 Update one more blending mode change post-master merge 2019-08-21 15:11:46 +09:00
Dean Herbert
4186d2566a Remove unnecessary null checks 2019-08-21 15:11:33 +09:00
Dean Herbert
745bd58f37 Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 15:10:08 +09:00
Dean Herbert
8917f7cc95
Merge pull request #5776 from peppy/animated-slider-ball 
Add slider ball animation support

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-08-21 15:02:35 +09:00
Dean Herbert
444f2b9387 Specify font size in a saner way 2019-08-21 15:01:50 +09:00
Dean Herbert
73bb540c23 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.821.0' into update-framework-blending 2019-08-21 14:30:28 +09:00
Dean Herbert
5c6a817788 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.821.0' into update-framework-blending 2019-08-21 14:30:14 +09:00
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
dependabot-preview[bot]
9ce783fbf2
Bump ppy.osu.Framework.Android from 2019.816.0 to 2019.821.0 
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.816.0 to 2019.821.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.816.0...2019.821.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 05:21:25 +00:00
dependabot-preview[bot]
ae7bedacc1
Bump ppy.osu.Framework.iOS from 2019.816.0 to 2019.821.0 
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.816.0 to 2019.821.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.816.0...2019.821.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-21 05:20:49 +00:00
Dean Herbert
5802ce74e8
Merge pull request #5759 from Game4all/music-playback-improvements 
Prevent beatmap change during intro playback

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-21 14:15:02 +09:00
Dean Herbert
66a2eecb7a Merge remote-tracking branch 'upstream/master' into music-playback-improvements 2019-08-21 14:01:11 +09:00
Dean Herbert
724365c6d1 Minor tidying 2019-08-21 14:01:07 +09:00
Dean Herbert
cca64771dd Add comment about placement of default loading 2019-08-21 13:56:49 +09:00