19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into multiplayer-logic-encapsulation
  Dean Herbert · 2018-06-01 15:31:19 +09:00
  c5a3eff182
• Merge pull request #2667 from DrabWeb/updateable-beatmap-set-cover

  Centralise beatmap set cover update logic

  Dean Herbert · 2018-06-01 15:31:08 +09:00
  03cc4e878e
• Merge branch 'master' into updateable-beatmap-set-cover
  Dean Herbert · 2018-06-01 15:20:59 +09:00
  8bde1fd327
• Merge pull request #2700 from ppy/osu/fix-authorinfo

  Match authorinfo with web

  Dean Herbert · 2018-06-01 12:23:32 +09:00
  9c906e3121
• Match authorinfo with web
  Joehu · 2018-05-31 14:34:47 -07:00
  729f2ec725
• Fix webexception due to invalid user ids
  miterosan · 2018-05-31 22:56:12 +02:00
  6e0099d2b1
• Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
  miterosan · 2018-05-31 22:34:50 +02:00
  34378964e7
• Add link colour to beatmap source
  Joehu · 2018-05-31 10:21:22 -07:00
  b4d621a2cb
• Match panel with web
  Joehu · 2018-05-31 08:09:19 -07:00
  1095669a55
• Fix automated testing
  Dean Herbert · 2018-05-31 20:07:55 +09:00
  a6f2561be8
• Tidy up Loader logic
  Dean Herbert · 2018-05-31 20:07:44 +09:00
  b68a5f5eab
• Always update children when ruleset input manager is updated
  smoogipoo · 2018-05-31 18:02:10 +09:00
  4eb7a34944
• Cleanup.
  DrabWeb · 2018-05-31 05:48:42 -03:00
  6781b81336
• Merge branch 'master' into updateable-beatmap-set-cover
  Dean Herbert · 2018-05-31 17:33:31 +09:00
  42bc6b6b2e
• Add tests
  Dean Herbert · 2018-05-31 17:29:59 +09:00
  dfbcf4d7b7
• Stop the logo from beating
  Dean Herbert · 2018-05-31 17:14:47 +09:00
  7487c82ec1
• Reduce the length of the fadeout animation
  Dean Herbert · 2018-05-31 17:14:04 +09:00
  c161d82474
• Merge branch 'master' into better-loading-logo
  Dean Herbert · 2018-05-31 15:59:04 +09:00
  9df173b339
• Merge pull request #2678 from peppy/long-path-fix

  Fix importing long filenames from stable

  Dean Herbert · 2018-05-31 15:58:21 +09:00
  v2018.531.0 9c0eff72b5
• Merge branch 'master' into long-path-fix
  Dan Balasescu · 2018-05-31 15:32:47 +09:00
  1147ef61ed
• Merge pull request #2682 from peppy/fix-osu-logo-discrepancies

  Fix logo animation discrepancies

  Dan Balasescu · 2018-05-31 15:31:43 +09:00
  824d6ae718
• Merge branch 'master' into fix-osu-logo-discrepancies
  Dan Balasescu · 2018-05-31 15:21:44 +09:00
  29f3011f75
• Unindent
  smoogipoo · 2018-05-31 15:17:59 +09:00
  e48b17fb0d
• Merge pull request #2680 from peppy/song-selet-enumerable

  Offload database query to task

  Dean Herbert · 2018-05-31 14:57:36 +09:00
  5b997ff7a7
• Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
  Dean Herbert · 2018-05-31 14:50:20 +09:00
  49a683e386
• Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
  smoogipoo · 2018-05-31 14:47:47 +09:00
  4ff803d11d
• Merge branch 'master' into song-selet-enumerable
  Dan Balasescu · 2018-05-31 14:42:58 +09:00
  76567ae98b
• Merge pull request #2679 from peppy/fix-player-life-management

  Fix player life management

  Dan Balasescu · 2018-05-31 14:42:47 +09:00
  e7c35d7541
• Merge branch 'master' into song-selet-enumerable
  Dan Balasescu · 2018-05-31 14:38:04 +09:00
  cd3ca68f03
• Merge branch 'master' into fix-player-life-management
  Dan Balasescu · 2018-05-31 14:34:31 +09:00
  35d8ec8df6
• Merge pull request #2673 from peppy/fix-beatmap-import-conflicts

  Fix conflicting Hash and Online IDs on beatmap import

  Dan Balasescu · 2018-05-31 14:32:47 +09:00
  c1d595677e
• Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts

  # Conflicts:
  #	osu.Game/Database/ArchiveModelManager.cs

  smoogipoo · 2018-05-31 14:02:52 +09:00
  9da7bfd615
• Merge pull request #2665 from peppy/import-fixes

  Fix beatmap importing entering a bad state

  Dan Balasescu · 2018-05-31 13:58:22 +09:00
  3fc2bfd313
• Merge branch 'master' into import-fixes
  Dan Balasescu · 2018-05-31 13:49:12 +09:00
  a9db479b27
• Merge pull request #2314 from Joehuu/score-multiplier-edits

  Split score multiplier and unranked label colours

  Dean Herbert · 2018-05-31 13:13:37 +09:00
  db89b92ae2
• Merge branch 'master' into score-multiplier-edits
  Dean Herbert · 2018-05-31 13:05:14 +09:00
  0c94e90043
• Merge pull request #2632 from peppy/catch-sizing-fixes

  Fix catch sizing

  Dan Balasescu · 2018-05-31 12:58:16 +09:00
  1201fe90fb
• Remove pointless FillMode specification
  Dean Herbert · 2018-05-31 12:50:01 +09:00
  b7511251d9
• Tidy up some unnecessary lines
  Dean Herbert · 2018-05-31 12:44:59 +09:00
  0f6c623ebb
• Fetch colour from OsuColour palette
  Dean Herbert · 2018-05-31 12:44:11 +09:00
  205aa1a3cd
• Fix incorrect naming of label
  Dean Herbert · 2018-05-31 12:39:56 +09:00
  319faf12f7
• Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
  Dean Herbert · 2018-05-31 12:36:37 +09:00
  2f21b9c4ea
• Merge branch 'master' into catch-sizing-fixes
  Dan Balasescu · 2018-05-31 12:31:52 +09:00
  9924ec9606
• Add key bindings for scroll speed

  Closes #2689.
  - [ ] Depends on ppy/osu-framework#1569 being fixed.

  Dean Herbert · 2018-05-31 12:10:53 +09:00
  7f0cb0bbf6
• Merge pull request #2672 from DrabWeb/multiplayer-screen-type

  Add Type property to MultiplayerScreen

  Dean Herbert · 2018-05-31 11:42:33 +09:00
  5d103a0088
• Default Type to Title, use ToLower for the screen type title.
  DrabWeb · 2018-05-30 23:16:54 -03:00
  ff93a54a64
• Merge branch 'master' into multiplayer-screen-type
  Dean Herbert · 2018-05-31 00:16:43 +09:00
  74c52e0a7c
• Fix intro potentially starting out-of-sync due to logo's outward animation
  Dean Herbert · 2018-05-30 20:22:31 +09:00
  9ea6ab28ea
• Add a delay before the loading logo is displayed
  Dean Herbert · 2018-05-30 20:22:26 +09:00
  9497db0b0b
• Remove unnecessary FinishTransforms
  Dean Herbert · 2018-05-30 20:05:31 +09:00
  0caf15166e