h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-29 19:52:55 +08:00
Code Issues Releases Wiki Activity
21,083 Commits 6 Branches 666 Tags 358 MiB
b5cb59faf2
Commit Graph

21083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
Dan Balasescu
a829d44991
Merge pull request #5563 from EVAST9919/previous-usernames 
Implement PreviousUsernames for use in the profile overlay
 2019-08-13 16:33:55 +09:00
Dean Herbert
6a70849acb Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 15:08:33 +09:00
Dean Herbert
b942192e00 Fix remaining nullref 2019-08-13 15:04:04 +09:00
Dan Balasescu
ae4417bb7c
Merge branch 'master' into previous-usernames 2019-08-13 14:58:01 +09:00
Dean Herbert
81f8b5f325 Fix merge issue 2019-08-13 14:52:51 +09:00
Dean Herbert
87c2e87b62
Add note to README about ffmpeg requirement on linux (#5695) 
Add note to README about ffmpeg requirement on linux
 2019-08-13 14:49:23 +09:00
Dean Herbert
5898198da6 Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:48:14 +09:00
Dean Herbert
2cbdf8c01c Update public methods in line with future usage 2019-08-13 14:46:57 +09:00
Dean Herbert
de1ab56a2c Fix potential nullref on disposal 2019-08-13 14:45:27 +09:00
Dean Herbert
9aac5efa4e Move logic out of OsuGame 2019-08-13 14:42:59 +09:00
Dean Herbert
8d23cda51a Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:33:35 +09:00
Shane Woolcock
99d9b797cc
Merge branch 'master' into mobile-ffmpeg 2019-08-13 15:03:24 +09:30
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
smoogipoo
8d3f2f7645 Drop container from name 2019-08-13 14:09:10 +09:00
smoogipoo
5681d1097c Move into components namespace 2019-08-13 14:07:40 +09:00
Dean Herbert
5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
Dean Herbert
33a119b726
Fix double grammar 
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
 2019-08-13 12:35:06 +09:00
Dean Herbert
0c0c405216 Add note to README about ffmpeg requirement on linux 2019-08-13 12:27:49 +09:00
Dean Herbert
f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00