15241 Commits

This Branch

This Branch

All Branches

• Merge branch 'note-placement' into inter-column-movements

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs

  smoogipoo · 2018-11-26 11:47:22 +09:00
  c0fcbc283e
• Merge branch 'mania-selection-movement' into inter-column-movements

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
  #	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs

  smoogipoo · 2018-11-26 11:45:48 +09:00
  56032a4522
• Make selected mania hitobjects always alive
  smoogipoo · 2018-11-26 11:34:25 +09:00
  5d6a438f98
• Merge remote-tracking branch 'origin/master' into mania-selection-movement
  smoogipoo · 2018-11-26 10:56:54 +09:00
  7229559cf7
• Add helper method to get column by position
  smoogipoo · 2018-11-26 10:54:54 +09:00
  91aa00b0e9
• osuTK
  smoogipoo · 2018-11-26 10:44:48 +09:00
  4ba3fa4ab6
• Merge remote-tracking branch 'origin/master' into note-placement
  smoogipoo · 2018-11-26 10:42:20 +09:00
  4fbe28e98f
• Merge pull request #3765 from 123tris/master

  Correct typo in function name

  Dean Herbert · 2018-11-25 21:32:03 +09:00
  83b040fddc
• Merge branch 'master' into master
  Dean Herbert · 2018-11-25 20:45:18 +09:00
  54a10c1284
• Merge pull request #3768 from naoey/fix-beatmapset-overlay-double-focus

  Fix BeatmapSetOverlay focusing twice when loading from API

  Dean Herbert · 2018-11-25 20:44:06 +09:00
  99fd9e0b83
• Don't focus overlay again after set is fetched
  naoey · 2018-11-25 14:49:09 +05:30
  c71fc0b800
• Merge branch 'master' into master
  Dan Balasescu · 2018-11-25 01:38:19 +09:00
  b5fdbe8d87
• * Corrected misspelling of function in DrawableFruit.cs and refactored all of its use cases
  123tris · 2018-11-24 16:50:23 +01:00
  b2d21e4ee0
• Merge pull request #3625 from UselessToucan/external_link_warning

  Show a warning prior to opening external links

  Dan Balasescu · 2018-11-23 15:28:50 +09:00
  c22ab0a529
• Merge remote-tracking branch 'origin/master' into external_link_warning
  smoogipoo · 2018-11-23 15:19:52 +09:00
  cadfe41f83
• Adjust dialog text
  smoogipoo · 2018-11-23 15:19:15 +09:00
  df004d7a49
• Fix header potentially overflowing the dialog
  smoogipoo · 2018-11-23 15:19:09 +09:00
  ac73844fe0
• Merge pull request #3761 from peppy/fix-channelmanager-cache

  Fix order of ChannelManager dependency caching

  Dean Herbert · 2018-11-23 11:09:23 +09:00
  2018.1123.1 4c0c9f0aa7
• Fix order of ChannelManager dependency caching
  Dean Herbert · 2018-11-23 11:00:17 +09:00
  afa547af84
• Merge pull request #3759 from peppy/fix-editor-precise-scroll

  Fix precision scroll events being handled incorrectly by editor

  Dan Balasescu · 2018-11-23 10:34:42 +09:00
  91b484a643
• Add brackets

  Co-Authored-By: peppy <pe@ppy.sh>

  Dan Balasescu · 2018-11-23 10:06:06 +09:00
  b446a73c0c
• Merge branch 'master' into fix-editor-precise-scroll
  Dean Herbert · 2018-11-23 09:57:35 +09:00
  1b76e2faf5
• Merge pull request #3749 from peppy/fix-channel-presence

  Fix channel presence being handled incorrectly

  Dean Herbert · 2018-11-23 08:46:35 +09:00
  2018.1123.0 b77228a338
• Merge branch 'master' into fix-channel-presence
  Dean Herbert · 2018-11-23 08:11:46 +09:00
  a4259261e3
