12593 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into nuget-consumption
  Dean Herbert · 2018-06-06 21:09:51 +09:00
  ea1336d243
• Merge pull request #2664 from Aergwyn/overlay-activation

  Fix notifications appearing during gameplay

  Dean Herbert · 2018-06-06 20:13:59 +09:00
  5844039e04
• Merge branch 'master' into overlay-activation
  Dean Herbert · 2018-06-06 19:18:28 +09:00
  a645a109be
• Merge pull request #2730 from ekrctb/fix-ImportBeatmapTest

  Fix ImportBeatmapTest not working on .net core

  Dean Herbert · 2018-06-06 19:08:45 +09:00
  35d733fa97
• Merge branch 'master' into fix-ImportBeatmapTest
  Dean Herbert · 2018-06-06 18:56:31 +09:00
  e65b34336b
• Merge branch 'fix-ImportBeatmapTest' of https://github.com/ekrctb/osu into fix-ImportBeatmapTest
  ekrctb · 2018-06-06 18:37:04 +09:00
  94a22fb43d
• simpler temporary path generation
  ekrctb · 2018-06-06 18:36:43 +09:00
  aeeb03ff9c
• Implement DebugUtils locally

  Has been removed from framework

  Dean Herbert · 2018-06-06 18:33:10 +09:00
  0a97b8ae25
• Merge remote-tracking branch 'upstream/master' into nuget-consumption
  Dean Herbert · 2018-06-06 18:22:22 +09:00
  5a4408e359
• Fix missing null checks
  Dean Herbert · 2018-06-06 18:21:03 +09:00
  9306fec498
• match Bindable names
  Aergwyn · 2018-06-06 09:55:16 +02:00
  aaaa8a3b7c
• Rewrite much state logic
  Dean Herbert · 2018-06-06 16:17:51 +09:00
  55921efffb
• Ensure notifications don't appear during UserTriggered mode

  Closes #2640.

  Dean Herbert · 2018-06-06 15:50:24 +09:00
  9e25e02696
• Rename variables
  Dean Herbert · 2018-06-06 15:49:27 +09:00
  d1fd09ed47
• Use UserTriggered in Player
  Dean Herbert · 2018-06-06 15:10:15 +09:00
  86be1bef6b
• Merge pull request #2201 from Vidalee/osu-hd-setting

  Add a setting to increase visibility of the first object in "Hidden" mod

  Dean Herbert · 2018-06-06 14:41:34 +09:00
  e7fa043226
• Formatting fixes
  Dean Herbert · 2018-06-06 14:20:51 +09:00
  d3cd267036
• Improve readability of code
  Dean Herbert · 2018-06-06 14:04:20 +09:00
  a5679f7bf5
• Fix regressions
  Dean Herbert · 2018-06-06 13:51:51 +09:00
  f253828d49
• Move setting to new "mods" section
  Dean Herbert · 2018-06-06 12:32:59 +09:00
  1dd5bdcf72
• Merge branch 'master' into osu-hd-setting
  Dean Herbert · 2018-06-06 12:09:12 +09:00
  ee92986494
• Merge branch 'master' into overlay-activation
  Dean Herbert · 2018-06-06 10:07:22 +09:00
  6be382aab6
• Merge pull request #2692 from smoogipoo/fix-replay-updates

  Always update children when the ruleset input manager is updated

  Dean Herbert · 2018-06-06 09:58:07 +09:00
  316c928e44
• Merge branch 'master' into fix-replay-updates
  Dean Herbert · 2018-06-06 09:40:46 +09:00
  26569b434c
• Merge branch 'master' into fix-ImportBeatmapTest
  Dean Herbert · 2018-06-06 09:34:19 +09:00
  a133a8229b
• Merge pull request #2727 from DrabWeb/score-component-tooltips

  Rewrite ScoreComponentLabel

  Dean Herbert · 2018-06-06 09:32:58 +09:00
  ce94f87b1f
