61410 Commits

This Branch

This Branch

All Branches

• Remove merge error
  DrabWeb · 2017-05-26 03:28:09 -03:00
  fb0b54e66a
• Merge https://github.com/ppy/osu into channel-selection
  DrabWeb · 2017-05-26 03:24:41 -03:00
  64016f9466
• CI fixes
  DrabWeb · 2017-05-26 03:10:36 -03:00
  5785715ad5
• Wave colours
  DrabWeb · 2017-05-26 02:55:25 -03:00
  28ee00109d
• Incorrect colour
  DrabWeb · 2017-05-26 02:49:04 -03:00
  8359f6ced0
• Browser - SearchableList
  DrabWeb · 2017-05-26 02:44:09 -03:00
  68377494f7
• Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls
  DrabWeb · 2017-05-26 02:32:01 -03:00
  5831da6978
• Cleanup
  DrabWeb · 2017-05-26 02:16:56 -03:00
  fc67582c3f
• Add displaying users
  DrabWeb · 2017-05-26 02:00:38 -03:00
  e19a4f5e6f
• Alpha on wrong object
  DrabWeb · 2017-05-26 01:34:30 -03:00
  5c0d0cb7e7
• Fix filter controls having margin when no controls given, add DisplayStyleControl to social, misc cleanups
  DrabWeb · 2017-05-26 01:32:20 -03:00
  2d3995b85c
• Add SocialOverlay to OsuGame
  DrabWeb · 2017-05-26 00:58:18 -03:00
  63313045d9
• Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser
  DrabWeb · 2017-05-26 00:54:03 -03:00
  8fca0fddb3
• Merge branch 'master' into musiccontroller-init-fix
  Dean Herbert · 2017-05-26 10:48:32 +09:00
  8ae7e84563
• update colour, width, icon and text
  Jorolf · 2017-05-25 20:25:59 +02:00
  a9658ec66f
• Updated framework
  MrTheMake · 2017-05-25 20:20:30 +02:00
  79e731ec2a
• Fixes
  MrTheMake · 2017-05-25 17:49:47 +02:00
  9de7e7bc40
• Merge pull request #857 from smoogipooo/triangles-particles

  Triangles particles

  Thomas Müller · 2017-05-25 16:30:03 +02:00
  e67a00f1f6
• Merge branch 'master' into triangles-particles
  Thomas Müller · 2017-05-25 16:02:47 +02:00
  061df80f23
• Merge pull request #858 from peppy/fix-initial-online-state

  Fix initial login state not being reflected in user panel

  Thomas Müller · 2017-05-25 16:02:18 +02:00
  fbeaf9610e
• Merge remote-tracking branch 'ppy/master' into triangles-particles
  Dean Herbert · 2017-05-25 22:47:03 +09:00
  4ecb3220dd
• Update framework
  Dean Herbert · 2017-05-25 22:46:50 +09:00
  ec8f49df0f
• Fix initial login state not being reflected in user panel
  Dean Herbert · 2017-05-25 22:43:33 +09:00
  9eec2edd30
• Merge pull request #855 from peppy/fix-nullref

  Fix potential nullref

  Thomas Müller · 2017-05-25 15:24:35 +02:00
  47be8b42aa
• A bit more cleanup.
  smoogipooo · 2017-05-25 22:09:02 +09:00
  c8cf387f5f
• Add back the concept of triangle ordering by size.
  smoogipooo · 2017-05-25 22:03:36 +09:00
  91dba765c2
• Cleanup.
  smoogipooo · 2017-05-25 21:33:49 +09:00
  86f6db2d31
• Make triangles use raw vertices instead of sprites.
  smoogipooo · 2017-05-25 21:33:04 +09:00
  97e57178a7
• Removed new line
  MrTheMake · 2017-05-25 14:19:04 +02:00
  c32d816f9c
• Fix initialize beatmap change animation of the music controller
  MrTheMake · 2017-05-25 14:16:51 +02:00
  9ea70b849b
• Fix display order regression
  Dean Herbert · 2017-05-25 19:47:18 +09:00
  1a255fdf48
• Fix potential nullref
  Dean Herbert · 2017-05-25 16:33:58 +09:00
  d7fa6933be
• Merge pull request #854 from peppy/fix-warning

  Attempt to fix inner scope warning

  Dan Balasescu · 2017-05-25 15:06:32 +09:00
  4d7d4b7389
• Attempt to fix inner scope warning
  Dean Herbert · 2017-05-25 14:47:25 +09:00
  be81346573
• Merge pull request #852 from DrabWeb/user-dropdown

  Update user dropdown

  Dean Herbert · 2017-05-25 14:38:13 +09:00
  7a369547fd
• Merge branch 'master' into user-dropdown
  Dean Herbert · 2017-05-25 14:32:49 +09:00
  df8c13c12d
• Merge pull request #824 from DrabWeb/drawable-multiplayer-room

  Drawable multiplayer room

  Dean Herbert · 2017-05-25 14:22:58 +09:00
  95c03b7086
• Merge branch 'master' into drawable-multiplayer-room
  Dean Herbert · 2017-05-25 13:58:05 +09:00
  012f60d59b
• Merge pull request #847 from peppy/early-activate-flashes

  Add missing early activation to menu flashes

  Dean Herbert · 2017-05-25 13:58:00 +09:00
  d1d7b8e1b1
• Merge branch 'master' into early-activate-flashes
  Dan Balasescu · 2017-05-25 13:51:08 +09:00
  4c5b2cda16
• Merge pull request #851 from peppy/make-spinners-easier

  Make spinners easier for now

  Dan Balasescu · 2017-05-25 13:47:26 +09:00
  2021e3cead
• CI fixes
  DrabWeb · 2017-05-24 22:39:07 -03:00
  e22eb1f205
• Trim whitespace
  DrabWeb · 2017-05-24 22:26:48 -03:00
  ec3c92fc3c
• Revert back header for login form, fix incorrect spacing on header
  DrabWeb · 2017-05-24 22:02:32 -03:00
  9cad344401
• Remove magic numbers
  DrabWeb · 2017-05-24 21:51:00 -03:00
  8e09b738b0
• Adjust dropdown layout
  DrabWeb · 2017-05-24 21:32:46 -03:00
  9b863f60ab
• Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem
  DrabWeb · 2017-05-24 21:09:18 -03:00
  efd4c57431
• Initial layout of user panel and user dropdown
  DrabWeb · 2017-05-24 19:44:48 -03:00
  b57a3f2056
• Unbind from room values when disposing
  DrabWeb · 2017-05-24 17:02:28 -03:00
  b803e40a7d
• Basic section management of userpage.
  Huo Yaoyuan · 2017-05-25 02:11:07 +08:00
  9bc1eece0a