61410 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into playlist-commit
  Dean Herbert · 2017-05-12 20:39:50 +09:00
  24db423c4f
• Merge pull request #743 from peppy/fix-beatmap-population

  Fix ruleset not always getting populated in a WorkingBeatmap

  Dean Herbert · 2017-05-12 20:38:45 +09:00
  cf9b121634
• Merge branch 'master' into fix-beatmap-population
  Dean Herbert · 2017-05-12 20:30:06 +09:00
  e096dd8126
• Merge pull request #728 from Jorolf/new-option-search

  add search box and the ability to search

  Dean Herbert · 2017-05-12 20:29:53 +09:00
  a9b8e57be8
• Merge branch 'master' into new-option-search
  Dan Balasescu · 2017-05-12 20:22:11 +09:00
  815379646c
• Merge branch 'master' into fix-beatmap-population
  Dan Balasescu · 2017-05-12 20:15:10 +09:00
  d60da82c4c
• Merge pull request #741 from peppy/chat-design-update

  Update chat design

  Dan Balasescu · 2017-05-12 20:10:52 +09:00
  4c2ec046f0
• Remove unnecessary usings
  Dean Herbert · 2017-05-12 20:06:38 +09:00
  6c117f15af
• Fix ruleset not always getting populated in a WorkingBeatmap
  Dean Herbert · 2017-05-12 20:05:44 +09:00
  a9b3f74218
• Update framework
  Dean Herbert · 2017-05-12 19:58:31 +09:00
  fec91d4de1
• Merge branch 'master' into chat-design-update
  Dean Herbert · 2017-05-12 19:57:57 +09:00
  d3770d8395
• Move SearchTextBox to better namespace

  Is being used in multiple places now.

  Dean Herbert · 2017-05-12 19:57:06 +09:00
  d2e066ca35
• Merge pull request #740 from peppy/resizable-chat

  Resizable chat

  Dan Balasescu · 2017-05-12 19:52:41 +09:00
  a27f92a4fb
• Merge branch 'master' into resizable-chat
  Dan Balasescu · 2017-05-12 19:46:11 +09:00
  a5ff3f4d32
• Merge pull request #739 from peppy/multiple-chat-channels

  Multiple chat channels

  Dan Balasescu · 2017-05-12 19:41:28 +09:00
  65504e7cd4
• Merge branch 'master' into multiple-chat-channels
  Dan Balasescu · 2017-05-12 19:35:12 +09:00
  8ec79f788a
• Make tab background opaque when chat is fullscreen
  Dean Herbert · 2017-05-12 19:15:04 +09:00
  bc5bcfa66a
• Move chat into main content

  Also changes the way parallax is applied to OsuScreens game-wide.

  Dean Herbert · 2017-05-12 19:03:21 +09:00
  cf239f4d9c
• Merge pull request #682 from EVAST9919/percentage

  Song Progress Info

  Dean Herbert · 2017-05-12 16:28:20 +09:00
  181a5a8a61
• removed useless booleans, using nullables instead
  EVAST9919 · 2017-05-12 10:16:31 +03:00
  9a04069123
• Second design update pass.
  Dean Herbert · 2017-05-12 15:39:00 +09:00
  dbf60d24bf
• Initial design update pass
  Dean Herbert · 2017-05-12 15:38:55 +09:00
  6ea65009c4
• Move drawable chat related classes to better namespace
  Dean Herbert · 2017-05-12 15:38:51 +09:00
  c4a93cbc85
• Make chat resizable via drag, save user set size
  Dean Herbert · 2017-05-12 15:36:37 +09:00
  9cf4998701
• Add framework fix.
  Dean Herbert · 2017-05-12 14:24:32 +09:00
  1420aa406c
• Applied suggested changes
  EVAST9919 · 2017-05-12 08:12:34 +03:00
  34b4efc4e9
• CI Fixes
  Dean Herbert · 2017-05-12 13:25:50 +09:00
  f248efb01f
• Simplified logic
  EVAST9919 · 2017-05-12 01:48:28 +03:00
  79ed92a0d7
• Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
  EVAST9919 · 2017-05-11 22:22:57 +03:00
  1f34cec5ce
• Support read-only channels, post to correct channel.

  Also cache drawable channels better.

  Dean Herbert · 2017-05-11 23:51:26 +09:00
  ffa59c6cb3
• Add basic hard-coded inefficient multi-channel support.
  Dean Herbert · 2017-05-11 23:10:48 +09:00
  a77049213d
• Allow OsuTabControl to handle non-enum types.
  Dean Herbert · 2017-05-11 23:10:19 +09:00
  f044b95ce8
• Resharper is too smart.
  smoogipooo · 2017-05-11 22:17:10 +09:00
  0597a95db0
• Merge branch 'master' into mania-timing-sections
  Dan Balasescu · 2017-05-11 22:02:58 +09:00
  f5399f7f2b
• Merge pull request #737 from peppy/general-fixes

  Update framework

  Dan Balasescu · 2017-05-11 22:02:00 +09:00
  f11ffb99ac
• General cleanups.
  smoogipooo · 2017-05-11 22:01:37 +09:00
  d57bb7e5fd
• Fix up todo.
  smoogipooo · 2017-05-11 21:57:28 +09:00
  7b49ed1419
• Merge remote-tracking branch 'origin/master' into mania-timing-sections
  smoogipooo · 2017-05-11 21:48:20 +09:00
  9477024e7b
• Merge branch 'master' into general-fixes
  Dan Balasescu · 2017-05-11 21:28:54 +09:00
  02532e1dc8
• Merge pull request #736 from peppy/oauth-fixes

  OAuth fixes

  Dan Balasescu · 2017-05-11 21:26:28 +09:00
  98e5b64d3f
• Update framework
  Dean Herbert · 2017-05-11 21:25:43 +09:00
  9a1c662d1f
• Merge branch 'master' into oauth-fixes
  Dan Balasescu · 2017-05-11 21:07:13 +09:00
  08f5cbca51
• Merge branch 'master' into new-option-search
  Dean Herbert · 2017-05-11 21:04:37 +09:00
  ca32caf9e4
• Merge pull request #735 from peppy/general-fixes

  Fix broken test cases, remove some recursive lookup methods.

  Dan Balasescu · 2017-05-11 21:03:27 +09:00
  c5f6a1ec93
• Remove unused class.
  smoogipooo · 2017-05-11 20:05:11 +09:00
  f764ed8903
• Make the playfield work in TestCaseGamefield.
  smoogipooo · 2017-05-11 20:04:45 +09:00
  0739a76497
• Make the playfield mask for now.
  smoogipooo · 2017-05-11 20:04:28 +09:00
  ee219c18db
• Make notes scroll with beat length.
  smoogipooo · 2017-05-11 19:57:24 +09:00
  6a79c8b66c
• Fix typo
  Dean Herbert · 2017-05-11 19:49:28 +09:00
  c3d2cdd2f2
• Add thread-safety on access token validation logic.
  Dean Herbert · 2017-05-11 19:39:01 +09:00
  4e881644f6