6229 Commits

This Branch

This Branch

All Branches

• Merge pull request #1009 from peppy/fix-track-rotation

  Fix track rotation

  Dan Balasescu · 2017-07-14 19:48:43 +10:00
  aa15d369c3
• Merge branch 'master' into fix-track-rotation
  Dan Balasescu · 2017-07-14 19:38:48 +10:00
  fa0c0e3b48
• Merge pull request #1016 from peppy/settings-improvements

  Settings improvements

  Dan Balasescu · 2017-07-14 19:32:08 +10:00
  68d1e920fd
• Merge branch 'master' into fix-track-rotation
  Dan Balasescu · 2017-07-14 19:25:54 +10:00
  c13dc943f8
• Merge branch 'master' into settings-improvements
  Dan Balasescu · 2017-07-14 19:22:45 +10:00
  a6d917285a
• Merge pull request #1013 from peppy/right-mouse-scrollbar

  Add support for right mouse absolute scrolling (when enabled)

  Dan Balasescu · 2017-07-14 19:22:29 +10:00
  cb213a5f0f
• Merge branch 'master' into right-mouse-scrollbar
  Dan Balasescu · 2017-07-14 19:15:00 +10:00
  3914b3ba13
• Make comment different
  Dean Herbert · 2017-07-14 18:08:47 +09:00
  b7612af20c
• Use button boundaries to decide when to expand sidebar
  Dean Herbert · 2017-07-14 17:57:01 +09:00
  9dba363b08
• Merge branch 'master' into settings-improvements
  Dan Balasescu · 2017-07-14 18:43:08 +10:00
  3702d4b921
• Merge pull request #978 from EVAST9919/mods_overlay_fix

  Hide "Unranked" text in ModDisplay if play is ranked

  Dean Herbert · 2017-07-14 17:36:46 +09:00
  36594afee3
• Merge branch 'master' into mods_overlay_fix
  Dean Herbert · 2017-07-14 17:31:52 +09:00
  95a40e39ec
• Merge branch 'master' into settings-improvements
  Dean Herbert · 2017-07-14 17:27:09 +09:00
  b957bca4c5
• Merge pull request #970 from DrabWeb/drawable-room-update

  DrawableRoom design update

  Dean Herbert · 2017-07-14 15:35:44 +09:00
  e433684899
• Merge branch 'master' into drawable-room-update
  Dean Herbert · 2017-07-14 15:29:27 +09:00
  3aeed86392
• Merge pull request #1012 from DrabWeb/medal-splash

  Medal splash

  Dean Herbert · 2017-07-14 14:47:24 +09:00
  e2223a24f6
• Formatting
  Dean Herbert · 2017-07-14 14:40:50 +09:00
  bce4b838d8
• Move async loading to a higher level to simplify logic
  Dean Herbert · 2017-07-14 14:39:15 +09:00
  133bcdec7a
• Remove unnecessary alpha/alwayspresent changes
  Dean Herbert · 2017-07-14 14:30:35 +09:00
  980fb18ed6
• Nest delays and implement IStateful, allowing for flushing on early dismiss

  Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.

  Dean Herbert · 2017-07-14 13:25:31 +09:00
  20052b060c
• Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash
  Dean Herbert · 2017-07-14 09:46:36 +09:00
  ab5341eadc
• Merge pull request #1018 from Nabile-Rahmani/skip-button-fix

  Make the skip button clickable only once.

  Dean Herbert · 2017-07-14 09:45:16 +09:00
  e3ff79fdd1
• Add comment
  Dean Herbert · 2017-07-14 09:39:40 +09:00
  6c9219856d
• Add missing access modifier
  Dean Herbert · 2017-07-14 07:05:39 +09:00
  b1d447bf71
• Add missing licence header
  Dean Herbert · 2017-07-14 06:43:33 +09:00
  bfa6a9aa4e
• Use Enabled instead of a private field.
  Nabile Rahmani · 2017-07-13 23:35:19 +02:00
  840cc918ea
• Update framework
  Dean Herbert · 2017-07-14 06:24:07 +09:00
  a6ac61f735
• Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
  Dean Herbert · 2017-07-14 06:23:07 +09:00
  ce204b8e7b
• Make the skip button clickable only once.
  Nabile Rahmani · 2017-07-13 21:59:17 +02:00
  8014cd55a2
• Contract sidebar on click

  Also makes queueing of expand more correct.

  Dean Herbert · 2017-07-13 17:09:12 +09:00
  2ff92ac25a
• Correct offset settings vertically based on toolbar visibility
  Dean Herbert · 2017-07-13 17:09:12 +09:00
  939e167d6a
• Fix settings not offsetting scroll operations by fixed header content
  Dean Herbert · 2017-07-13 17:09:12 +09:00
  f4fd263671
• Sidebar now pushes full settings out further
  Dean Herbert · 2017-07-13 17:09:12 +09:00
  8460e29bcb
• Merge pull request #1003 from Jorolf/ruleset-settings

  Add ruleset settings

  Dean Herbert · 2017-07-13 17:08:51 +09:00
  61c45b0b44
• Move to UI namespace
  Dean Herbert · 2017-07-13 15:44:42 +09:00
  d3f5de9bf9
• Fix incorrect header
  Dean Herbert · 2017-07-13 15:43:18 +09:00
  25344d2345
• Merge remote-tracking branch 'upstream/master' into ruleset-settings
  Dean Herbert · 2017-07-13 15:35:53 +09:00
  fc28617099
• Merge pull request #1015 from peppy/redundant-empty-arglist

  Remove all unnecessary parenthesis where object initialisers are used

  Dan Balasescu · 2017-07-13 15:56:58 +09:30
  ed42f50058
• Update framework
  Dean Herbert · 2017-07-13 15:19:47 +09:00
  fcfd8b5465
• Remove all unnecessary parenthesis where object initialisers are used

  Enforces at CI.

  Dean Herbert · 2017-07-13 15:11:33 +09:00
  de46f3ab07
• Add default status colour
  Dean Herbert · 2017-07-13 14:55:19 +09:00
  03e4b2a599
• Hide the login overlay when the user panel container by it is clicked
  Dean Herbert · 2017-07-13 14:46:17 +09:00
  b13e8599f1
• Avoid storing locals in UserPanel.

  Also make clickable region more correct.

  Dean Herbert · 2017-07-13 14:34:51 +09:00
  d1a5a042d7
• Don't lock scroll position of SectionsContainer header elements on negative scroll

  Feels better in all cases.

  Dean Herbert · 2017-07-13 14:24:41 +09:00
  b79e309c2f
• Vertically center "coming soon" text
  Dean Herbert · 2017-07-13 14:24:08 +09:00
  3c7cd97d42
• Adjust padding slightly
  Dean Herbert · 2017-07-13 14:23:52 +09:00
  4cf409ab35
• Move sections to own namespace
  Dean Herbert · 2017-07-13 13:53:45 +09:00
  c7a13740f9
• Formatting
  Dean Herbert · 2017-07-13 13:52:40 +09:00
  c02a85bc4a
• Merge remote-tracking branch 'upstream/master' into profile

  # Conflicts:
  #	osu.Game/Graphics/Containers/SectionsContainer.cs

  Dean Herbert · 2017-07-13 13:44:21 +09:00
  3a4150c6c3
• CI fixes, switch RoomInspector to use BeatmapSetCover.
  DrabWeb · 2017-07-13 01:24:59 -03:00
  b196b1d3c6