15787 Commits

This Branch

This Branch

All Branches

• Fix enddate not being bound to
  smoogipoo · 2018-12-25 11:31:36 +09:00
  f79aa07d02
• Fix incorrect room status
  smoogipoo · 2018-12-25 11:24:46 +09:00
  e0e75c7339
• Merge remote-tracking branch 'origin/master' into timeshift-wip
  smoogipoo · 2018-12-22 23:23:21 +09:00
  02365ee5ba
• Merge pull request #3902 from smoogipoo/disable-chat-avatar-click

  Disable avatar clicks in chat tabs

  Dean Herbert · 2018-12-22 20:11:01 +09:00
  c6b37c45b5
• Merge pull request #3825 from peppy/user-registration

  User registration

  Dean Herbert · 2018-12-22 20:06:53 +09:00
  31da77ad62
• Disable avatar clicks in chat tabs
  smoogipoo · 2018-12-22 19:30:52 +09:00
  40db23ff4c
• Don't clear username on logout
  smoogipoo · 2018-12-22 17:54:19 +09:00
  30dbc36fce
• Test for null before loading
  smoogipoo · 2018-12-22 17:54:08 +09:00
  0757beb3b8
• Merge remote-tracking branch 'origin/master' into user-registration
  smoogipoo · 2018-12-22 17:19:28 +09:00
  d9b8df1595
• Merge pull request #3861 from peppy/improve-text-search

  Improve the way text search works at song select

  Dan Balasescu · 2018-12-22 16:52:33 +09:00
  6b3fb06b62
• Merge branch 'master' into improve-text-search
  Dan Balasescu · 2018-12-22 16:38:50 +09:00
  e6c197e9aa
• Merge pull request #3900 from peppy/add-page-tooltip

  Add tooltip text to results screen pages

  Dan Balasescu · 2018-12-22 16:38:45 +09:00
  ddb1467609
• Add tooltip text to results screen pages
  Dean Herbert · 2018-12-22 16:30:06 +09:00
  005c6ff40c
• Merge remote-tracking branch 'origin/master' into timeshift-wip
  smoogipoo · 2018-12-22 16:27:11 +09:00
  d00e280276
• Merge pull request #3899 from peppy/modular-results-screen

  Modular results screen

  Dean Herbert · 2018-12-22 16:26:37 +09:00
  b1eb543a50
• Fix post-merge issues
  smoogipoo · 2018-12-22 16:26:27 +09:00
  bb08bf10a0
• Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip

  # Conflicts:
  #	osu.Game/Screens/Multi/IMultiplayerScreen.cs
  #	osu.Game/Screens/Play/Player.cs
  #	osu.Game/Screens/Play/SoloResults.cs
  #	osu.Game/Screens/Ranking/IResultPageInfo.cs
  #	osu.Game/Screens/Ranking/ResultMode.cs
  #	osu.Game/Screens/Ranking/ResultModeButton.cs
  #	osu.Game/Screens/Ranking/ResultModeTabControl.cs
  #	osu.Game/Screens/Ranking/Results.cs

  smoogipoo · 2018-12-22 16:22:02 +09:00
  c2a00b84c7
• Merge remote-tracking branch 'upstream/master' into modular-results-screen
  Dean Herbert · 2018-12-22 16:20:39 +09:00
  7e97d37df5
• Quick rename
  Dean Herbert · 2018-12-22 16:20:29 +09:00
  a35d9178f0
• Merge pull request #3893 from peppy/rewrite-standalone-chat

  Make standalone chat reuse more code from main chat overlay

  Dean Herbert · 2018-12-22 16:16:54 +09:00
  080552d5be
• Merge branch 'master' into rewrite-standalone-chat
  Dan Balasescu · 2018-12-22 16:07:27 +09:00
  2c97409e2e
• Fix CI issues
  Dean Herbert · 2018-12-22 15:55:10 +09:00
  e7508cbd5e
