h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 19:57:24 +08:00
Code Issues Releases Wiki Activity
21,365 Commits 3 Branches 653 Tags 367 MiB
84e4748268
Commit Graph

21365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
f7a92487ef Fix checkbox sounds playing too often 2019-08-15 14:09:30 +09:00
Dean Herbert
e73a9c2748 Fix song select context menus displaying off-screen 2019-08-15 14:06:29 +09:00
Dean Herbert
f355cff8bc Apply reviews 2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784 Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip 2019-08-15 11:54:59 +09:00
Desconocidosmh
ba539abac7 Refactoring 2019-08-14 21:05:24 +02:00
Desconocidosmh
e567e81981 Refactoring 2019-08-14 20:10:52 +02:00
Desconocidosmh
f849b4ce54 Make autoplay unpress sooner, if needed 2019-08-14 19:49:32 +02:00
Oskar Solecki
3c5a829ddd
Merge pull request #4 from ppy/master 
Sync fork
 2019-08-14 18:18:58 +02:00
Dean Herbert
58258188ce
Bump ppy.osu.Framework.iOS from 2019.813.0 to 2019.814.0 (#5718) 
Bump ppy.osu.Framework.iOS from 2019.813.0 to 2019.814.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-14 22:03:27 +09:00
Dean Herbert
416d222f09
Merge branch 'master' into dependabot/nuget/ppy.osu.Framework.iOS-2019.814.0 2019-08-14 22:03:18 +09:00
Dean Herbert
4d0718c025
Bump ppy.osu.Framework.Android from 2019.813.0 to 2019.814.0 (#5719) 
Bump ppy.osu.Framework.Android from 2019.813.0 to 2019.814.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-14 22:02:45 +09:00
Dean Herbert
4751930bd7
Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0 (#5720) 
Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-14 22:02:32 +09:00
dependabot-preview[bot]
3379672a43
Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0 
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 12:17:17 +00:00
dependabot-preview[bot]
e36e2a899a
Bump ppy.osu.Framework.Android from 2019.813.0 to 2019.814.0 
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 12:16:53 +00:00
dependabot-preview[bot]
840a142e98
Bump ppy.osu.Framework.iOS from 2019.813.0 to 2019.814.0 
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-14 12:16:32 +00:00
Dean Herbert
69adba22b2
Disable music controls when beatmap is disabled (#5710) 
Disable music controls when beatmap is disabled
 2019-08-14 17:46:00 +09:00
smoogipoo
3a79a4149a Disable music controls when beatmap is disabled 2019-08-14 15:19:21 +09:00
Dan Balasescu
8307ee330c
Merge pull request #5709 from peppy/fix-context-menu-in-chat 
Fix chat context menus displaying out-of-bounds
 2019-08-14 11:40:23 +09:00
Dean Herbert
52f42ddade Use child instead of children 2019-08-14 10:53:47 +09:00
Dean Herbert
b6bc84af2c Fix chat context menus displaying out-of-bounds 2019-08-14 10:52:26 +09:00
Shane Woolcock
c3a257ea36
Merge pull request #5705 from peppy/fix-ios-build 
Attempt to appease apple with some plist keys
 2019-08-14 00:26:46 +09:30
Dean Herbert
2cd0015735 Attempt to appease apple with some plist keys 2019-08-13 23:27:27 +09:00
Dean Herbert
42464acd7e
Add beatmap panel to multiplayer match screen (#5643) 
Add beatmap panel to multiplayer match screen

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-08-13 21:38:16 +09:00
Dean Herbert
8ce2c876bf
Merge branch 'master' into multi-room-update 2019-08-13 21:03:03 +09:00
Dean Herbert
20eede039c
Hide NotificationOverlay when clicking on UpdateCompleteNotific… (#5697) 
Hide NotificationOverlay when clicking on UpdateCompleteNotification
 2019-08-13 21:02:48 +09:00
Dean Herbert
65299bd2c3
Update osu! iOS/Android native references (#5665) 
Update osu! iOS/Android native references

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-08-13 20:50:00 +09:00
Dean Herbert
6d18f151fd
Merge branch 'master' into mobile-ffmpeg 2019-08-13 20:35:53 +09:00
Dan Balasescu
b05c0012f5
Merge pull request #5268 from Game4all/music-controller-hotkeys 
Add game-wide keybindings for music playback
 2019-08-13 20:08:10 +09:00
Dean Herbert
5963f7d914 Update comment 2019-08-13 19:52:40 +09:00
Dean Herbert
ea18a8dd12
Merge branch 'master' into music-controller-hotkeys 2019-08-13 19:08:52 +09:00
Dean Herbert
766396a433
Merge branch 'master' into mobile-ffmpeg 2019-08-13 18:39:07 +09:00
Dean Herbert
0c2e2b7e6f
Merge pull request #5700 from ppy/dependabot/nuget/ppy.osu.Framework.iOS-2019.813.0 
Bump ppy.osu.Framework.iOS from 2019.809.0 to 2019.813.0
 2019-08-13 18:38:52 +09:00
Dean Herbert
40d37ea405 Merge remote-tracking branch 'upstream/master' into dependabot/nuget/ppy.osu.Framework.iOS-2019.813.0 2019-08-13 18:37:49 +09:00
Dean Herbert
aefb38d9a1
Bump ppy.osu.Framework.Android from 2019.809.0 to 2019.813.0 (#5701) 
Bump ppy.osu.Framework.Android from 2019.809.0 to 2019.813.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-13 18:36:27 +09:00
Dean Herbert
132e38c0a6
Bump ppy.osu.Framework.NativeLibs from 2019.307.0 to 2019.813.0 (#5699) 
Bump ppy.osu.Framework.NativeLibs from 2019.307.0 to 2019.813.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-13 18:35:57 +09:00
Dean Herbert
649d36ffe2
Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0 (#5698) 
Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-08-13 18:35:20 +09:00
dependabot-preview[bot]
91068dc570
Bump ppy.osu.Framework.Android from 2019.809.0 to 2019.813.0 
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 09:01:00 +00:00
dependabot-preview[bot]
6b3eeb88fc
Bump ppy.osu.Framework.iOS from 2019.809.0 to 2019.813.0 
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 09:00:43 +00:00
dependabot-preview[bot]
fe7bc824df
Bump ppy.osu.Framework.NativeLibs from 2019.307.0 to 2019.813.0 
Bumps [ppy.osu.Framework.NativeLibs](https://github.com/ppy/osu-framework) from 2019.307.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.307.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 09:00:20 +00:00
smoogipoo
e356cc8d9e Refactor MatchBeatmapPanel for thread safety 2019-08-13 17:57:16 +09:00
dependabot-preview[bot]
f2e596de16
Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0 
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-08-13 08:54:17 +00:00
smoogipoo
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
smoogipoo
92c2dafa12 Tighten accessibility 2019-08-13 17:34:16 +09:00
smoogipoo
6b57c9801d Cull some unnecessary whitespace 2019-08-13 17:32:43 +09:00
Andrei Zavatski
8ef4b2a0f6 Hide NotificationOverlay 2019-08-13 11:29:48 +03:00
Dan Balasescu
82c8880b41
Merge pull request #5696 from peppy/split-out-music-controller 
Split visual component out of MusicController
 2019-08-13 17:26:38 +09:00
smoogipoo
2b155e5407 Merge remote-tracking branch 'origin/master' into multi-room-update 2019-08-13 17:03:44 +09:00
Dan Balasescu
77fca7b04a
Merge branch 'master' into split-out-music-controller 2019-08-13 17:03:15 +09:00
Dan Balasescu
37aff7a6aa
Merge pull request #5663 from peppy/triangles 
Add new "triangles" intro
 2019-08-13 16:50:00 +09:00
Dean Herbert
4948e7d31c
Merge branch 'master' into split-out-music-controller 2019-08-13 16:43:56 +09:00