4131 Commits

• Merge remote-tracking branch 'upstream/master' into inter-column-movements
  Dean Herbert · 2018-11-30 11:57:53 +09:00
  5254b07680
• Notify of existing imports
  smoogipoo · 2018-11-28 20:19:35 +09:00
  a88b69ec43
• Score -> ScoreInfo
  smoogipoo · 2018-11-28 18:33:01 +09:00
  219929eb47
• Fix missed renames
  smoogipoo · 2018-11-28 17:27:22 +09:00
  5b409a5ae5
• Beatmap -> BeatmapInfo + add foreign key
  smoogipoo · 2018-11-28 17:26:39 +09:00
  ed02847752
• Re-namespace replay-related classes
  smoogipoo · 2018-11-28 17:20:37 +09:00
  2ee181daf7
• Remove unused usings
  smoogipoo · 2018-11-28 16:33:42 +09:00
  09b79d736b
• Re-namespacing
  smoogipoo · 2018-11-28 16:12:57 +09:00
  5fd6e6ca77
• Merge branch 'master' into fix_idle_tracker
  Dean Herbert · 2018-11-26 17:41:45 +09:00
  da79292250
• Use IBindable<>
  Dean Herbert · 2018-11-26 17:07:30 +09:00
  32b36f2883
• Handle the null case
  Dean Herbert · 2018-11-26 16:50:41 +09:00
  626048038c
• 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
• 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 '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 remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-24 20:03:25 +09:00
  0bc4a01a6b
• 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
• Adjust tick-based wheel control to be more correct
  Dean Herbert · 2018-11-22 20:13:40 +09:00
  10047e6815
• Fix precision scroll events being handled incorrectly by editor
  Dean Herbert · 2018-11-22 19:40:44 +09:00
  a48c26d999
• Fix leaderboard accessing drawables in a possibly invalid state
  Dean Herbert · 2018-11-22 19:08:46 +09:00
  6cd69b794d
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-22 10:25:30 +09:00
  f91d2e2e07
• OpenTK -> osuTK
  smoogipoo · 2018-11-20 17:14:59 +09:00
  f27bd3ef3e
• Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""

  This reverts commit bcdaee7d39.

  Roman Kapustin · 2018-11-19 20:48:59 +03:00
  3c0ce2b615
• Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"

  This reverts commit 3e2e2a7000, reversing
  changes made to d94801b6c6.

  smoogipoo · 2018-11-19 17:52:31 +09:00
  bcdaee7d39
• SelectionBox -> SelectionHandler
  smoogipoo · 2018-11-19 16:58:11 +09:00
  55edeb095d
• Fix hold for menu button occasionally disappearing
  Dean Herbert · 2018-11-19 12:06:47 +09:00
  970ea928ae
• Set AccentColour and GlowColour in StandardHealthDisplay
  Roman Kapustin · 2018-11-16 19:30:58 +03:00
  ecf8a89f26
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-16 20:36:08 +09:00
  d09b674fb3
• Move positional adjustment to SelectionBox
  smoogipoo · 2018-11-16 17:12:24 +09:00
  4cbda97b1e
• Set AccentColour in concrete counters
  Roman Kapustin · 2018-11-15 23:37:21 +03:00
  37b19f78ae
• Pass all selected hitobjects to the selection blueprints
  smoogipoo · 2018-11-15 21:01:09 +09:00
  df7515b66f
• Merge branch 'master' into return_to_large_logo_after_idle
  Dan Balasescu · 2018-11-15 15:16:10 +09:00
  e8f34ddff0
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-15 13:31:34 +09:00
  b574a07f23
• Merge remote-tracking branch 'upstream/master' into dropdown-updates
  Dean Herbert · 2018-11-14 20:03:45 +09:00
  30547ac064
• Merge branch 'master' into hold-for-menu-back
  Dan Balasescu · 2018-11-14 19:13:07 +09:00
  81a3170e3b
• Reduce chaining
  smoogipoo · 2018-11-14 18:34:13 +09:00
  c963fc7cd2
• Merge branch 'master' into hold-for-menu-back
  Dan Balasescu · 2018-11-14 18:22:34 +09:00
  e9b47c6233
• Update with osu!-side dropdown changes
  smoogipoo · 2018-11-14 18:02:38 +09:00
  aff5fa6169
• Merge branch 'master' into tournament-tools
  Dean Herbert · 2018-11-13 17:49:12 +09:00
  93fe3ae333
• Make show/hide only invoked once each
  smoogipoo · 2018-11-13 13:12:11 +09:00
  6d43baf4bf
• Hide placement when cursor is not in the playfield
  smoogipoo · 2018-11-13 12:52:04 +09:00
  fbc20d2d4d
• Merge remote-tracking branch 'upstream/master' into tournament-tools
  Dean Herbert · 2018-11-07 17:30:52 +09:00
  a8b1e509e7
• Make selection blueprints handle position adjustments
  smoogipoo · 2018-11-07 16:21:32 +09:00
  5d51719572
• Use Name/NameScreen format
  smoogipoo · 2018-11-07 13:04:17 +09:00
  e9e50f41fb
• Require holding back button to quit gameplay

  Avoids accidental presses and streamlines logic with on-screen element.

  Dean Herbert · 2018-11-07 01:49:21 +09:00
  7f73fc2d39
• Remove intermediate Screens namespace
  smoogipoo · 2018-11-06 18:28:22 +09:00
  52f4923c8e
• Renamespace compose-mode components
  smoogipoo · 2018-11-06 18:14:46 +09:00
  ac25718c5a