24822 Commits

This Branch

This Branch

All Branches

• 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 solution
  Shane Woolcock · 2018-12-22 17:12:43 +10:30
  18abff3ac0
• 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 branch 'master' into samah-ios
  Shane Woolcock · 2018-12-22 16:44:15 +10:30
  56196e17dd
• 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
• Make DrawableDate adjustable
  smoogipoo · 2018-12-22 14:06:44 +09:00
  86ce0b5519
• Merge remote-tracking branch 'Joehuu/master' into timeshift-wip

  # Conflicts:
  #	osu.Game/Screens/Play/HUD/ModDisplay.cs

  smoogipoo · 2018-12-22 14:02:45 +09:00
  d93421b796
• Cleanup bindable handling
  smoogipoo · 2018-12-22 14:01:06 +09:00
  f1a9a352fc
• Split requests/responses into separate files
  smoogipoo · 2018-12-22 12:50:37 +09:00
  1cb69c3478
• Move RoomManager to multiplayer screen
  smoogipoo · 2018-12-22 12:45:36 +09:00
  dd0c04ea36
• Refactor for readability + performance
  smoogipoo · 2018-12-22 09:56:33 +09:00
  c848c83d0d
• Change osu! default keys back to Z/X

  A/S was no better as far as keyboard layout agnostic-ness. And people are confused if we change the defaults. Need to take a step back and reassess.

  Dean Herbert · 2018-12-22 09:49:09 +09:00
  f0dfc75bb2
• Merge pull request #3894 from Poyo-SSB/fix-hardrock-sliders

  Fix extra hard-rock flipping for sliders

  Dean Herbert · 2018-12-22 09:45:36 +09:00
  c1d316d06e
• Implement vinxis/xexxar's adjustments
  smoogipoo · 2018-12-22 09:31:30 +09:00
  8546fedd4f
• Fix extra hard-rock flipping for sliders
  Poyo · 2018-12-21 16:08:08 -08:00
  08d7c2df70
• Adjust with latest rebalancings
  smoogipoo · 2018-12-21 22:52:27 +09:00
  be476c58d7
• Remove redundant newline
  Dean Herbert · 2018-12-21 19:01:19 +09:00
  396caae0a9
• Seed the results screen
  smoogipoo · 2018-12-21 18:37:33 +09:00
  7e9cc4e876
• Add room leaderboard to results
  smoogipoo · 2018-12-21 18:22:13 +09:00
  4149734f89
• Make standalone chat reuse more code from main chat overlay
  Dean Herbert · 2018-12-21 17:54:12 +09:00
  81104f4803