3466 Commits

• Merge remote-tracking branch 'origin/master' into disable-mouse-buttons
  smoogipoo · 2018-05-10 14:31:52 +09:00
  853680ca51
• Merge branch 'master' into use-bindable-transforms
  Dean Herbert · 2018-05-10 11:45:29 +08:00
  2e9c91c32f
• Load PlayButton.Preview asynchronously
  Roman Kapustin · 2018-05-09 16:22:52 +03:00
  95dd2125ee
• Use PreviewTrackManager in the PlayButton
  Roman Kapustin · 2018-05-09 14:52:46 +03:00
  c492f62eda
• Merge remote-tracking branch 'origin/master' into Private_Messages

  # Conflicts:
  #	osu.Game/Online/API/Requests/GetMessagesRequest.cs
  #	osu.Game/Overlays/Chat/ChatTabControl.cs

  miterosan · 2018-05-06 19:45:33 +02:00
  ba5861b527
• Decouple FilterControl.Ruleset from the game-wide ruleset bindable
  Roman Kapustin · 2018-05-03 22:59:49 +03:00
  33e2b91ccc
• Selecting a mod now triggers on mouseup
  Santeri Nogelainen · 2018-05-02 17:11:55 +03:00
  89db7f81cb
• Add keybind to disable mouse buttons
  smoogipoo · 2018-05-02 19:37:47 +09:00
  d4ada3000c
• Use bindable transforms
  smoogipoo · 2018-05-02 18:26:23 +09:00
  2d6b2d10f7
• Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"

  This reverts commit 67793845b0.

  Dan Balasescu · 2018-05-02 16:39:00 +09:00
  9f9447d441
• Disable RulesetToggleButton whenever the ruleset can't be changed
  TocoToucan · 2018-04-29 18:36:19 +03:00
  ca574f2345
• Cleanup UserProfileOverlay during PopOut
  TocoToucan · 2018-04-29 17:53:38 +03:00
  8de05450c4
• Remove redundant multiple previews handling from PaginatedBeatmapContainer
  TocoToucan · 2018-04-29 15:50:02 +03:00
  56c1c2beca
• Add activeBeatmapPreview variable for tracking beatmap preview playback
  TocoToucan · 2018-04-29 15:32:22 +03:00
  eda9f83836
• Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del
  Dean Herbert · 2018-04-25 18:10:28 +09:00
  3de3bb31f8
• Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
  Dean Herbert · 2018-04-25 17:28:21 +09:00
  76e58a51b9
• Update framework and ensure the add channel button is not switchable
  Shane Woolcock · 2018-04-24 20:46:44 +09:30
  84bda7d23f
• Merge branch 'master' into fix-badge-container
  Dean Herbert · 2018-04-23 19:13:34 +09:00
  eb7fe0b9e2
• Merge branch 'master' into show-beatmap-id
  Dean Herbert · 2018-04-20 18:05:24 +09:00
  27437cfbaf
• Fix BadgeContainer being unsable to handle null badges

  This fixes a failing test (hidden becaues the test wasn't being run).
  
  - [ ] Merge osu-framework#1530 first.

  Dean Herbert · 2018-04-20 16:05:34 +09:00
  0b993561d8
• Use a more suiting icon for discord for now
  Dean Herbert · 2018-04-20 13:51:30 +09:00
  a64ed142f0
• Make forum posts a web link
  Dean Herbert · 2018-04-20 13:01:23 +09:00
  8649ddc68b
• Merge branch 'master' into profile_web_changes
  Dean Herbert · 2018-04-20 12:51:30 +09:00
  fe644c6909
• Don't return overlay to null until it has been completely hidden
  Dean Herbert · 2018-04-20 12:47:23 +09:00
  8eefd04fcb
• Merge remote-tracking branch 'upstream/master' into show-beatmap-id
  Dean Herbert · 2018-04-20 12:41:38 +09:00
  c77f339444
• Update profile header to osu-web changes
  tgi74000 · 2018-04-19 14:46:42 +02:00
  64709da546
• Remove unused property
  Dean Herbert · 2018-04-19 21:00:22 +09:00
  0356e5e6bf
• Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
  Dean Herbert · 2018-04-19 20:53:06 +09:00
  f7ca6267b1
• Merge remote-tracking branch 'origin/master' into Private_Messages
  miterosan · 2018-04-18 20:55:12 +02:00
  3b68dda23e
• Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
  miterosan · 2018-04-18 20:46:42 +02:00
  29e8c70ed7
• Switched back to switch
  aQaTL · 2018-04-18 15:06:03 +02:00
  1dc8986c22
• Changes to naming and text
  Dean Herbert · 2018-04-18 19:47:13 +09:00
  e395a47112
• Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
  Dean Herbert · 2018-04-18 19:46:59 +09:00
  bd834dd487
• Make BeatmapSetOverlay accept nulls everywhere
  Dean Herbert · 2018-04-18 16:42:09 +09:00
  1728dd6502
• Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
  Dean Herbert · 2018-04-18 16:41:01 +09:00
  7e5d5a197b
• Make BeatmapSetOverlay accept nulls everywhere
  Dean Herbert · 2018-04-18 16:08:45 +09:00
  1be2571d33
• Merge remote-tracking branch 'origin/master' into fix-rank-status

  # Conflicts:
  #	osu.Game/Beatmaps/RankStatus.cs
  #	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
  #	osu.Game/Overlays/Direct/FilterControl.cs
  #	osu.Game/Overlays/DirectOverlay.cs

  smoogipoo · 2018-04-18 14:16:58 +09:00
  ffbe6f2e37
• Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
  Dean Herbert · 2018-04-18 13:08:53 +09:00
  f62677222c
• Simplify child definition
  Dean Herbert · 2018-04-18 11:42:55 +09:00
  a827fb51bc
• Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges
  jorolf · 2018-04-16 19:37:52 +02:00
  ddd59382e2
• add new test case and fix rotation not working
  jorolf · 2018-04-16 19:22:11 +02:00
  de9f15f620
• make hover lost transition instant (similar to hover transition)
  jorolf · 2018-04-16 18:52:09 +02:00
  046412f962
• add a DRAWABLE_BADGE_SIZE const and center badges
  jorolf · 2018-04-16 18:51:35 +02:00
  2a18b4c3f8
• badge_size is the actual badge size now

  also fixes rotateBadges bug when hover is lost

  jorolf · 2018-04-16 18:27:18 +02:00
  af0c49cca8
• Merge branch 'master' into profile-badges
  jorolf · 2018-04-15 23:50:52 +02:00
  af755b4a90
• add badges to ProfileHeader
  jorolf · 2018-04-15 23:49:45 +02:00
  6ca714d93b
• Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
  Dean Herbert · 2018-04-16 00:20:06 +09:00
  c9615f837a
• Merge remote-tracking branch 'upstream/master' into wave-container
  Dean Herbert · 2018-04-15 21:03:18 +09:00
  ae77c010e2
• Simplify logic
  Dean Herbert · 2018-04-15 16:12:42 +09:00
  fd54ae3c87
• Remove unused variable
  Dean Herbert · 2018-04-15 15:29:00 +09:00
  069d48ac14