19539 Commits

This Branch

This Branch

All Branches

• Merge pull request #2378 from peppy/fix-line-endings

  Normalize line endings to LF

  Dan Balasescu · 2018-04-13 19:47:30 +09:00
  632befb210
• Use the already existent RightMouseScrollbar field
  tgi74000 · 2018-04-13 11:32:33 +02:00
  1a2b1d4c98
• Normalize all the line endings
  Dean Herbert · 2018-04-13 18:26:38 +09:00
  32a74f95a5
• Add new gitattributes
  Dean Herbert · 2018-04-13 18:19:38 +09:00
  f99503b60c
• Merge pull request #2332 from LittleEndu/alt-eagerselect

  Make beatmap carousel select a random beatmap when there was no previous selection

  Dean Herbert · 2018-04-13 18:11:45 +09:00
  5f020074e0
• 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
• Merge remote-tracking branch 'upstream/master' into alt-eagerselect
  Endrik Tombak · 2018-04-13 11:55:35 +03:00
  d9f587edff
• Make TakeScreenshotAsync await on the internal task
  smoogipoo · 2018-04-13 17:51:09 +09:00
  0235eba9de
• Don't expose CursorOverrideContainer via DI + internalise access
  smoogipoo · 2018-04-13 17:36:38 +09:00
  2e5bbe7074
• Reword options item to include "screenshot"
  smoogipoo · 2018-04-13 17:30:02 +09:00
  826a8552e5
• Instantly hide cursor for required frames while taking screenshot
  smoogipoo · 2018-04-13 17:27:10 +09:00
  ebe36f0612
• Merge pull request #2394 from UselessToucan/beatmap_set_overlay_difficulties_ordering

  Fix incorrect ordering of difficulties retrieved from API

  Dean Herbert · 2018-04-13 17:09:48 +09:00
  06efddd4b4
• Merge branch 'master' into beatmap_set_overlay_difficulties_ordering
  Dean Herbert · 2018-04-13 16:48:43 +09:00
  f7c50dee65
• Merge pull request #2390 from Joehuu/lowercase-back-button

  Lowercase back button

  Dan Balasescu · 2018-04-13 14:25:23 +09:00
  0871c16075
• Merge branch 'master' into lowercase-back-button
  Dan Balasescu · 2018-04-13 14:14:18 +09:00
  2699ad8c89
• Merge pull request #2396 from Joehuu/remove-composer-from-player-loader

  Remove composer from player loader

  Dean Herbert · 2018-04-13 13:08:13 +09:00
  68d865bbd1
• Remove composer from player loader
  Joehu · 2018-04-12 16:46:46 -07:00
  128446e51d
• 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
• Lowercase back button
  Joehu · 2018-04-12 08:26:25 -07:00
  61d6f52a53
• Remove unused using directives
  Joehu · 2018-04-12 08:13:24 -07:00
  463b189d2f
• Rename rankStatus to searchCategory
  Joehu · 2018-04-12 08:03:19 -07:00
  df4b64effc
• Merge pull request #2372 from smoogipoo/remove-gamefield-test

  Remove TestCaseGamefield

  Dean Herbert · 2018-04-12 23:50:16 +09:00
  ea24006a66
• 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
• Merge branch 'master' into remove-gamefield-test
  Dean Herbert · 2018-04-12 21:37:04 +09:00
  1e6244afe1
• Merge pull request #2356 from smoogipoo/editor-clock

  Move seeking logic into a custom editor clock

  Dean Herbert · 2018-04-12 21:36:50 +09:00
  3de460f84c
• Fix smoogipoo's comments
  Dean Herbert · 2018-04-12 21:17:17 +09:00
  127f0d7b01
• Add some missing xmldoc
  Dean Herbert · 2018-04-12 21:04:45 +09:00
  0ca703beaa
• Merge branch 'master' into editor-clock
  Dean Herbert · 2018-04-12 19:29:58 +09:00
  b50bad0072
• Merge pull request #2376 from peppy/high-level-xmldoc

  Add xmldoc to some high-level classes to explain their separation

  Dean Herbert · 2018-04-12 19:26:31 +09:00
  ce01fd245a
• Merge branch 'master' into high-level-xmldoc
  Dean Herbert · 2018-04-12 19:05:10 +09:00
  3ddf00ee74
• Merge pull request #2387 from smoogipoo/oauth-token-logging

  Fix OAuth token not saving often enough

  Dean Herbert · 2018-04-12 19:04:48 +09:00
  47a78ffb5d
• Rename RankStatus to BeatmapSearchCategory
  Joehu · 2018-04-11 22:50:39 -07:00
  461e063f19
• Move string-token property to OAuth
  smoogipoo · 2018-04-12 14:30:28 +09:00
  baae4427ff
• Save OAuth token to config on every token change
  smoogipoo · 2018-04-12 14:23:49 +09:00
  e007365916
• Remove start/stop clock logic

  Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.

  smoogipoo · 2018-04-12 14:06:36 +09:00
  6e35910419
• Move back to DI-ing adjustable clock into SummaryTimeline
  smoogipoo · 2018-04-12 13:37:02 +09:00
  a2484fbf56
• Merge master into editor-clock
  smoogipoo · 2018-04-12 13:35:53 +09:00
  fbc50d6030
• Merge branch 'master' into high-level-xmldoc
  Dan Balasescu · 2018-04-12 12:59:37 +09:00
  9e2494c57b
• Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
  DrabWeb · 2018-04-11 16:22:27 -03:00
  0bede52381
• Remove not needed using
  miterosan · 2018-04-11 21:09:38 +02:00
  b997f0f3fa
• Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
  miterosan · 2018-04-11 20:54:08 +02:00
  4927abfde5
• Trim whitespaces
  miterosan · 2018-04-11 20:53:35 +02:00
  a5e0311253
• 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
• Actually use the fact that ChannelManager is now a component
  miterosan · 2018-04-11 20:37:51 +02:00
  c2020742b2
• Fix code sanity
  miterosan · 2018-04-11 20:31:16 +02:00
  2056258def