• Merge pull request #3758 from peppy/fix-invalid-cached

  Fix leaderboard accessing drawables in a possibly invalid state

  Dan Balasescu · 2018-11-23 00:19:52 +09:00
  2271ca5e35
• Merge branch 'master' into fix-invalid-cached
  Dan Balasescu · 2018-11-22 23:56:20 +09:00
  2f368a32d4
• Merge branch 'master' into fix-channel-presence
  Dan Balasescu · 2018-11-22 21:52:16 +09:00
  0ee4b1c4ac
• Adjust tick-based wheel control to be more correct
  Dean Herbert · 2018-11-22 20:13:40 +09:00
  10047e6815
• Merge branch 'master' into note-placement
  Dean Herbert · 2018-11-22 19:44:39 +09:00
  1da2006dea
• Fix precision scroll events being handled incorrectly by editor
  Dean Herbert · 2018-11-22 19:40:44 +09:00
  a48c26d999
• Merge pull request #3755 from smoogipoo/hide-playlist-popout

  Hide playlist when MusicController is hidden

  Dean Herbert · 2018-11-22 19:37:07 +09:00
  72dba5d7ac
• Add comment
  Dean Herbert · 2018-11-22 19:21:32 +09:00
  61fdfe39fd
• Fix leaderboard accessing drawables in a possibly invalid state
  Dean Herbert · 2018-11-22 19:08:46 +09:00
  6cd69b794d
• Fix crash on creating two new PM channels
  Dean Herbert · 2018-11-22 18:27:22 +09:00
  a144e97568
• Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence
  smoogipoo · 2018-11-22 13:04:32 +09:00
  d1ec9fc294
• Hide playlist when MusicController is hidden
  smoogipoo · 2018-11-22 12:12:34 +09:00
  5caa67d735
• Merge pull request #3754 from peppy/match-framework-inspections

  Change for-loop inspection to match framework

  Dan Balasescu · 2018-11-22 11:15:23 +09:00
  304a731d2e
• Change for-loop inspection to match framework
  Dean Herbert · 2018-11-22 10:26:05 +09:00
  bbb36198a4
• Fix join process for PMs being incorrect
  Dean Herbert · 2018-11-21 20:44:41 +09:00
  2126cf0d9a
• Fix PM channel type
  Dean Herbert · 2018-11-21 20:34:36 +09:00
  b31efb7bb9
• Merge branch 'master' into mania-selection-movement
  Dean Herbert · 2018-11-21 20:00:46 +09:00
  7de85659ba
• Merge pull request #3743 from smoogipoo/osuTK

  OpenTK -> osuTK everywhere

  Dean Herbert · 2018-11-21 19:18:33 +09:00
  65f4a01081
• Remove excess newline
  Dean Herbert · 2018-11-21 18:53:50 +09:00
  d677921680
• Merge branch 'master' into osuTK
  Dean Herbert · 2018-11-21 18:53:11 +09:00
  7755242a43
• Merge pull request #3746 from smoogipoo/fix-threaded-callback-crashes

  Fix crashes when importing/deleting from model managers

  Dean Herbert · 2018-11-21 18:52:20 +09:00
  ecd7deaf1e
• Fix instabilities in channel join logic
  Dean Herbert · 2018-11-21 17:15:15 +09:00
  88f82eb722
• Fix default channels not being joined
  Dean Herbert · 2018-11-21 17:15:15 +09:00
  4cde66240d
• Fix a crash on leaving the selected channel
  Dean Herbert · 2018-11-21 17:15:15 +09:00
  eab2776755
• Merge pull request #3748 from smoogipoo/add-private-channels

  Add private channel types

  Dean Herbert · 2018-11-21 13:12:48 +09:00
  68621fbd0e
• Add private channel types
  smoogipoo · 2018-11-21 12:58:45 +09:00
  ab2c969122