19539 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-import-crash
  Dean Herbert · 2019-05-07 12:18:41 +09:00
  64bc0f958b
• Fix beatmap import crashing during room creation
  smoogipoo · 2019-05-07 12:14:57 +09:00
  f26a1cff6c
• Merge pull request #4703 from peppy/profile-details-animation

  Add animation when collapsing or expanding the profile details section

  Dan Balasescu · 2019-05-07 12:13:59 +09:00
  5be8adcfcf
• Fix merge
  David Zhao · 2019-05-07 12:07:45 +09:00
  abc163fa36
• Merge remote-tracking branch 'upstream/master' into flashlight-dim
  David Zhao · 2019-05-07 12:04:58 +09:00
  732b0b22a3
• Merge branch 'master' into profile-details-animation
  Dan Balasescu · 2019-05-07 11:44:22 +09:00
  9d3f6a716a
• Merge pull request #4710 from peppy/skip-matches-stable

  Improve skip boundary logic to be closer to expectations

  Dan Balasescu · 2019-05-07 11:05:14 +09:00
  437d7a5cf3
• Merge remote-tracking branch 'upstream/master' into user-status-wiring
  Lucas A · 2019-05-06 18:39:58 +02:00
  e7afaeaa4d
• Move OsuScreen activity logic to setUserActivity()
  Lucas A · 2019-05-06 18:37:21 +02:00
  59b8da5c77
• Fix slider border not reverting to default color
  Joehu · 2019-05-05 22:43:03 -07:00
  8ef6a745f7
• Make appveyor happy.
  Lucas A · 2019-05-05 21:32:23 +02:00
  a50bbf7f42
• Fix user status related unit tests
  Lucas A · 2019-05-05 21:11:52 +02:00
  3d8b56fe57
• Remove hackery from unit tests.
  Lucas A · 2019-05-05 21:01:35 +02:00
  8beb2f6e90
• Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
  Lucas A · 2019-05-05 20:55:42 +02:00
  d5d31282e5
• Make UserPanel show current user activity when

  user status is online.

  Lucas A · 2019-05-05 20:51:55 +02:00
  88b8afbb6a
• Rework OsuScreen user activity logic
  Lucas A · 2019-05-05 20:26:56 +02:00
  fa986bb5e9
• Added UserActivity class holding information about the current activity for the local user
  Lucas A · 2019-05-05 20:07:55 +02:00
  b216635488
• Improve skip boundary logic to be closer to expectations

  Supersedes #4693.
  Closes #4676.

  Dean Herbert · 2019-05-05 20:20:41 +09:00
  7fdc79dd68
• Use more local bindables
  Dean Herbert · 2019-05-04 17:53:17 +09:00
  3e3f12f277
• Fix instant pausing when game becomes inactive

  Resolves #4685.

  Dean Herbert · 2019-05-04 14:54:29 +09:00
  b9a39fb788
• Add animation when collapsing or expanding the profile details section
  Dean Herbert · 2019-05-04 11:03:18 +09:00
  0fa0271878
• Fix hidden/expanded centre profile header information (#4696)

  Fix hidden/expanded centre profile header information

  Dean Herbert · 2019-05-04 11:01:32 +09:00
  2019.504.0 f05471aa18
• Merge branch 'master' into switch-centre-profile-info
  Joseph Madamba · 2019-05-03 11:27:52 -07:00
  53accbfce1
• Merge branch 'master' into refactor-select-footer
  Dean Herbert · 2019-05-03 21:46:41 +09:00
  41ab82cdc3
• use SongSelect's SelectedMods property to ensure it exists
  LeNitrous · 2019-05-03 16:51:33 +08:00
  31341bfeb1
• fixes to FooterButtonRandom
  LeNitrous · 2019-05-03 16:38:15 +08:00
  009eaa647a
• Merge pull request #4701 from peppy/fix-mod-equality

  Fix mod equality checks not working as intended

  Dan Balasescu · 2019-05-03 12:08:24 +09:00
  2b57235e0b
• Fix mod equality checks not working as intended
  Dean Herbert · 2019-05-03 10:09:47 +09:00
  6bdaca1e3b
• Merge remote-tracking branch 'upstream/master' into user-status-wiring
  Lucas A · 2019-05-02 21:36:28 +02:00
  a4a2ce5ec0
• Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
  Lucas A · 2019-05-02 20:51:19 +02:00
  5d4aa5a12e
• Split out setUserStatus() logic to multiple lines. +

  Make UserStatusDoNotDisturb inherit from UserStatus

  Lucas A · 2019-05-02 19:44:07 +02:00
  84b41b3886
• Add number sign to centre info rankings
  Joehu · 2019-05-02 03:47:20 -07:00
  ac31a9640a
• Switch hidden/expanded centre profile header information
  Joehu · 2019-05-02 03:37:15 -07:00
  c6992bd6f9
• Implement AdjustRank and Hidden mod grades (S+ and SS+) (#4655)

  Implement AdjustRank and Hidden mod grades (S+ and SS+)
  
  Co-authored-by: Dean Herbert <pe@ppy.sh>

  Dean Herbert · 2019-05-02 14:19:20 +09:00
  2019.502.0 bd0704c575
• Improve xmldoc slightly
  Dean Herbert · 2019-05-02 14:03:58 +09:00
  6a4dc5e25c
• Merge branch 'master' into sh-xh-grading-2
  Dean Herbert · 2019-05-02 13:27:12 +09:00
  1817f7bc12
• Merge pull request #4694 from peppy/update-framework

  Update framework

  Dean Herbert · 2019-05-02 13:13:15 +09:00
  975f6e2c5d
• Add number sign in front of profile rankings (#4691)

  Add number sign in front of profile rankings
  
  Co-authored-by: jorolf <jorolf@gmx.de>

  Dean Herbert · 2019-05-02 12:55:25 +09:00
  d9e92e12f4
• Update framework
  Dean Herbert · 2019-05-02 12:53:59 +09:00
  015b5cecb5
• Add number sign inside ToString

  Co-Authored-By: Joehuu <madamba.joehu@outlook.com>

  jorolf · 2019-05-01 17:55:30 -07:00
  b61807da40
• Fix tests failing
  Lucas A · 2019-05-01 19:20:18 +02:00
  e02def58f3
• Check for null instead of not null
  Joehu · 2019-04-30 22:07:06 -07:00
  6b7397b9cf
• Fix wrong check
  Joehu · 2019-04-30 21:54:25 -07:00
  9b2d5727cd
• Use similar check used on tooltip
  Joehu · 2019-04-30 21:51:56 -07:00
  1408513ebd
• Add number sign in front of profile rankings
  Joehu · 2019-04-30 20:47:44 -07:00
  3cd6ccfc3d
• Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay
  Lucas A · 2019-04-30 21:40:44 +02:00
  a3541339f5
• fix xmldoc
  iiSaLMaN · 2019-04-30 19:08:31 +03:00
  ddd9262384
• Merge branch 'master' into sh-xh-grading-2
  iiSaLMaN · 2019-04-30 18:55:35 +03:00
  3b03ca802a
• Pass Rank.Value instead

  Passing Rank.Value along each iteration instead of calculating.

  iiSaLMaN · 2019-04-30 18:49:31 +03:00
  148f4c4ce0
• fix comment
  iiSaLMaN · 2019-04-30 18:44:31 +03:00
  e0abd0b2c1