3466 Commits

• Resolve merge conflicts
  TocoToucan · 2018-04-14 15:11:28 +03:00
  671de4f6c2
• update the line endings
  miterosan · 2018-04-14 13:32:48 +02:00
  142e1b8587
• Merge remote-tracking branch 'origin/master' into Private_Messages
  miterosan · 2018-04-14 13:31:03 +02:00
  5bfb386226
• Update frramework again
  Dean Herbert · 2018-04-13 21:47:50 +09:00
  a0f9f8d512
• Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
  smoogipoo · 2018-04-13 21:13:09 +09:00
  733f70cbd5
• Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
  Dean Herbert · 2018-04-13 19:54:15 +09:00
  9f5a52b641
• Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
  Dean Herbert · 2018-04-13 19:50:44 +09:00
  81f0649e44
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Add right click scrolling in song select (and its option)
  tgi74000 · 2018-04-13 11:09:49 +02:00
  e3cd0ef200
• Merge branch 'master' into ignored_input_handler
  Dean Herbert · 2018-04-13 18:05:12 +09:00
  a1a7e63646
• Reword options item to include "screenshot"
  smoogipoo · 2018-04-13 17:30:02 +09:00
  826a8552e5
• Remove not needed using
  miterosan · 2018-04-12 23:29:23 +02:00
  a9f3885d28
• Rename var chatmanager -> channelManager

  Apply requested changes

  miterosan · 2018-04-12 23:19:13 +02:00
  e39f5a1adf
• Order beatmap difficulty icons correctly
  TocoToucan · 2018-04-12 19:33:30 +03:00
  9acea6eab0
• Remove unused using directives
  Joehu · 2018-04-12 08:13:24 -07:00
  463b189d2f
• Move enum to SearchBeatmapSetsRequest
  Joehu · 2018-04-12 07:49:23 -07:00
  f18594887b
• ActiveInputHandlers -> IgnoredInputHandler
  TocoToucan · 2018-04-12 17:06:35 +03:00
  7c3441e2d0
• Rename RankStatus to BeatmapSearchCategory
  Joehu · 2018-04-11 22:50:39 -07:00
  461e063f19
• Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
  DrabWeb · 2018-04-11 16:22:27 -03:00
  0bede52381
• Merge branch 'master' into Private_Messages
  miterosan · 2018-04-11 20:48:06 +02:00
  6e81fda40e
• Fix the warnings
  miterosan · 2018-04-11 20:44:35 +02:00
  499ecd3843
• Fix code sanity
  miterosan · 2018-04-11 20:31:16 +02:00
  2056258def
• Fix Selected tab beeing choosen multiple times
  miterosan · 2018-04-11 20:27:33 +02:00
  697b551f3e
• Rename everything into channel and remove everything chat
  miterosan · 2018-04-11 20:01:57 +02:00
  3860594f40
• Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow.

  Requires osu-framework for a fix

  miterosan · 2018-04-11 18:23:09 +02:00
  39ecc3d31d
• BeatmapContainer -> beatmapContainer
  TocoToucan · 2018-04-11 16:32:58 +03:00
  6a8f568f66
• PaginatedBeatmapContainer.BeganPlayingPreview
  TocoToucan · 2018-04-11 16:19:21 +03:00
  6cdfaffcf7
• Fix regression causing hard crash

  Regressed in #2373. My bad.

  Dean Herbert · 2018-04-11 19:24:19 +09:00
  903dd7a015
• Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width
  aQaTL · 2018-04-11 08:07:26 +02:00
  90beff83f6
• Changed mapping of deleting key binding to shift+delete
  aQaTL · 2018-04-10 18:00:22 +02:00
  38277bff35
• Remove redundant anchor and use Show/Hide instead of FadeIn/Out.
  naoey · 2018-04-10 19:15:37 +05:30
  d851446aca
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-10 16:05:32 +09:00
  c33cb9c02e
• Allow opening a new chat with right click on User

  Allow faster viewing of the usertab using lasy loading

  miterosan · 2018-04-09 23:14:39 +02:00
  85f736ae89
• Convert if to switch
  miterosan · 2018-04-09 22:29:48 +02:00
  762b4412e5
• Merge branch 'master' into hide_menu_cursor
  UselessToucan · 2018-04-09 21:41:54 +03:00
  9225c06872
• Allow mapping delete key via alt+delete key combination
  aQaTL · 2018-04-09 18:48:47 +02:00
  dbee936748
• Fix all possible cases of crossthread import data races
  smoogipoo · 2018-04-09 12:45:44 +09:00
  b97c4e8b44
• remove using, remove empty agrument list
  miterosan · 2018-04-08 22:43:01 +02:00
  aa26ea483d
• Trim more whitespace
  miterosan · 2018-04-08 22:28:50 +02:00
  2a314f052a
• Trim whilespace
  miterosan · 2018-04-08 22:24:55 +02:00
  0a207e00d5
• Trim whitespace
  miterosan · 2018-04-08 22:18:29 +02:00
  4b7ffd09d9
• Implement Private chat
  miterosan · 2018-04-08 22:12:57 +02:00
  a48ccb5603
• Split drawing and business logic of ChatOverlay
  miterosan · 2018-04-08 18:21:48 +02:00
  a70b329155
• Merge remote-tracking branch 'origin/master' into Private_Messages
  miterosan · 2018-04-08 15:23:09 +02:00
  525e50e8dd
• Handle multiple song previews playing in different beatmap categories on profile
  TocoToucan · 2018-04-07 13:29:46 +03:00
  640be621ac
• Remove unused using and fix possible nullref.
  naoey · 2018-04-04 22:07:24 +05:30
  ca4299c6fe
• Add a loading state to BeatmapSetOverlay.

  - Handle null value in header and info sections
  - Add item to context menu for carousel beatmaps to show details

  naoey · 2018-04-04 21:46:31 +05:30
  7482d5986a
• Make LinkFlowContainer handle beatmap id lookup in game.
  naoey · 2018-04-04 21:23:51 +05:30
  c304c1eecf
• Merge branch 'master' into osu-tab-strip
  Dan Balasescu · 2018-04-04 14:20:06 +09:00
  6dfca4b2fa
• Update with framework changes
  smoogipoo · 2018-04-03 20:10:26 +09:00
  c39fb9a200