1215 Commits

• Fix callback potentially not getting fired
  Dean Herbert · 2019-03-01 20:52:34 +09:00
  c01990d005
• Remove second conditional
  Dean Herbert · 2019-03-01 13:43:16 +09:00
  19ce1f2869
• Update licence header
  Dean Herbert · 2019-03-01 10:52:53 +09:00
  49cbaecf4c
• Make operation run asynchronously
  Dean Herbert · 2019-03-01 10:09:03 +09:00
  acc2113027
• Merge remote-tracking branch 'upstream/master' into m2307-master

  # Conflicts:
  #	osu.Game/Screens/Select/SongSelect.cs

  Dean Herbert · 2019-03-01 10:08:35 +09:00
  798bc1306b
• Fix code formatting issues
  Dean Herbert · 2019-03-01 09:49:36 +09:00
  80b5f1c523
• Remove pointless check
  Dean Herbert · 2019-03-01 09:49:11 +09:00
  67928ac1fe
• Merge branch 'master' into better-mp-songselect-deletion-handling
  Dan Balasescu · 2019-02-28 17:35:08 +09:00
  a37445a938
• private + renaming
  Jamie Taylor · 2019-02-28 17:02:45 +09:00
  4c8aa65200
• Fix restoration of enabled mods when cancelling song select
  Jamie Taylor · 2019-02-28 15:06:11 +09:00
  6e821a426d
• Merge branch 'master' into more-inspections
  Dean Herbert · 2019-02-28 14:32:57 +09:00
  0788a7e9f1
• Use expression body for property get/set where possible
  Dean Herbert · 2019-02-28 13:58:19 +09:00
  42be7857d1
• Fix remaining issues
  Dean Herbert · 2019-02-28 13:31:40 +09:00
  26d53d06a9
• Merge remote-tracking branch 'upstream/master' into more-inspections
  Dean Herbert · 2019-02-28 13:09:18 +09:00
  3e1f283281
• Enable more stringent inspectcode style inspections
  Dean Herbert · 2019-02-27 21:25:40 +09:00
  c8793911a8
• Ensure ruleset and mods are set correctly when leaving MatchSongSelect
  Jamie Taylor · 2019-02-27 16:16:13 +09:00
  a3f71d69a9
• Fix MatchSongSelect not handling beatmapset deletions
  Jamie Taylor · 2019-02-27 14:34:39 +09:00
  7c2ffb1826
• Fix home button being cancelled by mod select again
  Joehu · 2019-02-26 21:01:28 -08:00
  5b4319a80f
• Use fade instead of negative margin
  Dean Herbert · 2019-02-26 16:10:06 +09:00
  d9872dda12
• Add better easing
  Dean Herbert · 2019-02-26 16:09:45 +09:00
  2d6d9dd723
• Add back newline
  Dean Herbert · 2019-02-26 15:48:34 +09:00
  c1432b2ed5
• Merge branch 'master' into MissingSource
  Dean Herbert · 2019-02-25 19:35:44 +09:00
  97dc7f9819
• Merge branch 'master' into ScrollingExitFix
  Dean Herbert · 2019-02-25 19:11:05 +09:00
  6881563346
• Clean up test code
  David Zhao · 2019-02-25 18:41:13 +09:00
  59ad470eed
• Fix song select backround not being exited in time
  David Zhao · 2019-02-25 18:40:19 +09:00
  ad1bce3585
• Revert some more instances of 'e' variable names
  Dean Herbert · 2019-02-22 20:15:25 +09:00
  367bc53a06
• Merge branch 'master' into osu-fontusage
  Dean Herbert · 2019-02-22 18:09:23 +09:00
  3015d40f8f
• Update variable names

  Also cleans up some weird code

  Dean Herbert · 2019-02-22 17:51:39 +09:00
  3fe4b8fd1c
• Adjust namespaces
  smoogipoo · 2019-02-21 19:05:52 +09:00
  d8c55bc729
• Update with framework bindable changes
  smoogipoo · 2019-02-21 18:56:34 +09:00
  bca347427f
• Change RelativePositionAxes default on osu! logo to be both
  Jamie Taylor · 2019-02-20 19:34:55 +09:00
  9b3f2fdd24
• Replace copy-constructor/method with extension method
  smoogipoo · 2019-02-20 19:32:30 +09:00
  4db5531e4b
• Made medium the default font weight
  smoogipoo · 2019-02-20 16:52:36 +09:00
  dbfa95b9e7
• Merge remote-tracking branch 'origin/master' into osu-fontusage

  # Conflicts:
  #	osu.Game/Screens/Multi/Components/BeatmapTitle.cs

  smoogipoo · 2019-02-20 15:04:08 +09:00
  0693ab8e7d
• Adjust sprite texts in-line with framework changes
  smoogipoo · 2019-02-20 15:03:20 +09:00
  a2aa3ec5cb
• Merge branch 'master' into MissingSource
  ThePyrotechnic · 2019-02-17 19:54:43 +00:00
  7bb56a198a
• Move screen change allowance to local usage
  Dean Herbert · 2019-02-14 13:28:21 +09:00
  94ceb1e32b
• Fix regression in screen change allowance logic
  Dean Herbert · 2019-02-13 19:43:01 +09:00
  e604806398
• Fix crashes after entering player
  Dean Herbert · 2019-02-13 14:13:54 +09:00
  ab3adafafd
• removed 'unknown source' line
  Michael Manis · 2019-02-12 15:30:42 -05:00
  5fbdbcf209
• Merge branch 'master' into leased-bindables-dont-work
  Dean Herbert · 2019-02-11 16:30:12 +09:00
  e2e615cc5c
• Options for handing unknown beatmap source
  Michael Manis · 2019-02-10 18:31:39 -05:00
  cfe14dcdb1
• Fix background not being faded correctly
  smoogipoo · 2019-02-04 17:04:52 +09:00
  065b0c9076
• Use leased bindables
  Dean Herbert · 2019-02-01 16:44:06 +09:00
  ca5c8d37d1
• Don't expose padding
  Dean Herbert · 2019-01-31 18:16:28 +09:00
  f85518b175
• Merge branch 'master' into iscreen
  Dean Herbert · 2019-01-31 01:08:06 +09:00
  d34aa50613
• Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"

  This reverts commit cc8793a45e, reversing
  changes made to 94276c8abb.

  smoogipoo · 2019-01-31 00:02:05 +09:00
  ac0bc53c4b
• Merge remote-tracking branch 'origin/master' into iscreen

  # Conflicts:
  #	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
  #	osu.Game/Screens/Multi/Multiplayer.cs
  #	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
  #	osu.Game/Screens/OsuScreen.cs
  #	osu.Game/osu.Game.csproj
  #	osu.sln

  smoogipoo · 2019-01-29 21:21:36 +09:00
  91302ea0bc
• Display carousel over beatmap info wedge
  phosphene47 · 2019-01-25 22:58:55 +11:00
  5c70be07ab
• Convert everything to use IScreen
  smoogipoo · 2019-01-24 19:47:44 +09:00
  8ea7ec6445