4131 Commits

• Merge branch 'master' into ingame_options
  Dan Balasescu · 2017-05-29 18:12:02 +09:00
  6918368afc
• Merge branch 'master' into fix-nullrefs
  Thomas Müller · 2017-05-28 16:07:10 +02:00
  a4903e62ba
• Update focus handling in line with framework changes
  Dean Herbert · 2017-05-28 20:08:46 +09:00
  d749fc516d
• Update method names in line with framework changes
  Dean Herbert · 2017-05-28 18:34:12 +09:00
  bdeaf2dbb4
• More xmldoc and few Title text fixes
  EVAST9919 · 2017-05-28 00:56:11 +03:00
  743dfcc130
• Toogle visibility without ctrl pressed
  EVAST9919 · 2017-05-27 02:38:29 +03:00
  b5a6d73104
• Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
  EVAST9919 · 2017-05-27 02:25:03 +03:00
  bedcf04043
• Fix some possible nullrefs on beatmap load failure
  Dean Herbert · 2017-05-26 17:36:38 +09:00
  5eab611255
• Merge branch 'master' into drawable-multiplayer-room
  Dean Herbert · 2017-05-25 13:58:05 +09:00
  012f60d59b
• Unbind from room values when disposing
  DrabWeb · 2017-05-24 17:02:28 -03:00
  b803e40a7d
• Merge branch 'master' into playsongselect-exit-fix
  MrTheMake · 2017-05-24 16:26:43 +02:00
  dee9d0e3bd
• Add missing early activation to menu flashes
  Dean Herbert · 2017-05-24 21:07:12 +09:00
  0dbb2220e0
• Merge branch 'master' into drawable-multiplayer-room
  Seth · 2017-05-24 04:39:57 -03:00
  3094a8267f
• Merge branch 'master' into osu-direct
  Dean Herbert · 2017-05-24 15:33:53 +09:00
  45a964cebe
• Add missing readonly
  Dean Herbert · 2017-05-24 13:29:12 +09:00
  03f9a86366
• Add a low-end cutoff for scale adjust
  Dean Herbert · 2017-05-24 13:08:59 +09:00
  16d9a677d0
• Adjust triangle movement based on amplitude
  Dean Herbert · 2017-05-24 13:08:54 +09:00
  a9d1e54c27
• Merge branch 'master' into osu-direct
  Dean Herbert · 2017-05-24 12:16:34 +09:00
  4ee11764b8
• Merge branch 'master' into logo-beat
  Dean Herbert · 2017-05-24 11:41:02 +09:00
  b1bd88ae71
• Merge branch 'master' into logo-beat
  Dan Balasescu · 2017-05-24 10:36:30 +09:00
  90d54a6cfe
• Merge branch 'master' into menu-flashes
  Dean Herbert · 2017-05-24 10:10:29 +09:00
  87a2cc2004
• Update to new syntax of OnNewBeat
  ColdVolcano · 2017-05-23 20:01:20 -05:00
  207d6e4ac3
• Merge branch 'master' of ppy/osu into menu-flashes
  ColdVolcano · 2017-05-23 20:00:02 -05:00
  c6d744eb7c
• Merge branch 'master' into songselect-fix
  Dean Herbert · 2017-05-24 09:45:34 +09:00
  dee6a1e2be
• More formatting
  MrTheMake · 2017-05-24 02:38:05 +02:00
  24f64c8815
• Formatting fixes
  MrTheMake · 2017-05-24 02:30:32 +02:00
  67774192dd
• CI fix
  MrTheMake · 2017-05-24 02:23:52 +02:00
  0616256bd0
• Fix scheduled task not being canceled
  MrTheMake · 2017-05-24 02:22:30 +02:00
  09adb23591
• Fix potential nullref
  Dean Herbert · 2017-05-24 02:53:21 +09:00
  b477e5cd9e
• Remove unused parameter
  Dean Herbert · 2017-05-24 02:09:31 +09:00
  813b09189c
• Add amplitude adjust
  Dean Herbert · 2017-05-24 01:45:01 +09:00
  7e827c4f11
• Merge branch 'master'
  Dean Herbert · 2017-05-24 01:17:09 +09:00
  b12300391b
• Merge branch 'master' into controlpoint-rework
  Dean Herbert · 2017-05-24 00:20:15 +09:00
  0842e00f13
• Merge branch 'master' into menu-music-osz
  Dean Herbert · 2017-05-23 23:56:07 +09:00
  a48a03bf38
• Unregister OnBeatmapChanged() when exiting song selection
  MrTheMake · 2017-05-23 15:30:15 +02:00
  0603be5937
• overall fixes
  EVAST9919 · 2017-05-23 16:01:00 +03:00
  178f8127b8
• CI fixes and removed useless property
  EVAST9919 · 2017-05-23 12:24:16 +03:00
  2e28b10c36
• Moved KeyCounter visibility logic to it's own class
  EVAST9919 · 2017-05-23 11:53:42 +03:00
  4b23cc47ea
• Simplify Hud visibility change
  EVAST9919 · 2017-05-23 11:53:12 +03:00
  eafe215169
• Merge branch 'master' into osu-direct
  Dean Herbert · 2017-05-23 17:33:20 +09:00
  0634a3a5c5
• Various refactoring
  Dean Herbert · 2017-05-23 17:26:28 +09:00
  0dd52e4e29
• Add more flashiness during kiai time
  Dean Herbert · 2017-05-23 16:42:47 +09:00
  2decb2b2ff
• Don't bounce the ripple

  Also ripple better.

  Dean Herbert · 2017-05-23 16:42:41 +09:00
  73320f9a7e
• Read menu music from osz resource
  Dean Herbert · 2017-05-23 16:38:43 +09:00
  fe7ac20e29
• Split ControlPoint into different types.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/UI/Column.cs

  smoogipooo · 2017-05-23 14:03:40 +09:00
  3cdfd2eef5
• Add basic beat response to osu! logo
  Dean Herbert · 2017-05-23 12:29:43 +09:00
  3e0aaa1aa0
• Move RoomStatus to a class instead of enum
  DrabWeb · 2017-05-22 21:13:57 -03:00
  9798117d53
• Unused using
  DrabWeb · 2017-05-22 13:14:56 -03:00
  cf0e7887b5
• Proper Bindable usage
  DrabWeb · 2017-05-22 13:05:18 -03:00
  25b457e994
• MultiplayerRoomStatus -> RoomStatus
  DrabWeb · 2017-05-22 12:46:41 -03:00
  65df2d2b70