• Merge branch 'master' into score-component-tooltips
  Dean Herbert · 2018-06-06 09:06:22 +09:00
  d2633a706d
• Merge pull request #2698 from Joehuu/source-link-colour

  Remove link colours from beatmap tags

  Dean Herbert · 2018-06-06 08:51:54 +09:00
  21837c64cf
• Merge branch 'master' into source-link-colour
  Dean Herbert · 2018-06-06 08:27:28 +09:00
  00c8d2ff11
• Remove framework submodule reference completely
  Dean Herbert · 2018-06-05 19:41:37 +09:00
  9af9b1c937
• Remove unnecessary reference in osu.Desktop
  Dean Herbert · 2018-06-05 15:02:34 +09:00
  115595251d
• Consume osu.Framework via nuget
  Dean Herbert · 2018-06-05 14:14:56 +09:00
  601ef3b6f7
• Fix TestImportOverIPC
  ekrctb · 2018-06-04 22:25:18 +09:00
  b84441ab87
• Merge pull request #2705 from peppy/fix-beatmap-info-wedge-async

  Fix incorrect async logic in BeatmapInfoWedge

  Dan Balasescu · 2018-06-04 20:42:55 +09:00
  v2018.604.0 69e75bfa09
• Merge branch 'master' into fix-beatmap-info-wedge-async
  Dan Balasescu · 2018-06-04 20:29:29 +09:00
  b2cc7b9a5c
• Merge pull request #2683 from peppy/better-loading-logo

  Improve feel of initial loading osu! logo

  Dan Balasescu · 2018-06-04 20:29:18 +09:00
  877bc3ce5c
• Merge branch 'master' into better-loading-logo
  Dan Balasescu · 2018-06-04 20:06:22 +09:00
  566470e852
• Merge pull request #2721 from peppy/handle-web-request-failures

  Fix web request failures not being correctly handled at an APIRequest level

  Dan Balasescu · 2018-06-04 20:05:54 +09:00
  faa305528e
• Merge branch 'master' into handle-web-request-failures
  Dan Balasescu · 2018-06-04 19:49:12 +09:00
  5d45664669
• Merge pull request #2716 from peppy/hide-flash-gap

  Fix menu flashes not extending to the edge of screen during parallax

  Dan Balasescu · 2018-06-04 19:49:08 +09:00
  6a04e87690
• Merge branch 'master' into hide-flash-gap
  Dan Balasescu · 2018-06-04 19:29:10 +09:00
  f9b6de67b8
• Merge pull request #2714 from peppy/netcoreapp2.1

  Update framework to .NET Core 2.1

  Thomas Müller · 2018-06-04 05:43:27 +02:00
  92377b5810
• Merge branch 'master' into netcoreapp2.1
  Thomas Müller · 2018-06-04 05:30:25 +02:00
  88b23d4e66
• Merge branch 'master' into overlay-activation
  Dean Herbert · 2018-06-04 11:37:14 +09:00
  7701cac297
• Merge pull request #2725 from ekrctb/fix-TestCaseBeatmapCarousel

  Fix TestCaseBeatmapCarousel occasionally failing

  Dean Herbert · 2018-06-04 11:24:51 +09:00
  27ad1c4ee9
• Merge branch 'master' into fix-TestCaseBeatmapCarousel
  Dean Herbert · 2018-06-04 11:16:17 +09:00
  3ad0735a33
• Fix incorrect release build vscode configurations
  Dean Herbert · 2018-06-04 10:37:24 +09:00
  4b828b1048
• Add tooltip to ScoreComponentLabel.
  DrabWeb · 2018-06-03 22:26:30 -03:00
  a7bab14b30
• Rewrite ScoreComponentLabel.
  DrabWeb · 2018-06-03 22:22:44 -03:00
  db4c26e1ab
• Set 'Colour' when creating 'textFlow'
  Joehu · 2018-06-03 17:41:34 -07:00
  bd7c9cd8bf