h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:07:28 +08:00
Code Issues Releases Wiki Activity
21,186 Commits 3 Branches 653 Tags 367 MiB
f4d2bb036b
Commit Graph

21186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
152df9f3d5 Remove accidental blank line 2019-08-16 20:23:09 +09:00
Dean Herbert
3a4d65ef8b
Fix checkbox sounds playing too often (#5731) 
Fix checkbox sounds playing too often
 2019-08-16 20:22:41 +09:00
Dean Herbert
d11b896148 Move FrameStablePlayback handling to early return 2019-08-16 20:21:00 +09:00
Dean Herbert
58d2268b9e Combine conditionals that provide the same behaviour 2019-08-16 19:52:35 +09:00
Dean Herbert
aea4a69942
Update fastlane and dependencies (#5738) 
Update fastlane and dependencies
 2019-08-16 19:49:58 +09:00
Dean Herbert
132d51a2cc Update tooltip implementation 2019-08-16 19:47:35 +09:00
Dean Herbert
536e7d8757 Update framework 2019-08-16 19:32:17 +09:00
Dean Herbert
d771c271a3 Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds 2019-08-16 19:32:01 +09:00
Dean Herbert
3c208b709b Reorder functions in Fastfile for readability 2019-08-16 15:44:38 +09:00
Dean Herbert
7843b9c532 Update fastlane plugins 2019-08-16 15:44:17 +09:00
Dean Herbert
b2e05252d7 Update fastlane and dependencies 2019-08-16 14:16:00 +09:00
Dan Balasescu
8a5410eced
Merge pull request #5733 from peppy/reduce-hold-to-confirm-delay 
Reduce delay for hold-to-confirm controls
 2019-08-16 14:10:57 +09:00
Dan Balasescu
059d90bc42
Merge branch 'master' into reduce-hold-to-confirm-delay 2019-08-16 14:00:43 +09:00
Dan Balasescu
9874235a7f
Merge pull request #5730 from peppy/fix-song-select-context-menus 
Fix song select context menus displaying off-screen
 2019-08-16 13:58:42 +09:00
Dean Herbert
3949d46383 Add test fix to other test 2019-08-16 13:46:08 +09:00
Dean Herbert
d732d276b1 Make activation delay customisable 2019-08-16 13:21:41 +09:00
Dean Herbert
ff601eefe6 Fix failing test 2019-08-16 13:21:28 +09:00
Dean Herbert
b57298406f Fix right click blocking not resetting correctly 2019-08-15 19:25:33 +09:00
Dean Herbert
fc05cab050 Merge remote-tracking branch 'upstream/master' into fix-song-select-context-menus 2019-08-15 18:27:49 +09:00
Dean Herbert
0f4bada21e Fix right click absolute scrolling interfering with context menus 2019-08-15 18:27:45 +09:00
smoogipoo
8c67f58e2d Disable frame-stable playback in the editor 2019-08-15 18:25:31 +09:00
Dan Balasescu
918701be44
Merge pull request #5732 from peppy/fix-user-content-newlines 
Fix newlines being considered in user profile content
 2019-08-15 17:16:52 +09:00
Dean Herbert
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
Dean Herbert
8f63887972 Make use of existing null check 2019-08-15 14:38:49 +09:00
Dean Herbert
9e13a6aeae Fix newlines being considered in user profile content 2019-08-15 14:38:04 +09:00
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
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