11828 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
  Dean Herbert · 2018-04-18 19:46:59 +09:00
  bd834dd487
• Merge pull request #2366 from tgi74/ctb_hr_mangling

  Add HardRock position mangling for CatchTheBeat

  Dean Herbert · 2018-04-18 16:57:16 +09:00
  69a91c610d
• Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling
  Dean Herbert · 2018-04-18 16:46:02 +09:00
  d307b8dc2e
• Merge pull request #2415 from smoogipoo/better-test-case

  Update OsuTestCase with framework testing changes

  Dean Herbert · 2018-04-18 15:56:09 +09:00
  0a292a6ab4
• Update framework
  smoogipoo · 2018-04-18 15:32:21 +09:00
  560fcfc661
• Update with framework changes
  smoogipoo · 2018-04-18 15:12:48 +09:00
  d5ce618d9b
• Merge pull request #2377 from Joehuu/fix-rank-status

  Fix qualified category on rank status

  Dan Balasescu · 2018-04-18 14:33:03 +09:00
  bc3150776e
• Merge branch 'master' into fix-rank-status
  Dan Balasescu · 2018-04-18 14:19:53 +09:00
  533b7d907d
• Update framework
  smoogipoo · 2018-04-18 14:18:56 +09:00
  68a13a5fb5
• Merge pull request #2381 from peppy/app-manifest

  Add back app.manifest

  Dan Balasescu · 2018-04-18 14:18:13 +09:00
  f8a9d9d4fe
• Merge remote-tracking branch 'origin/master' into fix-rank-status

  # Conflicts:
  #	osu.Game/Beatmaps/RankStatus.cs
  #	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
  #	osu.Game/Overlays/Direct/FilterControl.cs
  #	osu.Game/Overlays/DirectOverlay.cs

  smoogipoo · 2018-04-18 14:16:58 +09:00
  ffbe6f2e37
• Merge branch 'master' into app-manifest
  Dean Herbert · 2018-04-18 14:10:03 +09:00
  c32ab7d08c
• Merge pull request #2400 from tgi74/replay_mods

  Add support for replay mods

  Dean Herbert · 2018-04-18 14:09:54 +09:00
  919f2acccd
• Merge branch 'master' into replay_mods
  Dan Balasescu · 2018-04-18 14:00:32 +09:00
  33f4f57ee3
• Merge branch 'master' into app-manifest
  Dan Balasescu · 2018-04-18 13:59:47 +09:00
  0e640b432d
• Merge pull request #2408 from smoogipoo/fix-leaderboard-nullref

  Fix various leaderboard data races

  Dean Herbert · 2018-04-18 13:48:14 +09:00
  2b83d49862
• Merge branch 'master' into fix-leaderboard-nullref
  Dean Herbert · 2018-04-18 12:05:13 +09:00
  64f47daff4
• Remove unnecessary score nulling (already happens in PlaceholderState_Set)
  Dean Herbert · 2018-04-18 11:58:55 +09:00
  188c8ce1e7
• Add documentation explaining intertwining logic
  Dean Herbert · 2018-04-18 11:57:06 +09:00
  a27f39a555
• Merge pull request #2407 from jorolf/profile-badges

  Add badges to ProfileHeader

  Dean Herbert · 2018-04-18 11:53:15 +09:00
  f678ce1bf5
• Simplify child definition
  Dean Herbert · 2018-04-18 11:42:55 +09:00
  a827fb51bc
• Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges
  jorolf · 2018-04-16 19:37:52 +02:00
  ddd59382e2
• add new test case and fix rotation not working
  jorolf · 2018-04-16 19:22:11 +02:00
  de9f15f620
• make hover lost transition instant (similar to hover transition)
  jorolf · 2018-04-16 18:52:09 +02:00
  046412f962
• add a DRAWABLE_BADGE_SIZE const and center badges
  jorolf · 2018-04-16 18:51:35 +02:00
  2a18b4c3f8
• badge_size is the actual badge size now

  also fixes rotateBadges bug when hover is lost

  jorolf · 2018-04-16 18:27:18 +02:00
  af0c49cca8
• CI: unused directive
  tgi74000 · 2018-04-16 14:25:43 +02:00
  1feba556eb
• Review changes
  tgi74000 · 2018-04-16 14:14:40 +02:00
  9b36cf2066
• Remove extra unneded safety
  smoogipoo · 2018-04-16 17:48:49 +09:00
  9af6ef1864
• Fix leaderboard placeholder sometimes disappearing indefinitely
  smoogipoo · 2018-04-16 17:39:55 +09:00
  b9220a1e29
• Fix various data races causing crashes or incorrect leaderboard states
  smoogipoo · 2018-04-16 17:39:03 +09:00
  1b9d54a6ad
• Merge branch 'master' into profile-badges
  jorolf · 2018-04-15 23:50:52 +02:00
  af755b4a90
• add badges to ProfileHeader
  jorolf · 2018-04-15 23:49:45 +02:00
  6ca714d93b
• Set Value instead of BindTo
  tgi74000 · 2018-04-15 20:23:57 +02:00
  3454ec1ca3
• Merge remote-tracking branch 'upstream/master'
  tgi74000 · 2018-04-15 20:22:16 +02:00
  4c08aa3dfb
• Merge pull request #2402 from FreezyLemon/fix-button-kb-input

  Make buttons only accept input when expanded

  Dean Herbert · 2018-04-16 03:20:31 +09:00
  v2018.416.0 af154e66a2
• Update framework
  Dean Herbert · 2018-04-16 02:54:24 +09:00
  c3086531e0
• Merge branch 'master' into fix-button-kb-input
  Dean Herbert · 2018-04-16 02:48:51 +09:00
  9eb04a5fc8
• Merge pull request #2397 from smoogipoo/instant-hide-screenshot

  Hide menu cursor when taking screenshots by default

  Dean Herbert · 2018-04-16 01:05:49 +09:00
  0490c523a6
• Move cache to a slightly more familiar place and add comment
  Dean Herbert · 2018-04-16 00:38:32 +09:00
  2eefe722f3
• Remove unused field
  Dean Herbert · 2018-04-16 00:25:09 +09:00
  96ef564f44
• Update framework
  Dean Herbert · 2018-04-16 00:21:03 +09:00
  c095fe1919
• Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
  Dean Herbert · 2018-04-16 00:20:06 +09:00
  c9615f837a
• Merge pull request #2383 from DrabWeb/wave-container

  Wave container

  Dean Herbert · 2018-04-15 21:22:54 +09:00
  779d5a578b
• Merge remote-tracking branch 'upstream/master' into wave-container
  Dean Herbert · 2018-04-15 21:03:18 +09:00
  ae77c010e2
• Merge pull request #2360 from UselessToucan/profile_multiple_audio_previews

  Handle multiple song previews playing in different beatmap categories…

  Dean Herbert · 2018-04-15 16:22:52 +09:00
  e512e4bacb
• Simplify logic
  Dean Herbert · 2018-04-15 16:12:42 +09:00
  fd54ae3c87
• Remove unused variable
  Dean Herbert · 2018-04-15 15:29:00 +09:00
  069d48ac14
• Resolve merge conflicts
  TocoToucan · 2018-04-14 15:11:28 +03:00
  671de4f6c2
• make buttons only accept input when expanded

  both other states are "inactive"/invisible so should never accept keyboard input

  FreezyLemon · 2018-04-14 00:08:54 +02:00
  3ece54e1c3