20998 Commits

This Branch

This Branch

All Branches

• Update osu! iOS/Android native references (#5665)

  Update osu! iOS/Android native references
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-08-13 20:50:00 +09:00
  65299bd2c3
• Merge branch 'master' into mobile-ffmpeg
  Dean Herbert · 2019-08-13 20:35:53 +09:00
  6d18f151fd
• Merge pull request #5268 from Game4all/music-controller-hotkeys

  Add game-wide keybindings for music playback

  Dan Balasescu · 2019-08-13 20:08:10 +09:00
  b05c0012f5
• Update comment
  Dean Herbert · 2019-08-13 19:52:40 +09:00
  5963f7d914
• Merge branch 'master' into music-controller-hotkeys
  Dean Herbert · 2019-08-13 19:08:52 +09:00
  ea18a8dd12
• Merge branch 'master' into mobile-ffmpeg
  Dean Herbert · 2019-08-13 18:39:07 +09:00
  766396a433
• 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

  Dean Herbert · 2019-08-13 18:38:52 +09:00
  0c2e2b7e6f
• Merge remote-tracking branch 'upstream/master' into dependabot/nuget/ppy.osu.Framework.iOS-2019.813.0
  Dean Herbert · 2019-08-13 18:37:49 +09:00
  40d37ea405
• 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>

  Dean Herbert · 2019-08-13 18:36:27 +09:00
  aefb38d9a1
• 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>

  Dean Herbert · 2019-08-13 18:35:57 +09:00
  132e38c0a6
• 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>

  Dean Herbert · 2019-08-13 18:35:20 +09:00
  649d36ffe2
• 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>

  dependabot-preview[bot] · 2019-08-13 09:01:00 +00:00
  91068dc570
• 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>

  dependabot-preview[bot] · 2019-08-13 09:00:43 +00:00
  6b3eeb88fc
• 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>

  dependabot-preview[bot] · 2019-08-13 09:00:20 +00:00
  fe7bc824df
• 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>

  dependabot-preview[bot] · 2019-08-13 08:54:17 +00:00
  f2e596de16
• Merge pull request #5696 from peppy/split-out-music-controller

  Split visual component out of MusicController

  Dan Balasescu · 2019-08-13 17:26:38 +09:00
  82c8880b41
• Merge branch 'master' into split-out-music-controller
  Dan Balasescu · 2019-08-13 17:03:15 +09:00
  77fca7b04a
• Merge pull request #5663 from peppy/triangles

  Add new "triangles" intro

  Dan Balasescu · 2019-08-13 16:50:00 +09:00
  37aff7a6aa
• Merge branch 'master' into split-out-music-controller
  Dean Herbert · 2019-08-13 16:43:56 +09:00
  4948e7d31c
• Merge branch 'master' into triangles
  Dan Balasescu · 2019-08-13 16:34:08 +09:00
  f6e1df8952
• Merge pull request #5563 from EVAST9919/previous-usernames

  Implement PreviousUsernames for use in the profile overlay

  Dan Balasescu · 2019-08-13 16:33:55 +09:00
  a829d44991
• Merge branch 'split-out-music-controller' into music-controller-hotkeys
  Dean Herbert · 2019-08-13 15:08:33 +09:00
  6a70849acb
• Fix remaining nullref
  Dean Herbert · 2019-08-13 15:04:04 +09:00
  b942192e00
• Merge branch 'master' into previous-usernames
  Dan Balasescu · 2019-08-13 14:58:01 +09:00
  ae4417bb7c
• Fix merge issue
  Dean Herbert · 2019-08-13 14:52:51 +09:00
  81f8b5f325
• Add note to README about ffmpeg requirement on linux (#5695)

  Add note to README about ffmpeg requirement on linux

  Dean Herbert · 2019-08-13 14:49:23 +09:00
  87c2e87b62
• Merge branch 'split-out-music-controller' into music-controller-hotkeys
  Dean Herbert · 2019-08-13 14:48:14 +09:00
  5898198da6
• Update public methods in line with future usage
  Dean Herbert · 2019-08-13 14:46:57 +09:00
  2cbdf8c01c
• Fix potential nullref on disposal
  Dean Herbert · 2019-08-13 14:45:27 +09:00
  de1ab56a2c
• Move logic out of OsuGame
  Dean Herbert · 2019-08-13 14:42:59 +09:00
  9aac5efa4e
• Merge branch 'split-out-music-controller' into music-controller-hotkeys
  Dean Herbert · 2019-08-13 14:33:35 +09:00
  8d23cda51a
• Merge branch 'master' into mobile-ffmpeg
  Shane Woolcock · 2019-08-13 15:03:24 +09:30
  99d9b797cc
• Split visual component out of MusicController
  Dean Herbert · 2019-08-13 14:30:18 +09:00
  ad24265730
• Merge branch 'master' into previous-usernames
  Dan Balasescu · 2019-08-13 14:21:44 +09:00
  9c43021c28
• Drop container from name
  smoogipoo · 2019-08-13 14:09:10 +09:00
  8d3f2f7645
• Move into components namespace
  smoogipoo · 2019-08-13 14:07:40 +09:00
  5681d1097c
• Group key bindings together
  Dean Herbert · 2019-08-13 12:40:20 +09:00
  5dbde38a6b
• Fix double grammar

  Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>

  Dean Herbert · 2019-08-13 12:35:06 +09:00
  33a119b726
• Add note to README about ffmpeg requirement on linux
  Dean Herbert · 2019-08-13 12:27:49 +09:00
  0c0c405216
• Remove "jukebox" terminology
  Dean Herbert · 2019-08-13 12:06:57 +09:00
  f3380c9372
• Merge remote-tracking branch 'upstream/master' into music-controller-hotkeys
  Dean Herbert · 2019-08-13 11:57:18 +09:00
  6328fd9363
• Merge pull request #5267 from Game4all/refactor-osd

  Refactor OnScreenDisplay to allow displaying on custom messages

  Dean Herbert · 2019-08-13 11:47:36 +09:00
  5b2086fa4c
• Merge remote-tracking branch 'upstream/master' into refactor-osd
  Dean Herbert · 2019-08-13 11:35:54 +09:00
  4ccac60337
• Fix file ordering
  Dean Herbert · 2019-08-13 11:34:45 +09:00
  5447e7cf22
• Implement LeaderboardScopeSelector (#5627)

  Implement LeaderboardScopeSelector
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-08-13 00:39:27 +09:00
  6f38c64354
• Make line slightly thicker (to display better at low resolutions)

  Also tidies up code.

  Dean Herbert · 2019-08-13 00:21:52 +09:00
  433b701df3
• Merge remote-tracking branch 'upstream/master' into beatmap-scope-selector
  Dean Herbert · 2019-08-13 00:16:53 +09:00
  a7ae0e6677
• Rename variable and add xmldoc
  Dean Herbert · 2019-08-13 00:14:37 +09:00
  c0f0fbbaa9
• Fix mod multiplier not being applied for multiplayer (#5691)

  Fix mod multiplier not being applied for multiplayer

  Dean Herbert · 2019-08-12 23:55:09 +09:00
  d59966b975
• Move score multiplier logic inside score calculation
  iiSaLMaN · 2019-08-12 16:40:52 +03:00
  883102ee5d