24822 Commits

This Branch

This Branch

All Branches

• Handle the null case
  Dean Herbert · 2018-11-26 16:50:41 +09:00
  626048038c
• Merge branch 'master' into multiplayer-room-settings
  Dan Balasescu · 2018-11-26 16:46:27 +09:00
  38ef1d1f03
• Merge branch 'master' into fix_idle_tracker
  Dean Herbert · 2018-11-26 16:44:04 +09:00
  b751a0d918
• Remove unnecessarily specified RelativeSizeAxes
  Dean Herbert · 2018-11-26 16:39:11 +09:00
  87da7b05a6
• Mvoe private method to bottom
  Dean Herbert · 2018-11-26 16:33:58 +09:00
  68f0d25550
• Use bindable flow for checking idle time
  Dean Herbert · 2018-11-26 16:32:59 +09:00
  8d65d49126
• Fix post-merge issues
  smoogipoo · 2018-11-26 16:29:56 +09:00
  dea387c31e
• Merge remote-tracking branch 'origin/master' into multiplayer-room-settings
  smoogipoo · 2018-11-26 16:27:22 +09:00
  dcf740e5d3
• Merge pull request #3753 from miterosan/ChatManager_with_BindableCollection

  Chat manager with bindable collection

  Dan Balasescu · 2018-11-26 16:24:41 +09:00
  f58f3e22c7
• Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
  smoogipoo · 2018-11-26 16:12:55 +09:00
  efdad3a3a7
• Fix drag breaking if scrolling while dragging
  smoogipoo · 2018-11-26 16:08:56 +09:00
  f9f300b215
• Merge branch 'master' into fix_idle_tracker
  Dean Herbert · 2018-11-26 15:24:44 +09:00
  fe5b043a59
• Merge branch 'master' into note-placement
  Dean Herbert · 2018-11-26 14:35:31 +09:00
  4cfeb1b9a1
• Merge pull request #3744 from smoogipoo/fix-deletion-crash

  Implement mania note deletion

  Dean Herbert · 2018-11-26 14:28:39 +09:00
  e94c5dfabe
• Merge branch 'master' into fix-deletion-crash
  Dean Herbert · 2018-11-26 14:20:02 +09:00
  c944e8bb29
• Merge branch 'master' into note-placement
  Dean Herbert · 2018-11-26 14:19:46 +09:00
  bfebed053d
• Merge pull request #3716 from smoogipoo/mania-selection-movement

  Implement mania selection blueprint movements

  Dean Herbert · 2018-11-26 14:13:16 +09:00
  c854ab498a
• Fix post-merge errors
  smoogipoo · 2018-11-26 11:47:48 +09:00
  60ffad169f
• 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
• Merge branch 'master' of https://github.com/ppy/osu into deflate-branch
  MaxOhn · 2018-11-26 03:45:35 +01:00
  8a3425948d
• 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 remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-25 17:43:10 +09:00
  1682a8ce0d
• 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 remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-24 20:03:25 +09:00
  0bc4a01a6b
• 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