• Clean-ups and renames
  Dean Herbert · 2018-12-22 15:51:00 +09:00
  e404a0bc20
• Rename variable
  smoogipoo · 2018-12-22 15:46:04 +09:00
  baed0ef3ba
• Split out more requests + responses
  smoogipoo · 2018-12-22 15:45:16 +09:00
  b9ec179713
• Split results screen to allow for extensibility
  smoogipoo · 2018-12-22 15:39:06 +09:00
  daa6292e08
• Merge remote-tracking branch 'origin/master' into timeshift-wip
  smoogipoo · 2018-12-22 15:36:36 +09:00
  0e9991b81a
• Merge pull request #3898 from peppy/leaderboard-modularity

  Leaderboard modularity

  Dean Herbert · 2018-12-22 15:36:12 +09:00
  e3308010c0
• Fix post-merge issues
  smoogipoo · 2018-12-22 15:35:22 +09:00
  ac0e6f8d42
• Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip

  # Conflicts:
  #	osu.Game/Online/Leaderboards/Leaderboard.cs
  #	osu.Game/Online/Leaderboards/LeaderboardScore.cs
  #	osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
  #	osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs

  smoogipoo · 2018-12-22 15:33:26 +09:00
  bdb6e03dfb
• Merge pull request #3896 from peppy/backwards-drawable-date

  Allow DrawableDate to be used to display future dates

  Dean Herbert · 2018-12-22 15:29:05 +09:00
  29fd1719da
• Merge pull request #3895 from peppy/default-osu-keys

  Change osu! default keys back to Z/X

  Dean Herbert · 2018-12-22 15:28:02 +09:00
  a15091be49
• Move protected method down
  Dean Herbert · 2018-12-22 15:23:32 +09:00
  52c6d5bfd4
• Reduce generic-ness
  Dean Herbert · 2018-12-22 15:20:35 +09:00
  787e65c3c5
• Make RoomScore derive ScoreInfo
  smoogipoo · 2018-12-22 15:17:35 +09:00
  3570c35d7f
• Merge pull request #3897 from peppy/clickable-avatars

  Clickable avatars

  Dan Balasescu · 2018-12-22 15:01:58 +09:00
  9391b92e1a
• Adjust styling of disabled settings
  smoogipoo · 2018-12-22 15:00:35 +09:00
  6afd2f7263
• Implement testcase for room settings
  smoogipoo · 2018-12-22 14:48:15 +09:00
  34fc740e1f
• Remove unnecessary using
  Dean Herbert · 2018-12-22 14:45:35 +09:00
  23259b295c
• Separate out Leaderboard into BeatmapLeaderboard
  smoogipoo · 2018-12-22 14:44:36 +09:00
  e657f13c15
• Fix username not displaying correctly in overlay
  Dean Herbert · 2018-12-22 14:40:55 +09:00
  870d843fff
• Mate RoomSettingsOverlay fill height
  smoogipoo · 2018-12-22 14:40:10 +09:00
  b82bb0ea28
• Allow channel manager and osugame to be null
  smoogipoo · 2018-12-22 14:38:46 +09:00
  09d7dc73dc
• Rework+fix TestCaseMultiHeader
  smoogipoo · 2018-12-22 14:30:08 +09:00
  dbd391825a
• Add click to avatar
  smoogipoo · 2018-12-22 14:23:53 +09:00
  f47ac35522
• Add simple (non-automated) test
  Dean Herbert · 2018-12-22 14:21:21 +09:00
  621480af02
• Allow roommanager to be null
  smoogipoo · 2018-12-22 14:14:14 +09:00
  7191233be8
• Decouple header from matchscreen
  smoogipoo · 2018-12-22 14:12:27 +09:00
  21cfe5a3e6
• Decouple match info from match screen
  smoogipoo · 2018-12-22 14:08:00 +09:00
  c06cf5d379
• Fix negative dates, and time moving in opposite direction
  smoogipoo · 2018-12-22 14:06:50 +09:00
  d28c754256