4131 Commits

• Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
  EVAST9919 · 2017-10-26 15:04:44 +03:00
  08637253df
• Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
  EVAST9919 · 2017-10-26 14:40:40 +03:00
  189b51551d
• Fix Hide/Restore/Delete etc.
  Dean Herbert · 2017-10-25 22:08:34 +09:00
  5001e9f264
• Merge branch 'master' into config-slider-keyboardstep
  Dean Herbert · 2017-10-24 08:14:56 +09:00
  26d8b67f25
• Move all TestCases to Testing project

  This allows tests to successfully retrieve rulesets, as they are referenced.

  Dean Herbert · 2017-10-23 19:32:02 +09:00
  dc9c474033
• Add KeyboardStep values for configuration options
  Shane Woolcock · 2017-10-23 16:06:08 +10:30
  ea2934d92c
• Fix selection after hiding all difficulties in a set
  Dean Herbert · 2017-10-20 11:16:56 +09:00
  f69fa0cf1f
• Fix all remaining db structure issues
  Dean Herbert · 2017-10-19 14:05:11 +09:00
  5d5ea5fb2e
• Fix beatmap carousel interactions with deletion when not yet displayed
  Dean Herbert · 2017-10-18 18:36:35 +09:00
  a85de09c0f
• Merge remote-tracking branch 'upstream/master' into EfCore
  Dean Herbert · 2017-10-18 11:43:37 +09:00
  2f3319552d
• Simplify gradient usage in Letterbox Overlay
  EVAST9919 · 2017-10-18 05:06:17 +03:00
  bae91d7de7
• Fix intro and duplicate inserts
  Dean Herbert · 2017-10-17 11:22:42 +09:00
  31dc5c97f2
• Use format string for double instead of Math.Round.
  Huo Yaoyuan · 2017-10-16 12:59:59 +09:00
  c2836a8393
• Use format string for double instead of Math.Round.
  Huo Yaoyuan · 2017-10-15 16:44:15 +08:00
  9b3676c562
• Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
  EVAST9919 · 2017-10-15 00:15:25 +03:00
  e3ce641ea0
• Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
  EVAST9919 · 2017-10-15 00:10:15 +03:00
  f4428980a6
• Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
  EVAST9919 · 2017-10-15 00:09:50 +03:00
  24ca7a5119
• Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

  # Conflicts:
  #	osu-framework
  #	osu.Game/Beatmaps/BeatmapMetadata.cs
  #	osu.Game/osu.Game.csproj
  #	osu.Game/packages.config

  smoogipoo · 2017-10-14 16:36:37 +09:00
  9924f518b7
• Let's not rename columns yet
  smoogipoo · 2017-10-14 14:30:58 +09:00
  b178be21d1
• Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore

  # Conflicts:
  #	osu-framework
  #	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
  #	osu.Game/Beatmaps/BeatmapInfo.cs
  #	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs

  smoogipoo · 2017-10-14 12:38:59 +09:00
  b83d7cd4df
• Fix beatmap author being stored in two different places
  Dean Herbert · 2017-10-14 11:39:55 +09:00
  cd722e4abb
• Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
  EVAST9919 · 2017-10-14 05:18:03 +03:00
  6711331f66
• Make sure we restore the clock rate on exiting
  EVAST9919 · 2017-10-14 05:15:18 +03:00
  7a72f2e3f5
• Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
  EVAST9919 · 2017-10-14 05:06:36 +03:00
  bdcc70e0bb
• Fix deleting last visible beatmap doesn't trigger selecting null beatmap
  EVAST9919 · 2017-10-14 05:05:38 +03:00
  502940ddf3
• Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
  EVAST9919 · 2017-10-14 04:32:12 +03:00
  583f8358b6
• Use Gray instead of FromHex for grays
  Dean Herbert · 2017-10-12 22:19:29 +09:00
  c0d64bf409
• Set a default zoom level that isn't the whole track
  Dean Herbert · 2017-10-12 22:19:02 +09:00
  37fc69b9f7
• Adjust padding slightly
  Dean Herbert · 2017-10-12 22:10:37 +09:00
  37b88d834e
• Make TimelineButtons combined take up the full height of the timeline
  smoogipoo · 2017-10-12 18:32:39 +09:00
  ab62390336
• Change TimelineButton icon colour to white when hovered
  smoogipoo · 2017-10-12 18:17:36 +09:00
  a6901c0a27
• Hook up more bindables for hitobjects/hitsounds
  smoogipoo · 2017-10-12 17:51:01 +09:00
  5ccfc1918e
• Implement waveform checkbox
  smoogipoo · 2017-10-12 17:50:51 +09:00
  db672becbc
• graph -> waveform
  smoogipoo · 2017-10-12 17:37:40 +09:00
  3c35a7a6ae
• Implement magnification buttons
  smoogipoo · 2017-10-12 17:31:21 +09:00
  4586877239
• Implement TimelineButton and use for the magnification buttons
  smoogipoo · 2017-10-12 16:10:33 +09:00
  de8f9325a3
• Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
  smoogipoo · 2017-10-12 15:37:45 +09:00
  2844764e3c
• Integrate timeline into Compose
  smoogipoo · 2017-10-12 15:37:00 +09:00
  e12fa49436
• Remove unused usings
  smoogipoo · 2017-10-12 15:32:18 +09:00
  6fbf52c3eb
• Fix wrong beatmap selection in song-select menu on deleting selected beatmap
  EVAST9919 · 2017-10-11 20:25:12 +03:00
  7cff413ab0
• Fix RulesetStore preparation
  TocoToucan · 2017-10-10 22:29:16 +03:00
  4653470779
• Merge from ppy/master
  TocoToucan · 2017-10-10 21:07:36 +03:00
  8b01f8671f
• CI fixes
  EVAST9919 · 2017-10-10 21:03:35 +03:00
  28a594179f
• Simplify the code by using more delayed sequences
  EVAST9919 · 2017-10-10 20:43:07 +03:00
  15160f5116
• Final adjustments
  EVAST9919 · 2017-10-10 20:20:49 +03:00
  d3a62082b4
• Timing adjustments
  EVAST9919 · 2017-10-10 20:06:18 +03:00
  a58e828f54
• Use constants instead of magic numbers
  EVAST9919 · 2017-10-10 18:30:46 +03:00
  10a3f7c1d0
• No need to put a lot of stuff inside the big circular container
  EVAST9919 · 2017-10-10 15:29:29 +03:00
  c34b9aef98
• Rings timing adjustment
  EVAST9919 · 2017-10-10 15:02:43 +03:00
  67a6da44f9
• Re-namespace a few classes
  smoogipoo · 2017-10-10 15:22:39 +09:00
  1cf8c0284a